diff --git a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
index efb1a8d46e8..ebdd3c650ae 100644
--- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
+++ b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
@@ -1,6 +1,6 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Components;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Anomaly.Effects;
@@ -25,8 +25,7 @@ private void OnAfterHandleState(Entity<InnerBodyAnomalyComponent> ent, ref After
             index = sprite.LayerMapReserveBlank(ent.Comp.LayerMap);
 
         if (TryComp<BodyComponent>(ent, out var body) &&
-            body.Prototype is not null &&
-            ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
+            ent.Comp.SpeciesSprites.TryGetValue(body.Prototype, out var speciesSprite)) // WD EDIT
         {
             sprite.LayerSetSprite(index, speciesSprite);
         }
diff --git a/Content.Client/Body/Systems/BodySystem.cs b/Content.Client/Body/Systems/BodySystem.cs
deleted file mode 100644
index 3198ce664c9..00000000000
--- a/Content.Client/Body/Systems/BodySystem.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Content.Shared.Body.Systems;
-// Shitmed Change Start
-using Content.Shared._Shitmed.Body.Part;
-using Content.Shared.Humanoid;
-using Content.Shared.Humanoid.Markings;
-using Robust.Client.GameObjects;
-using Robust.Shared.Utility;
-using Content.Shared.Body.Components;
-// Shitmed Change End
-
-namespace Content.Client.Body.Systems;
-
-public sealed class BodySystem : SharedBodySystem
-{
-    // Shitmed Change Start
-    [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);
-
-            var shaders = markingPrototype.Shaders;
-            if (shaders is not null && shaders.ContainsKey(rsi.RsiState))
-                sprite.LayerSetShader(layerId, shaders[rsi.RsiState]);
-        }
-    }
-
-    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;
-    }
-    // Shitmed Change End
-}
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index 925013db109..d52a7966d8a 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.CardboardBox;
 using Content.Shared.CardboardBox.Components;
 using Content.Shared.Examine;
diff --git a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
index 0d34d4b0cc5..8baca8aa1be 100644
--- a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs
@@ -1,7 +1,7 @@
 using System.Linq;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Atmos.Prototypes;
-using Content.Shared.Body.Part;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs
index 97d792628a6..84947adbd1c 100644
--- a/Content.Client/Commands/HideMechanismsCommand.cs
+++ b/Content.Client/Commands/HideMechanismsCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Organ;
+using Content.Shared._White.Body.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
 using Robust.Shared.Containers;
diff --git a/Content.Client/Commands/ShowMechanismsCommand.cs b/Content.Client/Commands/ShowMechanismsCommand.cs
index 4e3bb17cb6e..9bfa74a7537 100644
--- a/Content.Client/Commands/ShowMechanismsCommand.cs
+++ b/Content.Client/Commands/ShowMechanismsCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Organ;
+using Content.Shared._White.Body.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
 
diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs
index d8a6f54e81f..e12b98623d3 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs
@@ -4,9 +4,9 @@
 using Content.Client.Guidebook.Richtext;
 using Content.Client.Message;
 using Content.Client.UserInterface.ControlExtensions;
-using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Localizations;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
@@ -119,17 +119,25 @@ private void GenerateControl(ReagentPrototype reagent)
         #region Effects
         if (_chemistryGuideData.ReagentGuideRegistry.TryGetValue(reagent.ID, out var guideEntryRegistry) &&
             guideEntryRegistry.GuideEntries != null &&
-            guideEntryRegistry.GuideEntries.Values.Any(pair => pair.EffectDescriptions.Any()))
+            guideEntryRegistry.GuideEntries.Values.Any(pair => pair.EffectDescriptions.Any() || pair.Metabolites?.Any() == true)) // WD EDI
         {
             EffectsDescriptionContainer.Children.Clear();
-            foreach (var (group, effect) in guideEntryRegistry.GuideEntries)
+            foreach (var (stage, effect) in guideEntryRegistry.GuideEntries) // WD EDIT
             {
-                if (!effect.EffectDescriptions.Any())
+                // WD EDIT START
+                var hasMetabolites = effect.Metabolites.Any();
+                if (!effect.EffectDescriptions.Any() && !hasMetabolites)
+                // WD EDIT END
                     continue;
 
                 var groupLabel = new RichTextLabel();
-                groupLabel.SetMarkup(Loc.GetString("guidebook-reagent-effects-metabolism-group-rate",
-                    ("group", _prototype.Index<MetabolismGroupPrototype>(group).LocalizedName), ("rate", effect.MetabolismRate)));
+                // WD EDIT START
+                groupLabel.SetMarkup(
+                    Loc.GetString(
+                        "guidebook-reagent-effects-metabolism-stage-rate",
+                        ("group", _prototype.Index(stage).LocalizedName),
+                        ("stage", effect.MetabolismRate)));
+                // WD EDIT END
                 var descriptionLabel = new RichTextLabel
                 {
                     Margin = new Thickness(25, 0, 10, 0)
@@ -142,9 +150,24 @@ private void GenerateControl(ReagentPrototype reagent)
                 {
                     descMsg.AddMarkupOrThrow(effectString);
                     i++;
-                    if (i < descriptionsCount)
+                    if (i < descriptionsCount || hasMetabolites) // WD EDIT
                         descMsg.PushNewline();
                 }
+
+                // WD EDIT START
+                if (hasMetabolites)
+                {
+                    var metabolites = new List<string>();
+                    foreach (var (metabolite, ratio) in effect.Metabolites)
+                    {
+                        metabolites.Add(Loc.GetString("guidebook-reagent-effects-metabolite-item", ("rate", (double)ratio), ("reagent", _prototype.Index(metabolite).LocalizedName)));
+                    }
+                    metabolites.Sort();
+
+                    descMsg.AddMarkupOrThrow(Loc.GetString("guidebook-reagent-effects-metabolites", ("items", ContentLocalizationManager.FormatList(metabolites))));
+                }
+                // WD EDIT END
+
                 descriptionLabel.SetMessage(descMsg);
 
                 EffectsDescriptionContainer.AddChild(groupLabel);
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index c0091ed5b4a..287ce88d586 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -5,10 +5,8 @@
 using Content.Client.Examine;
 using Content.Client.Strip;
 using Content.Client.Verbs.UI;
-using Content.Shared._Shitmed.Body.Events;
 using Content.Shared._White.Hands;
-using Content.Shared._White.Hands.Components; // Shitmed Change
-using Content.Shared.Body.Part; // Shitmed Change
+using Content.Shared._White.Hands.Components;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -58,8 +56,6 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, ComponentShutdown>(OnHandsShutdown);
             SubscribeLocalEvent<HandsComponent, ComponentHandleState>(HandleComponentState);
             SubscribeLocalEvent<HandsComponent, VisualsChangedEvent>(OnVisualsChanged);
-            SubscribeLocalEvent<HandsComponent, BodyPartRemovedEvent>(HandleBodyPartRemoved); // Shitmed Change
-            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled); // Shitmed Change
 
             SubscribeLocalEvent<HoldingDropComponent, ComponentInit>(HoldingDropComponentInit);			// WWDP
             SubscribeLocalEvent<HoldingDropComponent, ComponentShutdown>(HoldingDropComponentShutdown);	// WWDP
@@ -287,34 +283,6 @@ public void UIHandAltActivateItem(string handName)
 
         #region visuals
 
-        // Shitmed Change Start
-        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);
-
-        // Shitmed Change End
         protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands, EntInsertedIntoContainerMessage args)
         {
             base.HandleEntityInserted(uid, hands, args);
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
index 3261a109e73..baea03c8923 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs
@@ -1,5 +1,4 @@
 using Content.Shared.MedicalScanner;
-using Content.Shared._Shitmed.Targeting; // Shitmed Change
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
 
@@ -20,11 +19,10 @@ protected override void Open()
             base.Open();
 
             _window = this.CreateWindow<HealthAnalyzerWindow>();
-            _window.OnBodyPartSelected += SendBodyPartMessage; // Shitmed Change
+
             _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
         }
 
-
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)
         {
             if (_window == null)
@@ -35,21 +33,5 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message)
 
             _window.Populate(cast);
         }
-
-        // Shitmed Change Start
-        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.OnBodyPartSelected -= SendBodyPartMessage;
-
-            _window?.Dispose();
-        }
-
-        // Shitmed Change End
     }
 }
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
index 95229dc40ea..97968c4b990 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
@@ -2,7 +2,7 @@
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     MaxHeight="525"
-    MinWidth="350"> <!-- Shitmed Change -->
+    MinWidth="300">
     <ScrollContainer
         Margin="5 5 5 5"
         ReturnMeasure="True"
@@ -13,219 +13,45 @@
             Orientation="Vertical">
             <Label
                 Name="NoPatientDataText"
-                Text="{Loc health-analyzer-window-no-patient-data-text}"/>
-            <!-- Shitmed Change Start -->
-            <Button Name="ReturnButton"
-                    Text="{Loc 'health-analyzer-window-return-button-text'}"
-                    Margin="0 0 0 10"
-                    HorizontalExpand="False"/>
-            <!-- Shitmed Change End -->
+                Text="{Loc health-analyzer-window-no-patient-data-text}" />
+
             <BoxContainer
                 Name="PatientDataContainer"
                 Margin="0 0 0 5"
                 Orientation="Vertical">
-                <!-- Shitmed Change Start -->
-                <BoxContainer Orientation="Horizontal"
-                              Margin="0 0 0 5">
-                    <PanelContainer>
-                        <SpriteView OverrideDirection="South"
-                                    Scale="1.0 1.0"
-                                    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 Orientation="Horizontal" Margin="0 0 0 5">
+                    <SpriteView OverrideDirection="South" Scale="2 2" Name="SpriteView" Access="Public" SetSize="64 64" />
+                    <BoxContainer Margin="5 0 0 0" Orientation="Vertical" VerticalAlignment="Top">
+                        <RichTextLabel Name="NameLabel" SetWidth="150" />
+                        <Label Name="SpeciesLabel" VerticalAlignment="Top" 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="Horizontal"
+                          HorizontalExpand="True" HorizontalAlignment="Center">
 
             </BoxContainer>
 
-            <PanelContainer StyleClasses="LowDivider"/>
-            <!-- Shitmed Change End -->
+            <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 e2b07a5d778..9b96f5d3fe9 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -1,23 +1,28 @@
 using System.Linq;
 using System.Numerics;
+using Content.Client.Message;
 using Content.Shared.Atmos;
 using Content.Client.UserInterface.Controls;
-using Content.Shared._Shitmed.Targeting; // Shitmed
+using Content.Shared.Alert;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Inventory;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -31,17 +36,6 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow
         private readonly IPrototypeManager _prototypes;
         private readonly IResourceCache _cache;
 
-        // Shitmed Change Start
-        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;
-        // Shitmed Change End
-
         public HealthAnalyzerWindow()
         {
             RobustXamlLoader.Load(this);
@@ -51,80 +45,19 @@ public HealthAnalyzerWindow()
             _spriteSystem = _entityManager.System<SpriteSystem>();
             _prototypes = dependencies.Resolve<IPrototypeManager>();
             _cache = dependencies.Resolve<IResourceCache>();
-            // Shitmed Change Start
-            _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();
-            // Shitmed Change End
-        }
-
-        // Shitmed Change Start
-        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;
-        }
-
-        // Not all of this function got messed with, but it was spread enough to warrant being covered entirely by a Shitmed Change
         public void Populate(HealthAnalyzerScannedUserMessage msg)
         {
-            // Start-Shitmed
-            _target = _entityManager.GetEntity(msg.TargetEntity);
-            EntityUid? part = msg.Part != null ? _entityManager.GetEntity(msg.Part.Value) : null;
-            var isPart = part != null;
+            var target = _entityManager.GetEntity(msg.TargetEntity);
 
-            if (_target == null
-                || !_entityManager.TryGetComponent<DamageableComponent>(isPart ? part : _target, out var damageable))
+            if (target == null
+                || !_entityManager.TryGetComponent<DamageableComponent>(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
@@ -139,20 +72,17 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
 
             // Patient Information
 
-            SpriteView.SetEntity(SetupIcon(msg.Body) ?? _target.Value);
-            SpriteView.Visible = msg.ScanMode.HasValue && msg.ScanMode.Value;
-            PartView.Visible = SpriteView.Visible;
-            NoDataTex.Visible = !SpriteView.Visible;
+            SpriteView.SetEntity(target.Value);
 
             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");
@@ -168,7 +98,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");
 
@@ -178,29 +108,18 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
 
             // Alerts
 
-            var showAlerts = msg.Unrevivable == true || msg.Bleeding == true;
-
-            AlertsDivider.Visible = showAlerts;
-            AlertsContainer.Visible = showAlerts;
-
-            if (showAlerts)
-                AlertsContainer.DisposeAllChildren();
-
-            if (msg.Unrevivable == true)
-                AlertsContainer.AddChild(new RichTextLabel
-                {
-                    Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"),
-                    Margin = new Thickness(0, 4),
-                    MaxWidth = 300
-                });
+            AlertsDivider.Visible = msg.Bleeding == true;
+            AlertsContainer.Visible = msg.Bleeding == true;
 
             if (msg.Bleeding == true)
-                AlertsContainer.AddChild(new RichTextLabel
+            {
+                AlertsContainer.DisposeAllChildren();
+                AlertsContainer.AddChild(new Label
                 {
                     Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
-                    Margin = new Thickness(0, 4),
-                    MaxWidth = 300
+                    FontColorOverride = Color.Red,
                 });
+            }
 
             // Damage Groups
 
@@ -212,7 +131,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
 
             DrawDiagnosticGroups(damageSortedGroups, damagePerType);
         }
-        // Shitmed Change End
+
         private static string GetStatus(MobState mobState)
         {
             return mobState switch
@@ -311,41 +230,5 @@ private BoxContainer CreateDiagnosticGroupTitle(string text, string id)
 
             return rootContainer;
         }
-
-        // Shitmed Change Start
-        /// <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: PartStatusUIController and make it use layers instead of TextureRects when EE refactors alerts.
-                string enumName = Enum.GetName(typeof(TargetBodyPart), bodyPart) ?? "Unknown";
-                int enumValue = (int) integrity;
-                var rsi = new SpriteSpecifier.Rsi(new ResPath($"/Textures/_Shitmed/Interface/Targeting/Status/{enumName.ToLowerInvariant()}.rsi"), $"{enumName.ToLowerInvariant()}_{enumValue}");
-                // Shitcode with love from Russia :)
-                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;
-        }
-        // Shitmed Change End
     }
 }
diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
index e43135cea11..a6f1c9ea3b8 100644
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -1,11 +1,10 @@
 using System.Numerics;
-using Content.Shared._White.Humanoid.Prototypes;
+using Content.Client._White.Body.Systems;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
 using Robust.Client.GameObjects;
-using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -15,6 +14,7 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
+    [Dependency] private readonly BodySystem _body = default!; // WD EDIT
 
     public override void Initialize()
     {
@@ -30,9 +30,6 @@ private void OnHandleState(EntityUid uid, HumanoidAppearanceComponent component,
 
     private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent sprite)
     {
-        UpdateLayers(component, sprite);
-        ApplyMarkingSet(component, sprite);
-
         var speciesPrototype = _prototypeManager.Index(component.Species);
 
         var height = Math.Clamp(component.Height, speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
@@ -41,74 +38,6 @@ private void UpdateSprite(HumanoidAppearanceComponent component, SpriteComponent
         component.Width = width;
 
         sprite.Scale = new Vector2(width, height);
-
-        sprite[sprite.LayerMapReserveBlank(HumanoidVisualLayers.Eyes)].Color = component.EyeColor;
-    }
-
-    private static bool IsHidden(HumanoidAppearanceComponent humanoid, HumanoidVisualLayers layer)
-        => humanoid.HiddenLayers.Contains(layer) || humanoid.PermanentlyHidden.Contains(layer);
-
-    private void UpdateLayers(HumanoidAppearanceComponent component, SpriteComponent sprite)
-    {
-        var oldLayers = new HashSet<HumanoidVisualLayers>(component.BaseLayers.Keys);
-        component.BaseLayers.Clear();
-
-        // add default species layers
-        var bodyTypeProto = _prototypeManager.Index<BodyTypePrototype>(component.BodyType); // WD EDIT
-        foreach (var (key, id) in bodyTypeProto.Sprites) // WD EDIT
-        {
-            oldLayers.Remove(key);
-            if (!component.CustomBaseLayers.ContainsKey(key))
-                SetLayerData(component, sprite, key, id, sexMorph: true);
-        }
-
-        // add custom layers
-        foreach (var (key, info) in component.CustomBaseLayers)
-        {
-            oldLayers.Remove(key);
-            // Shitmed Change: 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
-        // TODO maybe just remove them altogether?
-        foreach (var key in oldLayers)
-        {
-            if (sprite.LayerMapTryGet(key, out var index))
-                sprite[index].Visible = false;
-        }
-    }
-
-    private void SetLayerData(
-        HumanoidAppearanceComponent component,
-        SpriteComponent sprite,
-        HumanoidVisualLayers key,
-        string? protoId,
-        bool sexMorph = false,
-        Color? color = null,
-        bool overrideSkin = false) // Shitmed Change
-    {
-        var layerIndex = sprite.LayerMapReserveBlank(key);
-        var layer = sprite[layerIndex];
-        layer.Visible = !IsHidden(component, key);
-
-        if (color != null)
-            layer.Color = color.Value;
-
-        if (protoId == null)
-            return;
-
-        if (sexMorph)
-            protoId = HumanoidVisualLayersExtension.GetSexMorph(key, component.Sex, protoId);
-
-        var proto = _prototypeManager.Index<HumanoidSpeciesSpriteLayer>(protoId);
-        component.BaseLayers[key] = proto;
-
-        if (proto.MatchSkin && !overrideSkin) // Shitmed Change
-            layer.Color = component.SkinColor.WithAlpha(proto.LayerAlpha);
-
-        if (proto.BaseSprite != null)
-            sprite.LayerSetSprite(layerIndex, proto.BaseSprite);
     }
 
     /// <summary>
@@ -135,8 +64,6 @@ public override void LoadProfile(EntityUid uid,
             return;
         }
 
-        var customBaseLayers = new Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo>();
-
         var speciesPrototype = _prototypeManager.Index<SpeciesPrototype>(profile.Species);
         var markings = new MarkingSet(speciesPrototype.MarkingPoints, _markingManager, _prototypeManager);
 
@@ -162,13 +89,13 @@ public override void LoadProfile(EntityUid uid,
         //markings.RemoveCategory(MarkingCategories.FacialHair);
 
         // We need to ensure hair before applying it or coloring can try depend on markings that can be invalid
-        var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, out var hairAlpha, _prototypeManager)
+        var hairColor = _markingManager.MustMatchSkin(profile.Species, MarkingCategories.Hair, out var hairAlpha, _prototypeManager) // WD EDIT
             ? profile.Appearance.SkinColor.WithAlpha(hairAlpha)
             : profile.Appearance.HairColor;
         var hair = new Marking(profile.Appearance.HairStyleId,
             new[] { hairColor });
 
-        var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair, out var facialHairAlpha, _prototypeManager)
+        var facialHairColor = _markingManager.MustMatchSkin(profile.Species, MarkingCategories.FacialHair, out var facialHairAlpha, _prototypeManager) // WD EDIT
             ? profile.Appearance.SkinColor.WithAlpha(facialHairAlpha)
             : profile.Appearance.FacialHairColor;
         var facialHair = new Marking(profile.Appearance.FacialHairStyleId,
@@ -205,9 +132,10 @@ public override void LoadProfile(EntityUid uid,
         DebugTools.Assert(IsClientSide(uid));
 
         humanoid.MarkingSet = markings;
-        humanoid.PermanentlyHidden = new HashSet<HumanoidVisualLayers>();
-        humanoid.HiddenLayers = new HashSet<HumanoidVisualLayers>();
-        humanoid.CustomBaseLayers = customBaseLayers;
+        // WD EDIT START
+        humanoid.PermanentlyHidden = new HashSet<Enum>();
+        humanoid.HiddenLayers = new HashSet<Enum>();
+        // WD EDIT END
         humanoid.Sex = profile.Sex;
         humanoid.Gender = profile.Gender;
         humanoid.DisplayPronouns = profile.DisplayPronouns;
@@ -222,117 +150,11 @@ public override void LoadProfile(EntityUid uid,
         humanoid.Width = profile.Width;
 
         UpdateSprite(humanoid, Comp<SpriteComponent>(uid));
-    }
-
-    private void ApplyMarkingSet(HumanoidAppearanceComponent humanoid, SpriteComponent sprite)
-    {
-        // I am lazy and I CBF resolving the previous mess, so I'm just going to nuke the markings.
-        // Really, markings should probably be a separate component altogether.
-        ClearAllMarkings(humanoid, sprite);
-
-        foreach (var markingList in humanoid.MarkingSet.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                if (_markingManager.TryGetMarking(marking, out var markingPrototype))
-                    ApplyMarking(markingPrototype, marking.MarkingColors, marking.Visible, humanoid, sprite);
-            }
-        }
-
-        humanoid.ClientOldMarkings = new MarkingSet(humanoid.MarkingSet);
-    }
-
-    private void ClearAllMarkings(HumanoidAppearanceComponent humanoid, SpriteComponent sprite)
-    {
-        foreach (var markingList in humanoid.ClientOldMarkings.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                RemoveMarking(marking, sprite);
-            }
-        }
-
+        // WD EDIT START
+        _body.SetupBodyAppearance((uid, null, null, humanoid));
         humanoid.ClientOldMarkings.Clear();
-
-        foreach (var markingList in humanoid.MarkingSet.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                RemoveMarking(marking, sprite);
-            }
-        }
-    }
-
-    private void RemoveMarking(Marking marking, SpriteComponent spriteComp)
-    {
-        if (!_markingManager.TryGetMarking(marking, out var prototype))
-        {
-            return;
-        }
-
-        foreach (var sprite in prototype.Sprites)
-        {
-            if (sprite is not SpriteSpecifier.Rsi rsi)
-            {
-                continue;
-            }
-
-            var layerId = $"{marking.MarkingId}-{rsi.RsiState}";
-            if (!spriteComp.LayerMapTryGet(layerId, out var index))
-            {
-                continue;
-            }
-
-            spriteComp.LayerMapRemove(layerId);
-            spriteComp.RemoveLayer(index);
-        }
-    }
-    private void ApplyMarking(MarkingPrototype markingPrototype,
-        IReadOnlyList<Color>? colors,
-        bool visible,
-        HumanoidAppearanceComponent humanoid,
-        SpriteComponent sprite)
-    {
-        if (!sprite.LayerMapTryGet(markingPrototype.BodyPart, out int targetLayer))
-            return;
-
-        visible &= !IsHidden(humanoid, markingPrototype.BodyPart);
-        visible &= humanoid.BaseLayers.TryGetValue(markingPrototype.BodyPart, out var setting)
-           && setting.AllowsMarkings;
-
-        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, targetLayer + j + 1);
-                sprite.LayerMapSet(layerId, layer);
-                sprite.LayerSetSprite(layerId, rsi);
-            }
-
-            sprite.LayerSetVisible(layerId, visible);
-
-            if (!visible || setting == null) // this is kinda implied
-                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);
-
-            var shaders = markingPrototype.Shaders;
-            if (shaders is not null && shaders.ContainsKey(rsi.RsiState))
-                sprite.LayerSetShader(layerId, shaders[rsi.RsiState]);
-        }
+        humanoid.ClientOldMarkings = new (humanoid.MarkingSet);
+        // WD EDIT END
     }
 
     public override void SetSkinColor(EntityUid uid, Color skinColor, bool sync = true, bool verify = true, HumanoidAppearanceComponent? humanoid = null)
@@ -341,24 +163,12 @@ public override void SetSkinColor(EntityUid uid, Color skinColor, bool sync = tr
             return;
 
         base.SetSkinColor(uid, skinColor, false, verify, humanoid);
-
-        if (!TryComp(uid, out SpriteComponent? sprite))
-            return;
-
-        foreach (var (layer, spriteInfo) in humanoid.BaseLayers)
-        {
-            if (!spriteInfo.MatchSkin)
-                continue;
-
-            var index = sprite.LayerMapReserveBlank(layer);
-            sprite[index].Color = skinColor.WithAlpha(spriteInfo.LayerAlpha);
-        }
     }
 
     protected override void SetLayerVisibility(
         EntityUid uid,
         HumanoidAppearanceComponent humanoid,
-        HumanoidVisualLayers layer,
+        Enum layer, // WD EDIT
         bool visible,
         bool permanent,
         ref bool dirty)
@@ -379,16 +189,5 @@ protected override void SetLayerVisibility(
             return;
 
         spriteLayer.Visible = visible;
-
-        // I fucking hate this. I'll get around to refactoring sprite layers eventually I swear
-
-        foreach (var markingList in humanoid.MarkingSet.Markings.Values)
-        {
-            foreach (var marking in markingList)
-            {
-                if (_markingManager.TryGetMarking(marking, out var markingPrototype) && markingPrototype.BodyPart == layer)
-                    ApplyMarking(markingPrototype, marking.MarkingColors, marking.Visible, humanoid, sprite);
-            }
-        }
     }
 }
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
index f900eec1eb4..d8d6074c5a6 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
@@ -26,7 +26,6 @@ protected override void Open()
         _window.OnMarkingRemoved += SendMarkingSet;
         _window.OnMarkingColorChange += SendMarkingSetNoResend;
         _window.OnMarkingRankChange += SendMarkingSet;
-        _window.OnLayerInfoModified += SendBaseLayer;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -38,7 +37,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
         }
 
-        _window.SetState(cast.MarkingSet, cast.Species, cast.Sex, cast.SkinColor, cast.CustomBaseLayers);
+        _window.SetState(cast.MarkingSet, cast.Species, cast.Sex, cast.SkinColor, cast.EyeColor); // WD EDIT
     }
 
     private void SendMarkingSet(MarkingSet set)
@@ -50,11 +49,6 @@ private void SendMarkingSetNoResend(MarkingSet set)
     {
         SendMessage(new HumanoidMarkingModifierMarkingSetMessage(set, false));
     }
-
-    private void SendBaseLayer(HumanoidVisualLayers layer, CustomBaseLayerInfo? info)
-    {
-        SendMessage(new HumanoidMarkingModifierBaseLayersSetMessage(layer, info, true));
-    }
 }
 
 
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
index 4cde587c58c..02a099396a0 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml.cs
@@ -1,11 +1,8 @@
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
-using Content.Shared.Humanoid.Prototypes;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client.Humanoid;
 
@@ -18,28 +15,14 @@ public sealed partial class HumanoidMarkingModifierWindow : DefaultWindow
     public Action<MarkingSet>? OnMarkingRemoved;
     public Action<MarkingSet>? OnMarkingColorChange;
     public Action<MarkingSet>? OnMarkingRankChange;
-    public Action<HumanoidVisualLayers, CustomBaseLayerInfo?>? OnLayerInfoModified;
-    private readonly IPrototypeManager _protoMan = default!;
-
-    private readonly Dictionary<HumanoidVisualLayers, HumanoidBaseLayerModifier> _modifiers = new();
 
     public HumanoidMarkingModifierWindow()
     {
         RobustXamlLoader.Load(this);
-        _protoMan = IoCManager.Resolve<IPrototypeManager>();
-
-        foreach (var layer in Enum.GetValues<HumanoidVisualLayers>())
-        {
-            var modifier = new HumanoidBaseLayerModifier(layer);
-            BaseLayersContainer.AddChild(modifier);
-            _modifiers.Add(layer, modifier);
-
-            modifier.OnStateChanged += () => OnStateChanged(layer, modifier);
-        }
 
-        MarkingPickerWidget.OnMarkingAdded += set => OnMarkingAdded!(set);
-        MarkingPickerWidget.OnMarkingRemoved += set => OnMarkingRemoved!(set);
-        MarkingPickerWidget.OnMarkingColorChange += set => OnMarkingColorChange!(set);
+        MarkingPickerWidget.OnMarkingAdded += (set, _) => OnMarkingAdded!(set); // WD EDIT
+        MarkingPickerWidget.OnMarkingRemoved += (set, _) => OnMarkingRemoved!(set); // WD EDIT
+        MarkingPickerWidget.OnMarkingColorChange += (set, _) => OnMarkingColorChange!(set); // WD EDIT
         MarkingPickerWidget.OnMarkingRankChange += set => OnMarkingRankChange!(set);
         MarkingForced.OnToggled += args => MarkingPickerWidget.Forced = args.Pressed;
         MarkingIgnoreSpecies.OnToggled += args => MarkingPickerWidget.Forced = args.Pressed;
@@ -48,113 +31,14 @@ public HumanoidMarkingModifierWindow()
         MarkingPickerWidget.IgnoreSpecies = MarkingForced.Pressed;
     }
 
-    private void OnStateChanged(HumanoidVisualLayers layer, HumanoidBaseLayerModifier modifier)
-    {
-        if (!modifier.Enabled)
-        {
-            OnLayerInfoModified?.Invoke(layer, null);
-            return;
-        }
-
-        string? state = _protoMan.HasIndex<HumanoidSpeciesSpriteLayer>(modifier.Text) ? modifier.Text : null;
-        OnLayerInfoModified?.Invoke(layer, new CustomBaseLayerInfo(state, modifier.Color));
-    }
     public void SetState(
         MarkingSet markings,
         string species,
         Sex sex,
         Color skinColor,
-        Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> info
+        Color eyeColor // WD EDIT
     )
     {
-        foreach (var (layer, modifier) in _modifiers)
-        {
-            if (!info.TryGetValue(layer, out var layerInfo))
-            {
-                modifier.SetState(false, string.Empty, Color.White);
-                continue;
-            }
-
-            modifier.SetState(true, layerInfo.Id ?? string.Empty, layerInfo.Color ?? Color.White);
-        }
-
-        var eyesColor = Color.White;
-        if (info.TryGetValue(HumanoidVisualLayers.Eyes, out var eyes) && eyes.Color != null)
-        {
-            eyesColor = eyes.Color.Value;
-        }
-
-        MarkingPickerWidget.SetData(markings, species, sex, skinColor, eyesColor);
-    }
-
-    private sealed class HumanoidBaseLayerModifier : BoxContainer
-    {
-        private CheckBox _enable;
-        private LineEdit _lineEdit;
-        private ColorSelectorSliders _colorSliders;
-        private BoxContainer _infoBox;
-
-        public bool Enabled => _enable.Pressed;
-        public string Text => _lineEdit.Text;
-        public Color Color => _colorSliders.Color;
-
-        public Action? OnStateChanged;
-
-        public HumanoidBaseLayerModifier(HumanoidVisualLayers layer)
-        {
-            HorizontalExpand = true;
-            Orientation = LayoutOrientation.Vertical;
-            var labelBox = new BoxContainer
-            {
-                MinWidth = 250,
-                HorizontalExpand = true
-            };
-            AddChild(labelBox);
-
-            labelBox.AddChild(new Label
-            {
-                HorizontalExpand = true,
-                Text = layer.ToString()
-            });
-            _enable = new CheckBox
-            {
-                Text = "Enable",
-                HorizontalAlignment = HAlignment.Right
-            };
-
-            labelBox.AddChild(_enable);
-            _infoBox = new BoxContainer
-            {
-                Orientation = LayoutOrientation.Vertical,
-                Visible = false
-            };
-            _enable.OnToggled += args =>
-            {
-                _infoBox.Visible = args.Pressed;
-                OnStateChanged!();
-            };
-
-            var lineEditBox = new BoxContainer();
-            lineEditBox.AddChild(new Label { Text = "Prototype id: "});
-
-            // TODO: This line edit should really be an options / dropdown selector, not text.
-            _lineEdit = new() { MinWidth = 200 };
-            _lineEdit.OnTextEntered += args => OnStateChanged!();
-            lineEditBox.AddChild(_lineEdit);
-            _infoBox.AddChild(lineEditBox);
-
-            _colorSliders = new();
-            _colorSliders.OnColorChanged += color => OnStateChanged!();
-            _infoBox.AddChild(_colorSliders);
-            AddChild(_infoBox);
-        }
-
-        public void SetState(bool enabled, string state, Color color)
-        {
-            _enable.Pressed = enabled;
-            _infoBox.Visible = enabled;
-            _lineEdit.Text = state;
-            _colorSliders.Color = color;
-        }
+        MarkingPickerWidget.SetData(markings, species, sex, skinColor, eyeColor);
     }
 }
diff --git a/Content.Client/Humanoid/MarkingPicker.xaml.cs b/Content.Client/Humanoid/MarkingPicker.xaml.cs
index 6238aceb782..c49f1b33fd4 100644
--- a/Content.Client/Humanoid/MarkingPicker.xaml.cs
+++ b/Content.Client/Humanoid/MarkingPicker.xaml.cs
@@ -22,9 +22,9 @@ public sealed partial class MarkingPicker : Control
     [Dependency] private readonly MarkingManager _markingManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-    public Action<MarkingSet>? OnMarkingAdded;
-    public Action<MarkingSet>? OnMarkingRemoved;
-    public Action<MarkingSet>? OnMarkingColorChange;
+    public Action<MarkingSet, Marking>? OnMarkingAdded; // WD EDIT
+    public Action<MarkingSet, Marking>? OnMarkingRemoved; // WD EDIT
+    public Action<MarkingSet, Marking>? OnMarkingColorChange; // WD EDIT
     public Action<MarkingSet>? OnMarkingRankChange;
 
     private List<Color> _currentMarkingColors = new();
@@ -173,15 +173,7 @@ private List<string> GetMarkingStateNames(MarkingPrototype marking)
         List<string> result = new();
         foreach (var markingState in marking.Sprites)
         {
-            switch (markingState)
-            {
-                case SpriteSpecifier.Rsi rsi:
-                    result.Add(Loc.GetString($"marking-{marking.ID}-{rsi.RsiState}"));
-                    break;
-                case SpriteSpecifier.Texture texture:
-                    result.Add(Loc.GetString($"marking-{marking.ID}-{texture.TexturePath.Filename}"));
-                    break;
-            }
+            result.Add(Loc.GetString($"marking-{marking.ID}-{markingState.State}")); // WD EDIT
         }
 
         return result;
@@ -221,7 +213,7 @@ public void Populate(string filter)
                 {
                     new TextureRect
                     {
-                        Texture = marking.Sprites[0].DirFrame0().TextureFor(
+                        Texture = new SpriteSpecifier.Rsi(marking.Sprites[0].Sprite, marking.Sprites[0].State).DirFrame0().TextureFor( // WD EDIT
                             Enum.TryParse<Direction>(marking.PreviewDirection, out var dir) ? dir : Direction.South),
                         TextureScale = new Vector2(1.5f) // WWDP EDIT
                     },
@@ -383,7 +375,7 @@ private void ColorChanged(MarkingPrototype markingPrototype, int colorIndex)
         marking.SetColor(colorIndex, _currentMarkingColors[colorIndex]);
         _currentMarkings.Replace(_selectedMarkingCategory, markingIndex, marking);
 
-        OnMarkingColorChange?.Invoke(_currentMarkings);
+        OnMarkingColorChange?.Invoke(_currentMarkings, marking); // WD EDIT
     }
 
     private void MarkingAdd(MarkingPrototype marking)
@@ -400,7 +392,7 @@ private void MarkingAdd(MarkingPrototype marking)
         if (FacialHairMarking != null)
             markingSet.AddBack(MarkingCategories.FacialHair, FacialHairMarking);
 
-        if (!_markingManager.MustMatchSkin(_currentSpecies, marking.BodyPart, out var _, _prototypeManager))
+        if (!_markingManager.MustMatchSkin(_currentSpecies, marking.MarkingCategory, out var _, _prototypeManager)) // WD EDIT
         {
             // Do default coloring
             var colors = MarkingColoring.GetMarkingLayerColors(
@@ -422,7 +414,7 @@ private void MarkingAdd(MarkingPrototype marking)
         _currentMarkings.AddBack(_selectedMarkingCategory, markingObject);
 
         UpdatePoints();
-        OnMarkingAdded?.Invoke(_currentMarkings);
+        OnMarkingAdded?.Invoke(_currentMarkings, markingObject); // WD EDIT
     }
 
     private void MarkingRemove(MarkingPrototype marking)
@@ -431,6 +423,6 @@ private void MarkingRemove(MarkingPrototype marking)
 
         UpdatePoints();
         CMarkingColors.Visible = _selectedMarking?.Name != marking.ID;
-        OnMarkingRemoved?.Invoke(_currentMarkings);
+        OnMarkingRemoved?.Invoke(_currentMarkings, marking.AsMarking()); // WD EDIT
     }
 }
diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
index be3130a58bd..273d8520188 100644
--- a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
+++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
@@ -4,6 +4,8 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
+using Robust.Shared.Utility;
+
 
 namespace Content.Client.Humanoid;
 
@@ -188,7 +190,7 @@ public void PopulateList(string filter)
 
         foreach (var (id, marking) in sortedMarkings)
         {
-            var item = MarkingList.AddItem(Loc.GetString($"marking-{id}"), marking.Sprites[0].Frame0());
+            var item = MarkingList.AddItem(Loc.GetString($"marking-{id}"), new SpriteSpecifier.Rsi(marking.Sprites[0].Sprite, marking.Sprites[0].State).Frame0()); // WD EDIT
             item.Metadata = marking.ID;
 
             if (_markings[Slot].MarkingId == id)
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 93915996229..47468cab7f1 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -57,13 +57,9 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(EngineKeyFunctions.Walk);
             human.AddFunction(ContentKeyFunctions.SwapHands);
             human.AddFunction(ContentKeyFunctions.Drop);
-            human.AddFunction(ContentKeyFunctions.PreciseDrop);			// WWDP
-            human.AddFunction(ContentKeyFunctions.MouseWheelUp);		// WWDP
-            human.AddFunction(ContentKeyFunctions.MouseWheelDown);		// WWDP
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
-            human.AddFunction(ContentKeyFunctions.OpenEmotesMenu); // WD EDIT
             human.AddFunction(ContentKeyFunctions.OpenLanguageMenu);
             human.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             human.AddFunction(ContentKeyFunctions.ThrowItemInHand);
@@ -83,7 +79,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.OfferItem);
             human.AddFunction(ContentKeyFunctions.ToggleStanding);
             human.AddFunction(ContentKeyFunctions.ToggleCrawlingUnder);
-            human.AddFunction(ContentKeyFunctions.ToggleCombatMode); // WD EDIT
             human.AddFunction(ContentKeyFunctions.MouseMiddle);
             human.AddFunction(ContentKeyFunctions.RotateObjectClockwise);
             human.AddFunction(ContentKeyFunctions.RotateObjectCounterclockwise);
@@ -95,19 +90,28 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
-            human.AddFunction(ContentKeyFunctions.LookUp); // WD EDIT
-            // Shitmed Change Start - TODO: Add groin targeting.
-            human.AddFunction(ContentKeyFunctions.TargetHead);
-            human.AddFunction(ContentKeyFunctions.TargetTorso);
-            human.AddFunction(ContentKeyFunctions.TargetLeftArm);
-            human.AddFunction(ContentKeyFunctions.TargetLeftHand);
-            human.AddFunction(ContentKeyFunctions.TargetRightArm);
-            human.AddFunction(ContentKeyFunctions.TargetRightHand);
-            human.AddFunction(ContentKeyFunctions.TargetLeftLeg);
-            human.AddFunction(ContentKeyFunctions.TargetLeftFoot);
-            human.AddFunction(ContentKeyFunctions.TargetRightLeg);
-            human.AddFunction(ContentKeyFunctions.TargetRightFoot);
-            // Shitmed Change End
+            // WD EDIT START
+            human.AddFunction(ContentKeyFunctions.PreciseDrop);
+            human.AddFunction(ContentKeyFunctions.MouseWheelUp);
+            human.AddFunction(ContentKeyFunctions.MouseWheelDown);
+            human.AddFunction(ContentKeyFunctions.OpenEmotesMenu);
+            human.AddFunction(ContentKeyFunctions.ToggleCombatMode);
+            human.AddFunction(ContentKeyFunctions.LookUp);
+            human.AddFunction(ContentKeyFunctions.TargetDollHead);
+            human.AddFunction(ContentKeyFunctions.TargetDollChest);
+            human.AddFunction(ContentKeyFunctions.TargetDollGroin);
+            human.AddFunction(ContentKeyFunctions.TargetDollRightArm);
+            human.AddFunction(ContentKeyFunctions.TargetDollRightHand);
+            human.AddFunction(ContentKeyFunctions.TargetDollLeftArm);
+            human.AddFunction(ContentKeyFunctions.TargetDollLeftHand);
+            human.AddFunction(ContentKeyFunctions.TargetDollRightLeg);
+            human.AddFunction(ContentKeyFunctions.TargetDollRightFoot);
+            human.AddFunction(ContentKeyFunctions.TargetDollLeftLeg);
+            human.AddFunction(ContentKeyFunctions.TargetDollLeftFoot);
+            human.AddFunction(ContentKeyFunctions.TargetDollTail);
+            human.AddFunction(ContentKeyFunctions.TargetDollEyes);
+            human.AddFunction(ContentKeyFunctions.TargetDollMouth);
+            // WD EDIT END
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
@@ -123,9 +127,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             aghost.AddFunction(EngineKeyFunctions.Walk);
             aghost.AddFunction(ContentKeyFunctions.SwapHands);
             aghost.AddFunction(ContentKeyFunctions.Drop);
-            aghost.AddFunction(ContentKeyFunctions.PreciseDrop);	// WWDP
-            aghost.AddFunction(ContentKeyFunctions.MouseWheelUp);	// WWDP
-            aghost.AddFunction(ContentKeyFunctions.MouseWheelDown);	// WWDP
             aghost.AddFunction(ContentKeyFunctions.UseItemInHand);
             aghost.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             aghost.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
@@ -134,6 +135,26 @@ public static void SetupContexts(IInputContextContainer contexts)
             aghost.AddFunction(ContentKeyFunctions.TryPullObject);
             aghost.AddFunction(ContentKeyFunctions.MovePulledObject);
             aghost.AddFunction(ContentKeyFunctions.ReleasePulledObject);
+            // WD EDIT START
+            aghost.AddFunction(ContentKeyFunctions.PreciseDrop);
+            aghost.AddFunction(ContentKeyFunctions.MouseWheelUp);
+            aghost.AddFunction(ContentKeyFunctions.MouseWheelDown);
+            aghost.AddFunction(ContentKeyFunctions.ToggleCombatMode);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollHead);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollChest);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollGroin);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollRightArm);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollRightHand);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollLeftArm);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollLeftHand);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollRightLeg);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollRightFoot);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollLeftLeg);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollLeftFoot);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollTail);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollEyes);
+            aghost.AddFunction(ContentKeyFunctions.TargetDollMouth);
+            // WD EDIT END
 
             var ghost = contexts.New("ghost", "human");
             ghost.AddFunction(EngineKeyFunctions.MoveUp);
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index 40e15c5c89a..dce401eefda 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -251,7 +251,6 @@ protected override void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
 
         public sealed class SlotData
         {
-            [ViewVariables] // Shitmed Change - Mostly for debugging.
             public SlotDefinition SlotDef;
             public EntityUid? HeldEntity => Container?.ContainedEntity;
             public bool Blocked;
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 10c7135459d..ea46e7e562c 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Linq;
 using System.Numerics;
+using Content.Client._White.Body.Systems;
 using Content.Client.Administration.UI;
 using Content.Client.Humanoid;
 using Content.Client.Message;
@@ -63,6 +64,7 @@ public sealed partial class HumanoidProfileEditor : BoxContainer
         private readonly LobbyUIController _controller;
         private readonly CharacterRequirementsSystem _characterRequirementsSystem;
         private readonly RoleSystem _roleSystem;
+        private readonly BodySystem _bodySystem; // WD EDIT
 
         private FlavorText.FlavorText? _flavorText;
         private TextEdit? _flavorTextEdit;
@@ -176,6 +178,7 @@ IRobustRandom random
             _random = random;
 
             _roleSystem = _entManager.System<RoleSystem>();
+            _bodySystem = _entManager.System<BodySystem>(); // WD EDIT
             _characterRequirementsSystem = _entManager.System<CharacterRequirementsSystem>();
             _controller = UserInterfaceManager.GetUIController<LobbyUIController>();
 
@@ -600,9 +603,9 @@ IRobustRandom random
 
             #region Markings
 
-            Markings.OnMarkingAdded += OnMarkingChange;
-            Markings.OnMarkingRemoved += OnMarkingChange;
-            Markings.OnMarkingColorChange += OnMarkingChange;
+            Markings.OnMarkingAdded += OnMarkingAdded; // WD EDIT
+            Markings.OnMarkingRemoved += OnMarkingRemoved; // WD EDIT
+            Markings.OnMarkingColorChange += OnMarkingUpdate; // WD EDIT
             Markings.OnMarkingRankChange += OnMarkingChange;
 
             #endregion Markings
@@ -1213,6 +1216,38 @@ private void OnMarkingChange(MarkingSet markings)
             ReloadProfilePreview();
         }
 
+        // WD EDIT START
+        private void OnMarkingAdded(MarkingSet markings, Marking marking)
+        {
+            if (Profile is null)
+                return;
+
+            Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings.GetForwardEnumerator().ToList()));
+            _bodySystem.AddMarking(PreviewDummy, marking);
+            SetDirty();
+        }
+
+        private void OnMarkingRemoved(MarkingSet markings, Marking marking)
+        {
+            if (Profile is null)
+                return;
+
+            Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings.GetForwardEnumerator().ToList()));
+            _bodySystem.RemoveMarking(PreviewDummy, marking);
+            SetDirty();
+        }
+
+        private void OnMarkingUpdate(MarkingSet markings, Marking marking)
+        {
+            if (Profile is null)
+                return;
+
+            Profile = Profile.WithCharacterAppearance(Profile.Appearance.WithMarkings(markings.GetForwardEnumerator().ToList()));
+            _bodySystem.UpdateMarking(PreviewDummy, marking);
+            SetDirty();
+        }
+        // WD EDIT END
+
         private void OnSkinColorOnValueChanged()
         {
             if (Profile is null)
@@ -1426,7 +1461,7 @@ private void SetSpecies(string newSpecies)
             UpdateWeight();
             UpdateSpeciesGuidebookIcon();
             UpdateBodyTypes(); // WD EDIT
-            ReloadProfilePreview();
+            ReloadPreview(); // WD EDIT: ReloadProfilePreview -> ReloadPreview. This should use a new doll
             ReloadClothes(); // Species may have job-specific gear, reload the clothes
         }
 
@@ -1546,7 +1581,7 @@ private void UpdateBodyTypes()
                 CBodyTypesButton.AddItem(Loc.GetString(_bodyTypes[i].Name), i);
 
             // If current body type is not valid.
-            if (!_bodyTypes.Select(proto => proto.ID).Contains(Profile.BodyType))
+            if (!_bodyTypes.Select<BodyTypePrototype, ProtoId<BodyTypePrototype>>(proto => proto.ID).Contains(Profile.BodyType))
             {
                 // Then replace it with a first valid body type.
                 SetBodyType(_bodyTypes.First().ID);
@@ -1913,7 +1948,7 @@ private void UpdateCMarkingsHair()
             {
                 if (_markingManager.CanBeApplied(Profile.Species, Profile.Sex, hairProto, _prototypeManager))
                 {
-                    hairColor = _markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out _, _prototypeManager)
+                    hairColor = _markingManager.MustMatchSkin(Profile.Species, MarkingCategories.Hair, out _, _prototypeManager) // WD EDIT
                         ? Profile.Appearance.SkinColor
                         : Profile.Appearance.HairColor;
                 }
@@ -1937,7 +1972,7 @@ private void UpdateCMarkingsFacialHair()
             {
                 if (_markingManager.CanBeApplied(Profile.Species, Profile.Sex, facialHairProto, _prototypeManager))
                 {
-                    facialHairColor = _markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out _, _prototypeManager)
+                    facialHairColor = _markingManager.MustMatchSkin(Profile.Species, MarkingCategories.Hair, out _, _prototypeManager) // WD EDIT
                         ? Profile.Appearance.SkinColor
                         : Profile.Appearance.FacialHairColor;
                 }
diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
index 374a2d7aa48..2d561ba5f21 100644
--- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
@@ -114,8 +114,7 @@ public StatusControl(NetworkConfiguratorComponent configurator, string keyBindin
             _configurator = configurator;
             _keyBindingName = keyBindingName;
             _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
-            if (_configurator.ShowLabel) // Shitmed - Starlight Abductors: Allow hiding the label on multitools that dont need List mode.
-                AddChild(_label);
+            AddChild(_label);
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
@@ -127,9 +126,6 @@ protected override void FrameUpdate(FrameEventArgs args)
 
             _linkModeActive = _configurator.LinkModeActive;
 
-            if (!_configurator.ShowLabel) // Shitmed - Starlight Abductors: Allow hiding the label on multitools that dont need List mode.
-                return;
-
             var modeLocString = _linkModeActive??false
                 ? "network-configurator-examine-mode-link"
                 : "network-configurator-examine-mode-list";
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index b3d085913b1..82bf40aa80f 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -348,19 +348,23 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(EngineKeyFunctions.EscapeMenu);
             AddButton(ContentKeyFunctions.EscapeContext);
 
-            // Shitmed Change Start - TODO: Add groin targeting.
-            AddHeader("ui-options-header-targeting");
-            AddButton(ContentKeyFunctions.TargetHead);
-            AddButton(ContentKeyFunctions.TargetTorso);
-            AddButton(ContentKeyFunctions.TargetLeftArm);
-            AddButton(ContentKeyFunctions.TargetLeftHand);
-            AddButton(ContentKeyFunctions.TargetRightArm);
-            AddButton(ContentKeyFunctions.TargetRightHand);
-            AddButton(ContentKeyFunctions.TargetLeftLeg);
-            AddButton(ContentKeyFunctions.TargetLeftFoot);
-            AddButton(ContentKeyFunctions.TargetRightLeg);
-            AddButton(ContentKeyFunctions.TargetRightFoot);
-            // Shitmed Change End
+            // WD EDIT START
+            AddHeader("ui-options-header-target-doll");
+            AddButton(ContentKeyFunctions.TargetDollHead);
+            AddButton(ContentKeyFunctions.TargetDollChest);
+            AddButton(ContentKeyFunctions.TargetDollGroin);
+            AddButton(ContentKeyFunctions.TargetDollRightArm);
+            AddButton(ContentKeyFunctions.TargetDollRightHand);
+            AddButton(ContentKeyFunctions.TargetDollLeftArm);
+            AddButton(ContentKeyFunctions.TargetDollLeftHand);
+            AddButton(ContentKeyFunctions.TargetDollRightLeg);
+            AddButton(ContentKeyFunctions.TargetDollRightFoot);
+            AddButton(ContentKeyFunctions.TargetDollLeftLeg);
+            AddButton(ContentKeyFunctions.TargetDollLeftFoot);
+            AddButton(ContentKeyFunctions.TargetDollTail);
+            AddButton(ContentKeyFunctions.TargetDollEyes);
+            AddButton(ContentKeyFunctions.TargetDollMouth);
+            // WD EDIT END
 
             AddHeader("ui-options-header-misc");
             AddButton(ContentKeyFunctions.TakeScreenshot);
diff --git a/Content.Client/Overlays/Switchable/ThermalVisionOverlay.cs b/Content.Client/Overlays/Switchable/ThermalVisionOverlay.cs
index 010d1411702..f002922aed5 100644
--- a/Content.Client/Overlays/Switchable/ThermalVisionOverlay.cs
+++ b/Content.Client/Overlays/Switchable/ThermalVisionOverlay.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client.Stealth;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Overlays.Switchable;
 using Content.Shared.Stealth.Components;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
index 2a0380f71dd..26a24ad905c 100644
--- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs
+++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
@@ -7,7 +7,6 @@
 using Robust.Shared.Physics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Content.Shared.Movement.Components; // Shitmed - Starlight Abductors Change
 
 namespace Content.Client.Silicons.StationAi;
 
@@ -52,13 +51,6 @@ protected override void Draw(in OverlayDrawArgs args)
 
         var playerEnt = _player.LocalEntity;
 
-        // Shitmed - Starlight Abductors Change Start
-        if (_entManager.TryGetComponent(playerEnt, out StationAiOverlayComponent? stationAiOverlay)
-            && stationAiOverlay.AllowCrossGrid
-            && _entManager.TryGetComponent(playerEnt, out RelayInputMoverComponent? relay))
-            playerEnt = relay.RelayEntity;
-        // Shitmed Change End
-
         _entManager.TryGetComponent(playerEnt, out TransformComponent? playerXform);
         var gridUid = playerXform?.GridUid ?? EntityUid.Invalid;
         _entManager.TryGetComponent(gridUid, out MapGridComponent? grid);
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index b4704be7dd8..bac6c475b96 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -1862,59 +1862,6 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     {
                         new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png"))
                     }),
-                // Shitmed Change Start
-                Element<TextureButton>().Class("TargetDollButtonHead")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/head_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonChest")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/torso_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonGroin")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/groin_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftArm")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/leftarm_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftHand")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/lefthand_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightArm")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/rightarm_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightHand")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/righthand_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftLeg")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/leftleg_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonLeftFoot")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightLeg")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/rightleg_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonRightFoot")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonEyes")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/eyes_hover.png")),
-
-                Element<TextureButton>().Class("TargetDollButtonMouth")
-                    .Pseudo(TextureButton.StylePseudoClassHover)
-                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/_Shitmed/Interface/Targeting/Doll/mouth_hover.png")),
-                // Shitmed Change End
 
             }).ToList());
         }
diff --git a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
index 58c6caa1c22..9190cba68ed 100644
--- a/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/OverlayChatGameScreen.xaml
@@ -9,9 +9,9 @@
     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._Shitmed.UserInterface.Systems.Targeting.Widgets"
     xmlns:combatMode="clr-namespace:Content.Client._White.UserInterface.Systems.CombatMode.Widgets"
     xmlns:movement="clr-namespace:Content.Client._White.UserInterface.Systems.Movement.Widgets"
+    xmlns:targetDoll="clr-namespace:Content.Client._White.UserInterface.Systems.TargetDoll.Widgets"
     Name="DefaultHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -35,7 +35,7 @@
     <BoxContainer Name="BottomRight" Align="End" SeparationOverride="3" Access="Protected">
         <combatMode:CombatModeGui Name="CombatMode" Access="Protected"/>
         <movement:MovementGui Name="Movement" Access="Protected"/>
-        <targeting:TargetingControl Name="Targeting" Access="Protected"/>
+        <targetDoll:TargetDollGui Name="TargetDoll" Access="Protected" />
     </BoxContainer>
     <!-- WD EDIT END -->
     <chat:ResizableChatBox Name="Chat" Access="Protected" />
diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
index 02c3416f5bc..a0d62c8c770 100644
--- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
+++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
@@ -10,9 +10,9 @@
     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._Shitmed.UserInterface.Systems.Targeting.Widgets"
     xmlns:combatMode="clr-namespace:Content.Client._White.UserInterface.Systems.CombatMode.Widgets"
     xmlns:movement="clr-namespace:Content.Client._White.UserInterface.Systems.Movement.Widgets"
+    xmlns:targetDoll="clr-namespace:Content.Client._White.UserInterface.Systems.TargetDoll.Widgets"
     Name="SeparatedChatHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"
@@ -27,7 +27,7 @@
             <BoxContainer Name="BottomRight" Align="End" SeparationOverride="3" Access="Protected">
                 <combatMode:CombatModeGui Name="CombatMode" Access="Protected"/>
                 <movement:MovementGui Name="Movement" Access="Protected"/>
-                <targeting:TargetingControl Name="Targeting" Access="Protected"/>
+                <targetDoll:TargetDollGui Name="TargetDoll" Access="Protected" />
             </BoxContainer>
             <!-- WD EDIT END -->
             <BoxContainer Name="TopLeftContainer" Orientation="Vertical">
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
index bbe806318af..55428e6b814 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml
@@ -1,11 +1,7 @@
 <widgets:AlertsUI xmlns="https://spacestation14.io"
-                  xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Alerts.Widgets"
-                  xmlns:partStatus="clr-namespace:Content.Client._Shitmed.UserInterface.Systems.PartStatus.Widgets"
-                  MinSize="64 64">
-    <GridContainer Columns="1" HorizontalAlignment="Right" VerticalAlignment="Top">
-        <PanelContainer >
-            <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
-        </PanelContainer>
-        <partStatus:PartStatusControl Name="PartStatus" Access="Protected"/> <!-- Shitmed Change -->
-    </GridContainer>
+                   xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Alerts.Widgets"
+                   MinSize="64 64">
+    <PanelContainer HorizontalAlignment="Right" VerticalAlignment="Top">
+        <BoxContainer Name="AlertContainer" Access="Public" Orientation="Vertical" />
+    </PanelContainer>
 </widgets:AlertsUI>
diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
index 7ddbe41c2fe..49a2fba8981 100644
--- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
@@ -21,6 +21,7 @@
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using static Content.Client.Inventory.ClientInventorySystem;
 
@@ -242,7 +243,7 @@ public void ToggleInventoryBar()
     {
         if (_inventoryHotbar == null)
         {
-            Logger.GetSawmill("inventory.ui.control").Warning("Tried to toggle inventory bar when none are assigned");
+            Logger.Warning("Tried to toggle inventory bar when none are assigned");
             return;
         }
 
diff --git a/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleBui.cs b/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleBui.cs
deleted file mode 100644
index d47b2a4fea1..00000000000
--- a/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleBui.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Client._Shitmed.Choice.UI;
-using JetBrains.Annotations;
-using static Content.Shared.Pinpointer.SharedNavMapSystem;
-
-namespace Content.Client._Shitmed.Antags.Abductor;
-
-[UsedImplicitly]
-public sealed class AbductorCameraConsoleBui : BoundUserInterface
-{
-    [ViewVariables]
-    private AbductorCameraConsoleWindow? _window;
-    private int? _station;
-    public AbductorCameraConsoleBui(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-    }
-    protected override void Open() => UpdateState(State);
-    protected override void UpdateState(BoundUserInterfaceState? state)
-    {
-        if (state is AbductorCameraConsoleBuiState s)
-            Update(s);
-    }
-
-    private void Update(AbductorCameraConsoleBuiState state)
-    {
-        TryInitWindow();
-
-        View(ViewType.Stations);
-
-        RefreshUI();
-
-        if (!_window!.IsOpen)
-            _window.OpenCentered();
-    }
-
-    private void TryInitWindow()
-    {
-        if (_window != null) return;
-        _window = new AbductorCameraConsoleWindow();
-        _window.OnClose += Close;
-        _window.Title = "Intercepted cameras.";
-
-        _window.StationsButton.OnPressed += _ =>
-        {
-            _station = null;
-            View(ViewType.Stations);
-        };
-    }
-
-    private void OnStationPressed(int station, List<NavMapBeacon> beacons)
-    {
-        if (_window == null)
-            return;
-
-        _station = station;
-
-        foreach (var beacon in beacons)
-        {
-            var beaconButton = new ChoiceControl();
-
-            beaconButton.Set(beacon.Text, null);
-            beaconButton.Button.Modulate = beacon.Color;
-            beaconButton.Button.OnPressed += _ =>
-            {
-                SendMessage(new AbductorBeaconChosenBuiMsg()
-                {
-                    Beacon = beacon,
-                });
-                Close();
-            };
-            _window.Beacons.AddChild(beaconButton);
-        }
-        View(ViewType.Beacons);
-    }
-
-    private void RefreshUI()
-    {
-        if (_window == null || State is not AbductorCameraConsoleBuiState state)
-            return;
-
-        _window!.Stations.DisposeAllChildren();
-        _window.Beacons.DisposeAllChildren();
-
-        foreach (var station in state.Stations)
-        {
-            var stationButton = new ChoiceControl();
-
-            stationButton.Set(station.Value.Name, null);
-            stationButton.Button.OnPressed += _ => OnStationPressed(station.Key, station.Value.Beacons);
-
-            _window.Stations.AddChild(stationButton);
-
-            if (station.Key == _station) OnStationPressed(station.Key, station.Value.Beacons);
-        }
-    }
-
-    private void View(ViewType type)
-    {
-        if (_window == null)
-            return;
-
-        _window.StationsButton.Parent!.Margin = new Thickness(0, 0, 0, 10);
-
-        _window.Stations.Visible = type == ViewType.Stations;
-        _window.StationsButton.Visible = true;
-
-        _window.Beacons.Visible = type == ViewType.Beacons;
-        _window.BeaconsButton.Disabled = type != ViewType.Beacons;
-
-        _window.Title = State is not AbductorCameraConsoleBuiState state
-            || _station == null
-            || !state.Stations.TryGetValue(_station.Value, out var station)
-            ? "Stations"
-            : $"Station - {station.Name}";
-    }
-
-    private enum ViewType
-    {
-        Stations,
-        Beacons,
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-            _window?.Dispose();
-    }
-}
diff --git a/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleWindow.xaml b/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleWindow.xaml
deleted file mode 100644
index 1ddad42ccc6..00000000000
--- a/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleWindow.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<controls:AbductorCameraConsoleWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client._Shitmed.Antags.Abductor"
-    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    MinSize="400 400">
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 10">
-            <Button Name="StationsButton" Access="Public" Text="&lt; Stations"
-                    HorizontalExpand="True" StyleClasses="OpenBoth" />
-            <Button Name="BeaconsButton" Access="Public" Text="{Loc 'abductors-ui-beacons'}"
-                    HorizontalExpand="True" StyleClasses="OpenBoth" />
-        </BoxContainer>
-        <cc:HSeparator/>
-        <ScrollContainer VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Name="Stations" Access="Public" Orientation="Vertical" Visible="False" />
-            <BoxContainer Name="Beacons" Access="Public" Orientation="Vertical" Visible="False" />
-        </ScrollContainer>
-    </BoxContainer>
-</controls:AbductorCameraConsoleWindow>
diff --git a/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleWindow.xaml.cs b/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleWindow.xaml.cs
deleted file mode 100644
index 42632b13d81..00000000000
--- a/Content.Client/_Shitmed/Antags/Abductor/AbductorCameraConsoleWindow.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._Shitmed.Antags.Abductor;
-[GenerateTypedNameReferences]
-public sealed partial class AbductorCameraConsoleWindow : DefaultWindow
-{
-    public AbductorCameraConsoleWindow() => RobustXamlLoader.Load(this);
-}
diff --git a/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleBui.cs b/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleBui.cs
deleted file mode 100644
index fc01390cc7f..00000000000
--- a/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleBui.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using JetBrains.Annotations;
-using Robust.Client.UserInterface.RichText;
-using Robust.Shared.Utility;
-
-using static Robust.Client.UserInterface.Control;
-
-namespace Content.Client._Shitmed.Antags.Abductor;
-
-[UsedImplicitly]
-public sealed class AbductorConsoleBui : BoundUserInterface
-{
-    [ViewVariables]
-    private AbductorConsoleWindow? _window;
-
-    [ViewVariables]
-    private bool _armorDisabled = false;
-
-    [ViewVariables]
-    private bool _armorLocked = false;
-
-    [ViewVariables]
-    private AbductorArmorModeType _armorMode = AbductorArmorModeType.Stealth;
-
-    public AbductorConsoleBui(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-
-    }
-    protected override void Open() => UpdateState(State);
-    protected override void UpdateState(BoundUserInterfaceState? state)
-    {
-        if (state is AbductorConsoleBuiState s)
-            Update(s);
-    }
-
-    private void Update(AbductorConsoleBuiState state)
-    {
-        TryInitWindow();
-
-        View(ViewType.Teleport);
-
-        RefreshUI();
-
-        if (!_window!.IsOpen)
-            _window.OpenCentered();
-    }
-
-    private void TryInitWindow()
-    {
-        if (_window != null) return;
-        _window = new AbductorConsoleWindow();
-        _window.OnClose += Close;
-        _window.Title = "console";
-
-        _window.TeleportTabButton.OnPressed += _ => View(ViewType.Teleport);
-
-        _window.ExperimentTabButton.OnPressed += _ => View(ViewType.Experiment);
-
-        _window.ArmorControlTabButton.OnPressed += _ => View(ViewType.ArmorControl);
-
-        _window.CombatModeButton.OnPressed += _ =>
-        {
-            _window.StealthModeButton.Disabled = false;
-            _window.CombatModeButton.Disabled = true;
-            SendMessage(new AbductorVestModeChangeBuiMsg()
-            {
-                Mode = AbductorArmorModeType.Combat,
-            });
-        };
-
-        _window.StealthModeButton.OnPressed += _ =>
-        {
-            _window.StealthModeButton.Disabled = true;
-            _window.CombatModeButton.Disabled = false;
-            SendMessage(new AbductorVestModeChangeBuiMsg()
-            {
-                Mode = AbductorArmorModeType.Stealth,
-            });
-        };
-
-        if (_armorMode == AbductorArmorModeType.Combat)
-        {
-            _window.CombatModeButton.Disabled = true;
-            _window.StealthModeButton.Disabled = false;
-        }
-        else
-        {
-            _window.CombatModeButton.Disabled = false;
-            _window.StealthModeButton.Disabled = true;
-        }
-
-        _window.LockArmorButton.OnPressed += _ =>
-        {
-            SendMessage(new AbductorLockBuiMsg());
-
-            _armorLocked = !_armorLocked;
-
-            if (!_armorLocked)
-                _window.LockArmorButton.Text = Loc.GetString("abductors-ui-lock-armor");
-            else
-                _window.LockArmorButton.Text = Loc.GetString("abductors-ui-unlock-armor");
-        };
-    }
-
-    private void RefreshUI()
-    {
-        if (_window == null || State is not AbductorConsoleBuiState state)
-            return;
-
-        // teleportTab
-        _window.TargetLabel.Children.Clear();
-
-        var padMsg = new FormattedMessage();
-        padMsg.AddMarkupOrThrow(state.AlienPadFound ? Loc.GetString("abductor-ui-pad-found") : Loc.GetString("abductor-ui-pad-not-found"));
-        _window.PadLabel.SetMessage(padMsg);
-
-        var msg = new FormattedMessage();
-        msg.AddMarkupOrThrow(state.Target == null ? Loc.GetString("abductor-ui-target-none") : Loc.GetString("abductor-ui-target-found", ("target", state.TargetName ?? "")));
-        _window.TeleportButton.Disabled = state.Target == null || !state.AlienPadFound;
-        _window.TeleportButton.OnPressed += _ =>
-        {
-            SendMessage(new AbductorAttractBuiMsg());
-            Close();
-        };
-        _window.TargetLabel.SetMessage(msg, new Type[1] { typeof(ColorTag) });
-
-        // experiment tab
-
-        var experimentatorMsg = new FormattedMessage();
-        experimentatorMsg.AddMarkupOrThrow(state.AlienPadFound ? Loc.GetString("abductor-ui-experimentator-connected") : Loc.GetString("abductor-ui-experimentator-not-found"));
-        _window.ExperimentatorLabel.SetMessage(experimentatorMsg);
-
-        var victimMsg = new FormattedMessage();
-        victimMsg.AddMarkupOrThrow(state.VictimName == null ? Loc.GetString("abductor-ui-victim-none") : Loc.GetString("abductor-ui-victim-found", ("victim", state.VictimName ?? "")));
-        _window.VictimLabel.SetMessage(victimMsg);
-
-        _window.CompleteExperimentButton.Disabled = state.VictimName == null;
-        _window.CompleteExperimentButton.OnPressed += _ =>
-        {
-            SendMessage(new AbductorCompleteExperimentBuiMsg());
-            Close();
-        };
-
-        // armor tab
-        _armorLocked = state.ArmorLocked;
-
-        if (!_armorLocked)
-            _window.LockArmorButton.Text = Loc.GetString("abductors-ui-lock-armor");
-        else
-            _window.LockArmorButton.Text = Loc.GetString("abductors-ui-unlock-armor");
-
-        _armorDisabled = state.ArmorFound;
-        _armorMode = state.CurrentArmorMode;
-
-        if (_armorMode == AbductorArmorModeType.Combat)
-        {
-            _window.CombatModeButton.Disabled = true;
-            _window.StealthModeButton.Disabled = false;
-        }
-        else
-        {
-            _window.CombatModeButton.Disabled = false;
-            _window.StealthModeButton.Disabled = true;
-        }
-        UpdateDisabledPanel(_armorDisabled);
-    }
-
-    private void UpdateDisabledPanel(bool disable)
-    {
-        if (_window == null)
-            return;
-
-        if (disable || !_window.ArmorControlTab.Visible)
-        {
-            _window.DisabledPanel.Visible = false;
-            _window.DisabledPanel.MouseFilter = MouseFilterMode.Ignore;
-            return;
-        }
-
-        _window.DisabledPanel.Visible = true;
-        if (_window.DisabledLabel.GetMessage() is null)
-        {
-            var text = new FormattedMessage();
-            text.AddMarkupOrThrow(Loc.GetString("abductor-ui-armor-plug-in"));
-            _window.DisabledLabel.SetMessage(text);
-        }
-
-        _window.DisabledPanel.MouseFilter = MouseFilterMode.Stop;
-    }
-
-    private void View(ViewType type)
-    {
-        if (_window == null)
-            return;
-
-        _window.TeleportTabButton.Parent!.Margin = new Thickness(0, 0, 0, 10);
-
-        _window.TeleportTabButton.Disabled = type == ViewType.Teleport;
-        _window.ArmorControlTabButton.Disabled = type == ViewType.ArmorControl;
-        _window.ExperimentTabButton.Disabled = type == ViewType.Experiment;
-        _window.TeleportTab.Visible = type == ViewType.Teleport;
-        _window.ExperimentTab.Visible = type == ViewType.Experiment;
-        _window.ArmorControlTab.Visible = type == ViewType.ArmorControl;
-
-        UpdateDisabledPanel(_armorDisabled);
-    }
-
-    private enum ViewType
-    {
-        Teleport,
-        Experiment,
-        ArmorControl
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-
-        if (disposing)
-            _window?.Dispose();
-    }
-}
diff --git a/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleWindow.xaml b/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleWindow.xaml
deleted file mode 100644
index a8f00b46f7e..00000000000
--- a/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleWindow.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<controls:AbductorConsoleWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client._Shitmed.Antags.Abductor"
-    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="TeleportTabButton" Access="Public" Text="{Loc 'abductors-ui-teleport'}" HorizontalExpand="True" StyleClasses="OpenBoth" />
-            <Button Name="ExperimentTabButton" Access="Public" Text="{Loc 'abductors-ui-experiment'}" HorizontalExpand="True" StyleClasses="OpenBoth" />
-            <Button Name="ArmorControlTabButton" Access="Public" Text="{Loc 'abductors-ui-armor-control'}" HorizontalExpand="True" StyleClasses="OpenBoth" />
-        </BoxContainer>
-        <cc:HSeparator/>
-        <ScrollContainer VScrollEnabled="True" HorizontalExpand="True" VerticalExpand="True">
-            <BoxContainer Name="TeleportTab" Access="Public" Orientation="Vertical" Visible="False">
-                <RichTextLabel Name="PadLabel" Access="Public"/>
-                <RichTextLabel Name="TargetLabel" Access="Public" />
-                <Button Name="TeleportButton" Access="Public" Text="{Loc 'abductors-ui-attract'}" HorizontalExpand="True" StyleClasses="OpenBoth" />
-            </BoxContainer>
-            <BoxContainer Name="ExperimentTab" Access="Public" Orientation="Vertical" Visible="False">
-                <RichTextLabel Name="ExperimentLabel" Access="Public"/>
-                <RichTextLabel Name="ExperimentatorLabel" Access="Public"/>
-                <RichTextLabel Name="VictimLabel" Access="Public"/>
-                <Button Name="CompleteExperimentButton" Access="Public" Text="{Loc 'abductors-ui-complete-experiment'}" HorizontalExpand="True" StyleClasses="OpenBoth" />
-            </BoxContainer>
-             <BoxContainer Name="ArmorControlTab" Access="Public" Orientation="Vertical" Visible="False">
-                <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 0 0 10">
-                    <Button Name="CombatModeButton" Access="Public" Text="{Loc 'abductors-ui-combat-mode'}" HorizontalExpand="True" StyleClasses="OpenBoth" />
-                    <Button Name="StealthModeButton" Access="Public" Text="{Loc 'abductors-ui-stealth-mode'}" HorizontalExpand="True" StyleClasses="OpenBoth" />
-                </BoxContainer>
-                <Button Name="LockArmorButton" Access="Public" Text="{Loc 'abductors-ui-lock-armor'}" HorizontalExpand="True" StyleClasses="OpenBoth" Margin="0 10 0 0" />
-            </BoxContainer>
-            <PanelContainer Name="DisabledPanel" Access="Public" HorizontalExpand="True"
-                            VerticalExpand="True" Visible="False">
-                <PanelContainer.PanelOverride>
-                    <graphics:StyleBoxFlat BackgroundColor="#000000BF" />
-                </PanelContainer.PanelOverride>
-                <RichTextLabel Name="DisabledLabel" Access="Public" HorizontalAlignment="Center" />
-            </PanelContainer>
-        </ScrollContainer>
-    </BoxContainer>
-</controls:AbductorConsoleWindow>
diff --git a/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleWindow.xaml.cs b/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleWindow.xaml.cs
deleted file mode 100644
index 742ff4be617..00000000000
--- a/Content.Client/_Shitmed/Antags/Abductor/AbductorConsoleWindow.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._Shitmed.Antags.Abductor;
-[GenerateTypedNameReferences]
-public sealed partial class AbductorConsoleWindow : DefaultWindow
-{
-    public AbductorConsoleWindow() => RobustXamlLoader.Load(this);
-}
diff --git a/Content.Client/_Shitmed/Antags/Abductor/AbductorSystem.cs b/Content.Client/_Shitmed/Antags/Abductor/AbductorSystem.cs
deleted file mode 100644
index 006b238a672..00000000000
--- a/Content.Client/_Shitmed/Antags/Abductor/AbductorSystem.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-
-namespace Content.Client._Shitmed.Antags.Abductor;
-
-public sealed class AbductorSystem : SharedAbductorSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
-}
diff --git a/Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml b/Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml
deleted file mode 100644
index 2ae514e373e..00000000000
--- a/Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<controls:FancyWindow
-        xmlns="https://spacestation14.io"
-        xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-        Title="{Loc 'autodoc-add-step'}">
-    <BoxContainer Orientation="Vertical">
-        <Button Name="SurgeryButton" Text="{Loc 'autodoc-add-step-surgery'}"/>
-        <Button Name="GrabItemButton" Text="{Loc 'autodoc-add-step-grab-item'}"/>
-        <Button Name="GrabOrganButton" Text="{Loc 'autodoc-add-step-grab-organ'}"/>
-        <Button Name="GrabPartButton" Text="{Loc 'autodoc-add-step-grab-part'}"/>
-        <Button Name="StoreItemButton" Text="{Loc 'autodoc-add-step-store-item'}"/>
-        <Button Name="SetLabelButton" Text="{Loc 'autodoc-add-step-set-label'}"/>
-        <Button Name="WaitButton" Text="{Loc 'autodoc-add-step-wait'}"/>
-    </BoxContainer>
-</controls:FancyWindow>
diff --git a/Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml.cs b/Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml.cs
deleted file mode 100644
index 9a4f3d52458..00000000000
--- a/Content.Client/_Shitmed/Autodoc/AddStepWindow.xaml.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Administration;
-using Content.Shared._Shitmed.Autodoc;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._Shitmed.Autodoc;
-
-[GenerateTypedNameReferences]
-public sealed partial class AddStepWindow : FancyWindow
-{
-    public event Action<IAutodocStep>? OnAddStep;
-
-    private PickSurgeryWindow? _surgery;
-    private DialogWindow? _grab;
-    private DialogWindow? _label;
-    private DialogWindow? _wait;
-
-    public AddStepWindow()
-    {
-        RobustXamlLoader.Load(this);
-
-        // close the window once any step is added
-        OnAddStep += _ => Close();
-
-        OnClose += () =>
-        {
-            _surgery?.Close();
-            _grab?.Close();
-            _label?.Close();
-            _wait?.Close();
-        };
-
-        // dedicated ui to pick the enum values and surgery type
-        SurgeryButton.OnPressed += _ =>
-        {
-            if (_surgery is {} window)
-            {
-                window.MoveToFront();
-                return;
-            }
-
-            _surgery = new PickSurgeryWindow();
-            _surgery.OnAddStep += step => OnAddStep?.Invoke(step);
-            _surgery.OnClose += () => _surgery = null;
-            _surgery.OpenCentered();
-        };
-
-        // just picking a string, use a dialog
-        GrabItemButton.OnPressed += _ =>
-        {
-            if (_grab is {} dialog)
-            {
-                dialog.MoveToFront();
-                return;
-            }
-
-            var field = "name";
-            var prompt = Loc.GetString("autodoc-add-step-grab-item-prompt");
-            var placeholder = Loc.GetString("autodoc-add-step-grab-item-placeholder");
-            var entry = new QuickDialogEntry(field, QuickDialogEntryType.ShortText, prompt, placeholder);
-            var entries = new List<QuickDialogEntry> { entry };
-            _grab = new DialogWindow(GrabItemButton.Text!, entries);
-            _grab.OnConfirmed += responses =>
-            {
-                var name = responses[field].Trim();
-                if (name.Length < 1 || name.Length > 100)
-                    return;
-
-                OnAddStep?.Invoke(new GrabItemAutodocStep()
-                {
-                    Name = name
-                });
-            };
-            _grab.OnClose += () => _grab = null;
-        };
-
-        // no arguments so these are trivial
-        GrabOrganButton.OnPressed += _ => OnAddStep?.Invoke(new GrabAnyOrganAutodocStep());
-        GrabPartButton.OnPressed += _ => OnAddStep?.Invoke(new GrabAnyBodyPartAutodocStep());
-        StoreItemButton.OnPressed += _ => OnAddStep?.Invoke(new StoreItemAutodocStep());
-
-        SetLabelButton.OnPressed += _ =>
-        {
-            if (_label is {} dialog)
-            {
-                dialog.MoveToFront();
-                return;
-            }
-
-            var field = "label";
-            var prompt = Loc.GetString("autodoc-add-step-set-label-prompt");
-            var entry = new QuickDialogEntry(field, QuickDialogEntryType.ShortText, prompt);
-            var entries = new List<QuickDialogEntry> { entry };
-            _label = new DialogWindow(SetLabelButton.Text!, entries);
-            _label.OnConfirmed += responses =>
-            {
-                var label = responses[field].Trim();
-                if (label.Length < 1 || label.Length > 20)
-                    return;
-
-                OnAddStep?.Invoke(new SetLabelAutodocStep()
-                {
-                    Label = label
-                });
-            };
-            _label.OnClose += () => _label = null;
-        };
-
-        WaitButton.OnPressed += _ =>
-        {
-            if (_wait is {} dialog)
-            {
-                dialog.MoveToFront();
-                return;
-            }
-
-            var field = "length";
-            var prompt = Loc.GetString("autodoc-add-step-wait-prompt");
-            var entry = new QuickDialogEntry(field, QuickDialogEntryType.Integer, prompt);
-            var entries = new List<QuickDialogEntry> { entry };
-            _wait = new DialogWindow(WaitButton.Text!, entries);
-            _wait.OnConfirmed += responses =>
-            {
-                var length = int.Parse(responses[field].Trim());
-                if (length < 1 || length > 30)
-                    return;
-
-                OnAddStep?.Invoke(new WaitAutodocStep()
-                {
-                    Length = length
-                });
-            };
-            _wait.OnClose += () => _wait = null;
-        };
-    }
-}
diff --git a/Content.Client/_Shitmed/Autodoc/AutodocBoundUserInterface.cs b/Content.Client/_Shitmed/Autodoc/AutodocBoundUserInterface.cs
deleted file mode 100644
index a399442be18..00000000000
--- a/Content.Client/_Shitmed/Autodoc/AutodocBoundUserInterface.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared._Shitmed.Autodoc;
-using Robust.Client.GameObjects;
-using Robust.Client.Player;
-
-namespace Content.Client._Shitmed.Autodoc;
-
-public sealed class AutodocBoundUserInterface : BoundUserInterface
-{
-    [Dependency] private readonly IEntityManager _entMan = default!;
-    [Dependency] private readonly IPlayerManager _player = default!;
-
-    [ViewVariables]
-    private AutodocWindow? _window;
-
-    public AutodocBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-    {
-        _window = new AutodocWindow(owner, _entMan, _player);
-
-        _window.OnCreateProgram += title => SendMessage(new AutodocCreateProgramMessage(title));
-        _window.OnToggleProgramSafety += program => SendMessage(new AutodocToggleProgramSafetyMessage(program));
-        _window.OnRemoveProgram += program => SendMessage(new AutodocRemoveProgramMessage(program));
-
-        _window.OnAddStep += (program, step, index) => SendMessage(new AutodocAddStepMessage(program, step, index));
-        _window.OnRemoveStep += (program, stepIndex) => SendMessage(new AutodocRemoveStepMessage(program, stepIndex));
-
-        _window.OnStart += program => SendMessage(new AutodocStartMessage(program));
-        _window.OnStop += () => SendMessage(new AutodocStopMessage());
-
-        _window.OnClose += () => Close();
-
-        _window.OpenCentered();
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        if (disposing)
-            _window?.Dispose();
-    }
-}
diff --git a/Content.Client/_Shitmed/Autodoc/AutodocProgramWindow.xaml b/Content.Client/_Shitmed/Autodoc/AutodocProgramWindow.xaml
deleted file mode 100644
index e0752231604..00000000000
--- a/Content.Client/_Shitmed/Autodoc/AutodocProgramWindow.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<controls:FancyWindow xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" Title="{Loc 'autodoc-view-program-title'}" SetSize="600 500">
-    <BoxContainer Orientation="Horizontal">
-        <BoxContainer Orientation="Vertical" Margin="5 5 5 5">
-            <Label Name="ProgramTitle"/>
-            <!-- Set to Program.Title -->
-            <Button Name="SafetyButton" Text="{Loc 'autodoc-safety-enabled'}"/>
-            <Button Name="RemoveButton" StyleClasses="Danger" Text="{Loc 'autodoc-remove-program'}"/>
-            <Button Name="AddStepButton" Text="{Loc 'autodoc-add-step'}"/>
-            <Button Name="RemoveStepButton" StyleClasses="Danger" Text="{Loc 'autodoc-remove-step'}" Disabled="True"/>
-            <Button Name="StartButton" StyleClasses="Danger" Text="{Loc 'autodoc-start-program'}"/>
-        </BoxContainer>
-        <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
-            <ItemList Name="Steps"/>
-            <!-- Set to Program.Steps -->
-        </ScrollContainer>
-    </BoxContainer>
-</controls:FancyWindow>
diff --git a/Content.Client/_Shitmed/Autodoc/AutodocProgramWindow.xaml.cs b/Content.Client/_Shitmed/Autodoc/AutodocProgramWindow.xaml.cs
deleted file mode 100644
index 78943d24b6a..00000000000
--- a/Content.Client/_Shitmed/Autodoc/AutodocProgramWindow.xaml.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using Content.Client.UserInterface.Controls;
-using Content.Shared._Shitmed.Autodoc;
-using Content.Shared._Shitmed.Autodoc.Components;
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Timing;
-
-namespace Content.Client._Shitmed.Autodoc;
-
-[GenerateTypedNameReferences]
-public sealed partial class AutodocProgramWindow : FancyWindow
-{
-    [Dependency] private readonly IEntityManager _entMan = default!;
-    private SharedAutodocSystem _autodoc = default!;
-
-    public event Action? OnToggleSafety;
-    public event Action? OnRemoveProgram;
-    public event Action<IAutodocStep, int>? OnAddStep;
-    public event Action<int>? OnRemoveStep;
-    public event Action? OnStart;
-
-    private EntityUid _owner;
-    private AutodocProgram _program;
-    private int _steps;
-    private bool _safety = true;
-
-    private int? _selected;
-    private AddStepWindow? _addStep;
-
-    public AutodocProgramWindow(EntityUid owner, AutodocProgram program)
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        _autodoc = _entMan.System<SharedAutodocSystem>();
-
-        _owner = owner;
-        _program = program;
-
-        OnClose += () => _addStep?.Close();
-
-        SafetyButton.OnPressed += _ =>
-        {
-            OnToggleSafety?.Invoke();
-            program.SkipFailed ^= true;
-            UpdateSafety();
-        };
-        UpdateSafety();
-
-        RemoveButton.OnPressed += _ =>
-        {
-            OnRemoveProgram?.Invoke();
-            Close();
-        };
-
-        AddStepButton.OnPressed += _ =>
-        {
-            if (_addStep is {} window)
-            {
-                window.MoveToFront();
-                return;
-            }
-
-            _addStep = new AddStepWindow();
-            _addStep.OnAddStep += step =>
-            {
-                // if nothing is selected add it to the end
-                // if something is selected, insert just before it
-                var index = _selected ?? program.Steps.Count;
-                OnAddStep?.Invoke(step, index);
-                _selected = null;
-                RemoveButton.Disabled = true;
-                program.Steps.Insert(index, step);
-                UpdateSteps();
-            };
-            _addStep.OnClose += () => _addStep = null;
-            _addStep.OpenCentered();
-        };
-
-        RemoveStepButton.OnPressed += _ =>
-        {
-            if (_selected is not {} index)
-                return;
-
-            _selected = null;
-            RemoveStepButton.Disabled = true;
-            OnRemoveStep?.Invoke(index);
-
-            // Steps.RemoveChild throws for no fucking reason so rebuild it
-            program.Steps.RemoveAt(index);
-            UpdateSteps();
-        };
-
-        StartButton.OnPressed += _ =>
-        {
-            OnStart?.Invoke();
-            Close();
-        };
-
-        Steps.OnItemSelected += args =>
-        {
-            _selected = args.ItemIndex;
-            RemoveStepButton.Disabled = false;
-        };
-        Steps.OnItemDeselected += _ =>
-        {
-            _selected = null;
-            RemoveStepButton.Disabled = true;
-        };
-
-        UpdateSteps();
-        UpdateSafety();
-    }
-
-    private void UpdateSafety()
-    {
-        var safety = !_program.SkipFailed;
-        if (safety == _safety)
-            return;
-
-        _safety = safety;
-
-        SafetyButton.Text = Loc.GetString("autodoc-safety-" + (safety ? "enabled" : "disabled"));
-        if (safety)
-            SafetyButton.RemoveStyleClass("Danger");
-        else
-            SafetyButton.AddStyleClass("Danger");
-    }
-
-    private void UpdateSteps()
-    {
-        var count = _program.Steps.Count;
-        if (_steps == count)
-            return;
-
-        _steps = count;
-
-        Steps.Clear();
-
-        for (int i = 0; i < count; i++)
-        {
-            Steps.AddItem(_program.Steps[i].Title);
-        }
-
-        if (!_entMan.TryGetComponent<AutodocComponent>(_owner, out var comp))
-            return;
-
-        AddStepButton.Disabled = count >= comp.MaxProgramSteps;
-    }
-
-    private void UpdateStart()
-    {
-        if (!_entMan.TryGetComponent<AutodocComponent>(_owner, out var comp))
-            return;
-
-        StartButton.Disabled = _autodoc.GetPatient((_owner, comp)) == null;
-    }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        UpdateSteps();
-        UpdateSafety();
-        UpdateStart();
-    }
-}
diff --git a/Content.Client/_Shitmed/Autodoc/AutodocWindow.xaml b/Content.Client/_Shitmed/Autodoc/AutodocWindow.xaml
deleted file mode 100644
index d84a397adff..00000000000
--- a/Content.Client/_Shitmed/Autodoc/AutodocWindow.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<controls:FancyWindow
-        xmlns="https://spacestation14.io"
-        xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-        Title="{Loc 'autodoc-title'}">
-    <BoxContainer Orientation="Vertical">
-        <ScrollContainer MinWidth="600" MinHeight="400" VerticalExpand="True">
-            <BoxContainer Name="Programs" Orientation="Vertical"/> <!-- Populated at runtime -->
-        </ScrollContainer>
-        <BoxContainer Orientation="Horizontal" Margin="5 5 5 5" Align="Center">
-            <Button Name="CreateProgramButton" StyleClasses="OpenRight" Text="{Loc 'autodoc-create-program'}"/>
-            <Button Name="AbortButton" StyleClasses="OpenLeft" Text="{Loc 'autodoc-abort-program'}" Disabled="True"/>
-        </BoxContainer>
-    </BoxContainer>
-</controls:FancyWindow>
diff --git a/Content.Client/_Shitmed/Autodoc/AutodocWindow.xaml.cs b/Content.Client/_Shitmed/Autodoc/AutodocWindow.xaml.cs
deleted file mode 100644
index d5ef6fa0114..00000000000
--- a/Content.Client/_Shitmed/Autodoc/AutodocWindow.xaml.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Administration;
-using Content.Shared._Shitmed.Autodoc;
-using Content.Shared._Shitmed.Autodoc.Components;
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
-using Robust.Client.Player;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Timing;
-
-namespace Content.Client._Shitmed.Autodoc;
-
-[GenerateTypedNameReferences]
-public sealed partial class AutodocWindow : FancyWindow
-{
-    private IEntityManager _entMan;
-    private IPlayerManager _player;
-    private SharedAutodocSystem _autodoc;
-
-    private EntityUid _owner;
-    private bool _active;
-    private int _programCount = 0;
-
-    public event Action<string>? OnCreateProgram;
-    public event Action<int>? OnToggleProgramSafety;
-    public event Action<int>? OnRemoveProgram;
-    public event Action<int, IAutodocStep, int>? OnAddStep;
-    public event Action<int, int>? OnRemoveStep;
-    public event Action<int>? OnStart;
-    public event Action? OnStop;
-
-    private DialogWindow? _dialog;
-    private AutodocProgramWindow? _currentProgram;
-
-    public AutodocWindow(EntityUid owner, IEntityManager entMan, IPlayerManager player)
-    {
-        RobustXamlLoader.Load(this);
-
-        _entMan = entMan;
-        _player = player;
-        _autodoc = entMan.System<SharedAutodocSystem>();
-
-        _owner = owner;
-
-        OnClose += () =>
-        {
-            _dialog?.Close();
-            _currentProgram?.Close();
-        };
-
-        CreateProgramButton.OnPressed += _ =>
-        {
-            if (_dialog != null)
-            {
-                _dialog.MoveToFront();
-                return;
-            }
-
-            if (!_entMan.TryGetComponent<AutodocComponent>(_owner, out var comp))
-                return;
-
-            var field = "title";
-            var prompt = Loc.GetString("autodoc-program-title");
-            var placeholder = Loc.GetString("autodoc-program-title-placeholder", ("number", comp.Programs.Count + 1));
-            var entry = new QuickDialogEntry(field, QuickDialogEntryType.ShortText, prompt, placeholder);
-            var entries = new List<QuickDialogEntry> { entry };
-            _dialog = new DialogWindow(CreateProgramButton.Text!, entries);
-            _dialog.OnConfirmed += responses =>
-            {
-                var title = responses[field].Trim();
-                if (title.Length < 1 || title.Length > comp.MaxProgramTitleLength)
-                    return;
-
-                OnCreateProgram?.Invoke(title);
-            };
-
-            // prevent MoveToFront being called on a closed window and double closing
-            _dialog.OnClose += () => _dialog = null;
-        };
-
-        AbortButton.AddStyleClass("Danger");
-        AbortButton.OnPressed += _ => OnStop?.Invoke();
-
-        UpdateActive();
-        UpdatePrograms();
-    }
-
-    public void UpdateActive()
-    {
-        if (!_entMan.TryGetComponent<AutodocComponent>(_owner, out var comp))
-            return;
-
-        // UI must be in the inactive state by default, since this wont run when inactive at startup
-        var active = _entMan.HasComponent<ActiveAutodocComponent>(_owner);
-        if (active == _active)
-            return;
-
-        _active = active;
-
-        CreateProgramButton.Disabled = active || _programCount >= comp.MaxPrograms;
-        AbortButton.Disabled = !active;
-        foreach (var button in Programs.Children)
-        {
-            ((Button) button).Disabled = active;
-        }
-
-        if (!active)
-            return;
-
-        // close windows that can only be open when inactive
-        _dialog?.Close();
-        _currentProgram?.Close();
-    }
-
-    private void UpdatePrograms()
-    {
-        if (!_entMan.TryGetComponent<AutodocComponent>(_owner, out var comp))
-            return;
-
-        var count = comp.Programs.Count;
-        if (count == _programCount)
-            return;
-
-        _programCount = count;
-
-        CreateProgramButton.Disabled = _active || _programCount >= comp.MaxPrograms;
-
-        Programs.RemoveAllChildren();
-        for (int i = 0; i < comp.Programs.Count; i++)
-        {
-            var button = new Button()
-            {
-                Text = comp.Programs[i].Title
-            };
-            var index = i;
-            button.OnPressed += _ => OpenProgram(index);
-            button.Disabled = _active;
-            Programs.AddChild(button);
-        }
-    }
-
-    private void OpenProgram(int index)
-    {
-        if (!_entMan.TryGetComponent<AutodocComponent>(_owner, out var comp))
-            return;
-
-        // no editing multiple programs at once
-        if (_currentProgram is {} existing)
-            existing.Close();
-
-        var window = new AutodocProgramWindow(_owner, comp.Programs[index]);
-        window.OnToggleSafety += () => OnToggleProgramSafety?.Invoke(index);
-        window.OnRemoveProgram += () =>
-        {
-            OnRemoveProgram?.Invoke(index);
-            Programs.RemoveChild(index);
-        };
-        window.OnAddStep += (step, stepIndex) => OnAddStep?.Invoke(index, step, stepIndex);
-        window.OnRemoveStep += step => OnRemoveStep?.Invoke(index, step);
-        window.OnStart += () =>
-        {
-            if (_active)
-                return;
-
-            OnStart?.Invoke(index);
-
-            // predict it starting the program
-            _entMan.EnsureComponent<ActiveAutodocComponent>(_owner);
-        };
-        window.OnClose += () => _currentProgram = null;
-        _currentProgram = window;
-
-        window.OpenCentered();
-    }
-
-    protected override void FrameUpdate(FrameEventArgs args)
-    {
-        base.FrameUpdate(args);
-
-        UpdateActive();
-        UpdatePrograms();
-    }
-}
diff --git a/Content.Client/_Shitmed/Autodoc/PickSurgeryWindow.xaml b/Content.Client/_Shitmed/Autodoc/PickSurgeryWindow.xaml
deleted file mode 100644
index 4923890157c..00000000000
--- a/Content.Client/_Shitmed/Autodoc/PickSurgeryWindow.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<controls:FancyWindow
-        xmlns="https://spacestation14.io"
-        xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-        Title="{Loc 'autodoc-add-step-surgery'}"
-        MinSize="600 400">
-    <BoxContainer Orientation="Horizontal" VerticalExpand="True" HorizontalExpand="True">
-        <BoxContainer Orientation="Vertical" MinWidth="200" HorizontalAlignment="Center">
-            <BoxContainer Name="Symmetry" Orientation="Horizontal" HorizontalExpand="True"/> <!-- Populated with a radio option of BodyPartSymmetry values -->
-            <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5"/>
-            <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
-                <ItemList Name="Parts"/> <!-- Populated with BodyPartType values -->
-            </ScrollContainer>
-            <PanelContainer StyleClasses="LowDivider" Margin="0 5 0 5"/>
-            <Button Name="SubmitButton" Text="{Loc 'autodoc-submit'}" Disabled="True"/>
-        </BoxContainer>
-        <ScrollContainer HorizontalExpand="True">
-            <ItemList Name="Surgeries"/> <!-- Populated with SharedSurgerySystem.AllSurgeries -->
-        </ScrollContainer>
-    </BoxContainer>
-</controls:FancyWindow>
diff --git a/Content.Client/_Shitmed/Autodoc/PickSurgeryWindow.xaml.cs b/Content.Client/_Shitmed/Autodoc/PickSurgeryWindow.xaml.cs
deleted file mode 100644
index 64a3a11367a..00000000000
--- a/Content.Client/_Shitmed/Autodoc/PickSurgeryWindow.xaml.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using Content.Client.UserInterface.Controls;
-using Content.Shared._Shitmed.Autodoc;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared._Shitmed.Medical.Surgery.Conditions;
-using Content.Shared.Body.Part;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client._Shitmed.Autodoc;
-
-[GenerateTypedNameReferences]
-public sealed partial class PickSurgeryWindow : FancyWindow
-{
-    [Dependency] private readonly IEntityManager _entMan = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    private readonly SharedSurgerySystem _surgery;
-
-    public event Action<IAutodocStep>? OnAddStep;
-
-    private BodyPartType? _part;
-    private BodyPartSymmetry? _symmetry;
-    private EntProtoId<SurgeryComponent>? _surgeryId;
-
-    public PickSurgeryWindow()
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        _surgery = _entMan.System<SharedSurgerySystem>();
-
-        OnAddStep += _ => Close();
-
-        var options = new RadioOptions<BodyPartSymmetry?>(RadioOptionsLayout.Horizontal);
-        options.ButtonStyle = "OpenBoth";
-        options.FirstButtonStyle = "OpenRight";
-        options.LastButtonStyle = "OpenLeft";
-        options.AddItem(Loc.GetString("autodoc-body-symmetry-ignored"), null);
-
-        foreach (var symmetry in Enum.GetValues<BodyPartSymmetry>())
-        {
-            var name = Loc.GetString("autodoc-body-symmetry-" + symmetry.ToString());
-            options.AddItem(name, symmetry);
-        }
-
-        Symmetry.AddChild(options);
-
-        options.OnItemSelected += args =>
-        {
-            args.Button.Select(args.Id);
-            _symmetry = args.Button.SelectedValue;
-            UpdateSurgeries();
-        };
-
-        foreach (var part in Enum.GetValues<BodyPartType>())
-        {
-            var name = Loc.GetString("autodoc-body-part-" + part.ToString());
-            Parts.AddItem(name, metadata: part);
-        }
-
-        Parts.OnItemSelected += args =>
-        {
-            if (Parts[args.ItemIndex].Metadata is not BodyPartType part)
-                return;
-
-            _part = part;
-            UpdateSubmit();
-            UpdateSurgeries();
-        };
-        Parts.OnItemDeselected += _ =>
-        {
-            _part = null;
-            SubmitButton.Disabled = true;
-        };
-
-        Surgeries.OnItemSelected += args =>
-        {
-            if (Surgeries[args.ItemIndex].Metadata is not EntProtoId<SurgeryComponent> id)
-                return;
-
-            _surgeryId = id;
-            UpdateSubmit();
-        };
-        Surgeries.OnItemDeselected += _ =>
-        {
-            _surgeryId = null;
-            SubmitButton.Disabled = true;
-        };
-
-        SubmitButton.OnPressed += _ =>
-        {
-            var step = new SurgeryAutodocStep()
-            {
-                Part = _part!.Value,
-                Symmetry = _symmetry,
-                Surgery = _surgeryId!.Value
-            };
-            OnAddStep?.Invoke(step);
-        };
-
-        UpdateSurgeries();
-    }
-
-    // doesn't handle prototype reload so you have to reopen the window to see new surgeries
-    private void UpdateSurgeries()
-    {
-        Surgeries.Clear();
-
-        foreach (var id in _surgery.AllSurgeries)
-        {
-            var name = _proto.Index(id).Name;
-            var protoId = new EntProtoId<SurgeryComponent>(id);
-            if (_part is not BodyPartType part)
-            {
-                Surgeries.AddItem(name, metadata: protoId);
-                continue;
-            }
-
-            var ent = _surgery.GetSingleton(protoId);
-            if (ent is null)
-                continue;
-
-            if (!_entMan.TryGetComponent<SurgeryPartConditionComponent>(ent.Value, out var comp))
-            {
-                Surgeries.AddItem(name, metadata: protoId);
-                continue;
-            }
-
-            var partOk = comp.Part == part;
-            var symmetryOk = (comp.Symmetry == null || _symmetry == null) ? true : comp.Symmetry == _symmetry;
-
-            var passesFilter = (partOk && symmetryOk) ^ comp.Inverse;
-
-            if (passesFilter)
-                Surgeries.AddItem(name, metadata: protoId);
-        }
-        Surgeries.SortItemsByText();
-    }
-
-    private void UpdateSubmit()
-    {
-        // symmetry is optional, others are not
-        SubmitButton.Disabled = _part == null || _surgeryId == null;
-    }
-}
diff --git a/Content.Client/_Shitmed/Autodoc/Systems/AutodocSystem.cs b/Content.Client/_Shitmed/Autodoc/Systems/AutodocSystem.cs
deleted file mode 100644
index c5fd9841377..00000000000
--- a/Content.Client/_Shitmed/Autodoc/Systems/AutodocSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared._Shitmed.Autodoc.Systems;
-
-namespace Content.Client._Shitmed.Autodoc.Systems;
-
-public sealed class AutodocSystem : SharedAutodocSystem;
diff --git a/Content.Client/_Shitmed/Body/Components/BrainComponent.cs b/Content.Client/_Shitmed/Body/Components/BrainComponent.cs
deleted file mode 100644
index 13c51a1a62d..00000000000
--- a/Content.Client/_Shitmed/Body/Components/BrainComponent.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Client._Shitmed.Body.Components;
-[RegisterComponent]
-public sealed partial class BrainComponent : Component { }
diff --git a/Content.Client/_Shitmed/Body/Components/LungComponent.cs b/Content.Client/_Shitmed/Body/Components/LungComponent.cs
deleted file mode 100644
index 807905514b3..00000000000
--- a/Content.Client/_Shitmed/Body/Components/LungComponent.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Client._Shitmed.Body.Components;
-[RegisterComponent]
-public sealed partial class LungComponent : Component { }
diff --git a/Content.Client/_Shitmed/Body/Components/StomachComponent.cs b/Content.Client/_Shitmed/Body/Components/StomachComponent.cs
deleted file mode 100644
index 063a02cecbc..00000000000
--- a/Content.Client/_Shitmed/Body/Components/StomachComponent.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Client._Shitmed.Body.Components;
-[RegisterComponent]
-public sealed partial class StomachComponent : Component { }
diff --git a/Content.Client/_Shitmed/Choice/UI/ChoiceControl.xaml b/Content.Client/_Shitmed/Choice/UI/ChoiceControl.xaml
deleted file mode 100644
index 56cc2cf2527..00000000000
--- a/Content.Client/_Shitmed/Choice/UI/ChoiceControl.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<ui:ChoiceControl
-    xmlns="https://spacestation14.io"
-    xmlns:ui="clr-namespace:Content.Client._Shitmed.Choice.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:ChoiceControl>
\ No newline at end of file
diff --git a/Content.Client/_Shitmed/Choice/UI/ChoiceControl.xaml.cs b/Content.Client/_Shitmed/Choice/UI/ChoiceControl.xaml.cs
deleted file mode 100644
index ac2a8385ac0..00000000000
--- a/Content.Client/_Shitmed/Choice/UI/ChoiceControl.xaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility;
-
-namespace Content.Client._Shitmed.Choice.UI;
-
-[GenerateTypedNameReferences]
-[Virtual]
-public partial class ChoiceControl : Control
-{
-    public ChoiceControl() => 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;
-    }
-}
diff --git a/Content.Client/_Shitmed/ItemSwitch/ItemSwitchStatusControl.cs b/Content.Client/_Shitmed/ItemSwitch/ItemSwitchStatusControl.cs
deleted file mode 100644
index 51525e182d4..00000000000
--- a/Content.Client/_Shitmed/ItemSwitch/ItemSwitchStatusControl.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Client.Items.UI;
-using Content.Client.Message;
-using Content.Client.Stylesheets;
-using Robust.Client.UserInterface.Controls;
-using Content.Shared._Shitmed.ItemSwitch.Components;
-
-namespace Content.Client._Shitmed.ItemSwitch.UI;
-
-public sealed class ItemSwitchStatusControl : PollingItemStatusControl<ItemSwitchStatusControl.Data>
-{
-    private readonly Entity<ItemSwitchComponent> _parent;
-    private readonly RichTextLabel _label;
-
-    public ItemSwitchStatusControl(Entity<ItemSwitchComponent> parent)
-    {
-        _parent = parent;
-        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
-        if (parent.Comp.ShowLabel)
-            AddChild(_label);
-
-        UpdateDraw();
-    }
-
-    protected override Data PollData()
-    {
-        return new Data(_parent.Comp.State);
-    }
-
-    protected override void Update(in Data data)
-    {
-        _label.SetMarkup(Loc.GetString("itemswitch-component-on-examine-detailed-message",
-            ("state", data.State)));
-    }
-
-    public record struct Data(string State);
-}
diff --git a/Content.Client/_Shitmed/ItemSwitch/ItemSwitchSystem.cs b/Content.Client/_Shitmed/ItemSwitch/ItemSwitchSystem.cs
deleted file mode 100644
index 0a428233677..00000000000
--- a/Content.Client/_Shitmed/ItemSwitch/ItemSwitchSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Client.Items;
-using Content.Shared._Shitmed.ItemSwitch;
-using Content.Shared._Shitmed.ItemSwitch.Components;
-using Content.Client._Shitmed.ItemSwitch.UI;
-using Robust.Client.GameObjects;
-
-namespace Content.Client._Shitmed.ItemSwitch;
-
-public sealed class ItemSwitchSystem : SharedItemSwitchSystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        Subs.ItemStatus<ItemSwitchComponent>(ent => new ItemSwitchStatusControl(ent));
-        SubscribeLocalEvent<ItemSwitchComponent, AfterAutoHandleStateEvent>(OnChanged);
-    }
-
-    private void OnChanged(Entity<ItemSwitchComponent> ent, ref AfterAutoHandleStateEvent args) => UpdateVisuals(ent, ent.Comp.State);
-
-    protected override void UpdateVisuals(Entity<ItemSwitchComponent> ent, string key)
-    {
-        base.UpdateVisuals(ent, key);
-        if (TryComp(ent, out SpriteComponent? sprite) && ent.Comp.States.TryGetValue(key, out var state))
-            if (state.Sprite != null)
-                sprite.LayerSetSprite(0, state.Sprite);
-    }
-}
diff --git a/Content.Client/_Shitmed/Medical/Surgery/SurgeryBui.cs b/Content.Client/_Shitmed/Medical/Surgery/SurgeryBui.cs
deleted file mode 100644
index cddcad6eef6..00000000000
--- a/Content.Client/_Shitmed/Medical/Surgery/SurgeryBui.cs
+++ /dev/null
@@ -1,358 +0,0 @@
-using Content.Client._Shitmed.Choice.UI;
-using Content.Client.Administration.UI.CustomControls;
-using Content.Shared._Shitmed.Medical.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._Shitmed.Medical.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 ChoiceControl();
-
-            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)
-            _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 ChoiceControl();
-            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.AddMarkupOrThrow($"[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 ChoiceControl();
-            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/_Shitmed/Medical/Surgery/SurgeryStepButton.xaml b/Content.Client/_Shitmed/Medical/Surgery/SurgeryStepButton.xaml
deleted file mode 100644
index d6360125d76..00000000000
--- a/Content.Client/_Shitmed/Medical/Surgery/SurgeryStepButton.xaml
+++ /dev/null
@@ -1,4 +0,0 @@
-<controls:SurgeryStepButton
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client._Shitmed.Medical.Surgery">
-</controls:SurgeryStepButton>
diff --git a/Content.Client/_Shitmed/Medical/Surgery/SurgeryStepButton.xaml.cs b/Content.Client/_Shitmed/Medical/Surgery/SurgeryStepButton.xaml.cs
deleted file mode 100644
index 78e25688500..00000000000
--- a/Content.Client/_Shitmed/Medical/Surgery/SurgeryStepButton.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Client._Shitmed.Choice.UI;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._Shitmed.Medical.Surgery;
-
-[GenerateTypedNameReferences]
-public sealed partial class SurgeryStepButton : ChoiceControl
-{
-    public EntityUid Step { get; set; }
-
-    public SurgeryStepButton()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}
diff --git a/Content.Client/_Shitmed/Medical/Surgery/SurgerySystem.cs b/Content.Client/_Shitmed/Medical/Surgery/SurgerySystem.cs
deleted file mode 100644
index 2ea5724cb8a..00000000000
--- a/Content.Client/_Shitmed/Medical/Surgery/SurgerySystem.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Shared._Shitmed.Medical.Surgery;
-
-namespace Content.Client._Shitmed.Medical.Surgery;
-
-public sealed class SurgerySystem : SharedSurgerySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-    }
-}
diff --git a/Content.Client/_Shitmed/Medical/Surgery/SurgeryWindow.xaml b/Content.Client/_Shitmed/Medical/Surgery/SurgeryWindow.xaml
deleted file mode 100644
index 433e927a253..00000000000
--- a/Content.Client/_Shitmed/Medical/Surgery/SurgeryWindow.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<controls:SurgeryWindow
-    xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client._Shitmed.Medical.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/_Shitmed/Medical/Surgery/SurgeryWindow.xaml.cs b/Content.Client/_Shitmed/Medical/Surgery/SurgeryWindow.xaml.cs
deleted file mode 100644
index 04cda778677..00000000000
--- a/Content.Client/_Shitmed/Medical/Surgery/SurgeryWindow.xaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._Shitmed.Medical.Surgery;
-
-[GenerateTypedNameReferences]
-public sealed partial class SurgeryWindow : DefaultWindow
-{
-    public SurgeryWindow()
-    {
-        RobustXamlLoader.Load(this);
-    }
-}
diff --git a/Content.Client/_Shitmed/Targeting/TargetingSystem.cs b/Content.Client/_Shitmed/Targeting/TargetingSystem.cs
deleted file mode 100644
index 6b4bcbfbb44..00000000000
--- a/Content.Client/_Shitmed/Targeting/TargetingSystem.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using Content.Shared.Input;
-using Content.Shared._Shitmed.Targeting;
-using Content.Shared._Shitmed.Targeting.Events;
-using Robust.Client.Player;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Player;
-
-namespace Content.Client._Shitmed.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)))
-        .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/_Shitmed/UserInterface/Systems/PartStatus/PartStatusUIController.cs b/Content.Client/_Shitmed/UserInterface/Systems/PartStatus/PartStatusUIController.cs
deleted file mode 100644
index af26175b575..00000000000
--- a/Content.Client/_Shitmed/UserInterface/Systems/PartStatus/PartStatusUIController.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Content.Client.Gameplay;
-using Content.Client._Shitmed.UserInterface.Systems.PartStatus.Widgets;
-using Content.Shared._Shitmed.Targeting;
-using Content.Client._Shitmed.Targeting;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface.Controllers;
-using Robust.Shared.Utility;
-using Robust.Client.Graphics;
-
-
-namespace Content.Client._Shitmed.UserInterface.Systems.PartStatus;
-
-public sealed class PartStatusUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetingSystem>
-{
-    [Dependency] private readonly IEntityManager _entManager = 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/_Shitmed/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml b/Content.Client/_Shitmed/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
deleted file mode 100644
index 00032215c4d..00000000000
--- a/Content.Client/_Shitmed/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<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._Shitmed.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/_Shitmed/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs b/Content.Client/_Shitmed/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
deleted file mode 100644
index 107d6982433..00000000000
--- a/Content.Client/_Shitmed/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Client._Shitmed.UserInterface.Systems.PartStatus;
-using Content.Shared._Shitmed.Targeting;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Utility;
-using System.Linq;
-
-namespace Content.Client._Shitmed.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/_Shitmed/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/_Shitmed/UserInterface/Systems/Targeting/TargetingUIController.cs b/Content.Client/_Shitmed/UserInterface/Systems/Targeting/TargetingUIController.cs
deleted file mode 100644
index ea5d37457ea..00000000000
--- a/Content.Client/_Shitmed/UserInterface/Systems/Targeting/TargetingUIController.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using Content.Client.Gameplay;
-using Content.Client._Shitmed.UserInterface.Systems.Targeting.Widgets;
-using Content.Shared._Shitmed.Targeting;
-using Content.Client._Shitmed.Targeting;
-using Content.Shared._Shitmed.Targeting.Events;
-using Robust.Client.UserInterface.Controllers;
-using Robust.Client.Player;
-
-namespace Content.Client._Shitmed.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/_Shitmed/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml b/Content.Client/_Shitmed/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
deleted file mode 100644
index 9f0842beea6..00000000000
--- a/Content.Client/_Shitmed/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<widgets:TargetingControl
-    xmlns="https://spacestation14.io"
-    xmlns:widgets="clr-namespace:Content.Client._Shitmed.UserInterface.Systems.Targeting.Widgets"
-    Name="TargetingButton"
-    VerticalExpand="True"
-    VerticalAlignment="Bottom"
-    HorizontalAlignment="Right">
-    <Control HorizontalAlignment="Right">
-        <TextureRect
-            Name="TargetDoll"
-            Stretch="KeepAspectCentered"
-            SetSize="64 64">
-            <PanelContainer
-                SetSize="38 64"
-                Margin="12 0 0 0"
-                VerticalAlignment="Bottom"
-                HorizontalAlignment="Left">
-                <PanelContainer
-                    SetSize="12 26"
-                    Margin="0 7 0 0"
-                    HorizontalAlignment="Left">
-                    <TextureButton
-                        Name="RightArmButton"
-                        MinSize="12 20"
-                        StyleClasses="TargetDollButtonRightArm"
-                        VerticalAlignment="Top">
-                        <TextureRect
-                            TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/rightarm.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="8 16"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                    <TextureButton
-                        Name="RightHandButton"
-                        MinSize="12 12"
-                        VerticalAlignment="Bottom"
-                        StyleClasses="TargetDollButtonRightHand">
-                        <TextureRect
-                            TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/righthand.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="8 8"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                </PanelContainer>
-                <PanelContainer
-                    SetSize="34 60"
-                    Margin="0 64 0 0"
-                    VerticalAlignment="Bottom"
-                    HorizontalAlignment="Center">
-                    <TextureButton
-                        Name="HeadButton"
-                        MinSize="22 18"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Center"
-                        StyleClasses="TargetDollButtonHead">
-                        <TextureRect
-                            TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/head.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="18 14"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                        <!--<PanelContainer
-                            SetSize="10 10"
-                            Margin="0 6 0 0"
-                            HorizontalAlignment="Center">
-                            <TextureButton
-                                Name="EyesButton"
-                                MinSize="10 6"
-                                VerticalAlignment="Top"
-                                StyleClasses="TargetDollButtonEyes">
-                                <TextureRect
-                                    TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/eyes.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="10 6"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="MouthButton"
-                                SetSize="6 4"
-                                VerticalAlignment="Bottom"
-                                StyleClasses="TargetDollButtonMouth">
-                                <TextureRect
-                                    TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/mouth.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="6 4"/>
-                            </TextureButton>
-                        </PanelContainer>-->
-                    </TextureButton>
-                    <TextureButton
-                        Name="ChestButton"
-                        SetSize="22 24"
-                        Margin="0 14 0 0"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Center"
-                        StyleClasses="TargetDollButtonChest">
-                        <TextureRect
-                            TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/torso.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="18 20"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                    <PanelContainer
-                        MinSize="30 28"
-                        VerticalAlignment="Bottom"
-                        HorizontalAlignment="Center">
-                        <TextureButton
-                            Name="GroinButton"
-                            MinSize="22 12"
-                            VerticalAlignment="Top"
-                            HorizontalAlignment="Center"
-                            StyleClasses="TargetDollButtonGroin">
-                            <TextureRect
-                                TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/groin.png"
-                                Stretch="KeepAspectCentered"
-                                SetSize="18 8"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Center"/>
-                        </TextureButton>
-                        <PanelContainer
-                            MinSize="16 24"
-                            VerticalAlignment="Bottom"
-                            HorizontalAlignment="Right">
-                            <TextureButton
-                                Name="LeftLegButton"
-                                MinSize="12 22"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Left"
-                                StyleClasses="TargetDollButtonLeftLeg">
-                                <TextureRect
-                                    TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/leftleg.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="8 18"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="LeftFootButton"
-                                MinSize="16 8"
-                                VerticalAlignment="Bottom"
-                                StyleClasses="TargetDollButtonLeftFoot">
-                                    <TextureRect
-                                        TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot.png"
-                                        Stretch="KeepAspectCentered"
-                                        SetSize="12 6"
-                                        VerticalAlignment="Center"
-                                        HorizontalAlignment="Center"/>
-                            </TextureButton>
-                        </PanelContainer>
-                        <PanelContainer
-                            MinSize="16 24"
-                            VerticalAlignment="Bottom"
-                            HorizontalAlignment="Left">
-                            <TextureButton
-                                Name="RightLegButton"
-                                MinSize="12 22"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Right"
-                                StyleClasses="TargetDollButtonRightLeg">
-                                <TextureRect
-                                    TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/rightleg.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="8 18"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"/>
-                            </TextureButton>
-                            <TextureButton
-                                Name="RightFootButton"
-                                MinSize="16 8"
-                                VerticalAlignment="Bottom"
-                                HorizontalAlignment="Center"
-                                StyleClasses="TargetDollButtonRightFoot">
-                                <TextureRect
-                                    TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot.png"
-                                    Stretch="KeepAspectCentered"
-                                    SetSize="12 6"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"/>
-                            </TextureButton>
-                        </PanelContainer>
-                    </PanelContainer>
-                </PanelContainer>
-                <PanelContainer
-                    SetSize="12 26"
-                    Margin="0 7 0 0"
-                    HorizontalAlignment="Right">
-                    <TextureButton
-                        Name="LeftArmButton"
-                        MinSize="12 20"
-                        StyleClasses="TargetDollButtonLeftArm"
-                        VerticalAlignment="Top">
-                        <TextureRect
-                            TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/leftarm.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="8 16"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                    <TextureButton
-                        Name="LeftHandButton"
-                        MinSize="12 12"
-                        VerticalAlignment="Bottom"
-                        StyleClasses="TargetDollButtonLeftHand">
-                        <TextureRect
-                            TexturePath="/Textures/_Shitmed/Interface/Targeting/Doll/lefthand.png"
-                            Stretch="KeepAspectCentered"
-                            SetSize="8 8"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center"/>
-                    </TextureButton>
-                </PanelContainer>
-            </PanelContainer>
-        </TextureRect>
-    </Control>
-</widgets:TargetingControl>
diff --git a/Content.Client/_Shitmed/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs b/Content.Client/_Shitmed/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
deleted file mode 100644
index 1b080f70d79..00000000000
--- a/Content.Client/_Shitmed/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Linq;
-using Content.Shared._Shitmed.Targeting;
-using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client._Shitmed.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.Client/_White/Body/Bloodstream/Bloodstream/BloodstreamSystem.cs b/Content.Client/_White/Body/Bloodstream/Bloodstream/BloodstreamSystem.cs
new file mode 100644
index 00000000000..3041c8e6dc7
--- /dev/null
+++ b/Content.Client/_White/Body/Bloodstream/Bloodstream/BloodstreamSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._White.Body.Bloodstream.Systems;
+
+namespace Content.Client._White.Body.Bloodstream.Bloodstream;
+
+public sealed class BloodstreamSystem : SharedBloodstreamSystem;
diff --git a/Content.Client/_White/Body/Organs/Metabolizer/MetabolizerSystem.cs b/Content.Client/_White/Body/Organs/Metabolizer/MetabolizerSystem.cs
new file mode 100644
index 00000000000..a6d1484edc0
--- /dev/null
+++ b/Content.Client/_White/Body/Organs/Metabolizer/MetabolizerSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._White.Body.Organs.Metabolizer;
+
+namespace Content.Client._White.Body.Organs.Metabolizer;
+
+public sealed class MetabolizerSystem : SharedMetabolizerSystem;
diff --git a/Content.Client/_White/Body/Pain/Overlays/PainOverlay.cs b/Content.Client/_White/Body/Pain/Overlays/PainOverlay.cs
new file mode 100644
index 00000000000..c8d07b5bf2b
--- /dev/null
+++ b/Content.Client/_White/Body/Pain/Overlays/PainOverlay.cs
@@ -0,0 +1,196 @@
+using Content.Shared.Mobs;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client._White.Body.Pain.Overlays;
+
+public sealed class PainOverlay : Overlay
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    public override bool RequestScreenTexture => true;
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+    private readonly ShaderInstance _critCircleShader;
+    private readonly ShaderInstance _painCircleShader;
+    private readonly ShaderInstance _painBlinkShader;
+
+    public MobState State = MobState.Alive;
+
+    /// <summary>
+    /// Handles the red pulsing overlay
+    /// </summary>
+    public float PainLevel = 0f;
+
+    private float _oldPainLevel;
+
+    /// <summary>
+    /// Handles the white overlay when crit.
+    /// </summary>
+    public float CritLevel = 0f;
+
+    private float _oldCritLevel;
+
+    /// <summary>
+    /// The percent to tint the screen by on a scale of 0-1.
+    /// </summary>
+    public float PainBlink;
+
+    public float DeadLevel = 1f;
+
+    private Texture _painTexture;
+
+    public PainOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+
+        ZIndex = -5;
+
+        _critCircleShader = _prototype.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
+        _painCircleShader = _prototype.Index<ShaderPrototype>("GradientCircleMask").InstanceUnique();
+        _painBlinkShader = _prototype.Index<ShaderPrototype>("PainBlink").InstanceUnique();
+
+        _painTexture = _resourceCache.GetResource<TextureResource>("/Textures/_White/image.png").Texture;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (!_entity.TryGetComponent(_player.LocalEntity, out EyeComponent? eyeComp) || args.Viewport.Eye != eyeComp.Eye)
+            return;
+
+        var viewport = args.WorldAABB;
+        var handle = args.WorldHandle;
+        var distance = args.ViewportBounds.Width;
+
+        var time = (float) _gameTiming.RealTime.TotalSeconds;
+        var lastFrameTime = (float) _gameTiming.FrameTime.TotalSeconds;
+
+        if (State != MobState.Dead)
+        {
+            DeadLevel = 1f;
+        }
+        else if (!MathHelper.CloseTo(0f, DeadLevel, 0.001f))
+        {
+            var diff = -DeadLevel;
+            DeadLevel += GetDiff(diff, lastFrameTime);
+        }
+        else
+        {
+            DeadLevel = 0f;
+        }
+
+        if (!MathHelper.CloseTo(_oldPainLevel, PainLevel, 0.001f))
+        {
+            var diff = PainLevel - _oldPainLevel;
+            _oldPainLevel += GetDiff(diff, lastFrameTime);
+        }
+        else
+        {
+            _oldPainLevel = PainLevel;
+        }
+
+        if (!MathHelper.CloseTo(_oldCritLevel, CritLevel, 0.001f))
+        {
+            var diff = CritLevel - _oldCritLevel;
+            _oldCritLevel += GetDiff(diff, lastFrameTime);
+        }
+        else
+        {
+            _oldCritLevel = CritLevel;
+        }
+
+        if (!MathHelper.CloseTo(0f, PainBlink, 0.001f))
+        {
+            var diff = -PainBlink / 2;
+            PainBlink += GetDiff(diff, lastFrameTime);
+        }
+        else
+        {
+            PainBlink = 0f;
+        }
+
+        var level = PainBlink;
+        if (level > 0 && ScreenTexture is not null)
+        {
+            _painBlinkShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+            _painBlinkShader.SetParameter("strength", PainBlink);
+            _painBlinkShader.SetParameter("overlay_texture", _painTexture);
+
+            handle.UseShader(_painBlinkShader);
+            handle.DrawRect(viewport, Color.White);
+        }
+
+        level = _oldPainLevel;
+        if (level > 0f && _oldCritLevel <= 0f)
+        {
+            var adjustedTime = time * 3f;
+            var outerMaxLevel = 2.0f * distance;
+            var outerMinLevel = 0.8f * distance;
+            var innerMaxLevel = 0.6f * distance;
+            var innerMinLevel = 0.2f * distance;
+
+            var outerRadius = outerMaxLevel - level * (outerMaxLevel - outerMinLevel);
+            var innerRadius = innerMaxLevel - level * (innerMaxLevel - innerMinLevel);
+
+            var pulse = MathF.Max(0f, MathF.Sin(adjustedTime));
+
+            _painCircleShader.SetParameter("time", pulse);
+            _painCircleShader.SetParameter("color", new Vector3(1f, 0f, 0f));
+            _painCircleShader.SetParameter("darknessAlphaOuter", 0.8f);
+
+            _painCircleShader.SetParameter("outerCircleRadius", outerRadius);
+            _painCircleShader.SetParameter("outerCircleMaxRadius", outerRadius + 0.2f * distance);
+            _painCircleShader.SetParameter("innerCircleRadius", innerRadius);
+            _painCircleShader.SetParameter("innerCircleMaxRadius", innerRadius + 0.02f * distance);
+
+            handle.UseShader(_painCircleShader);
+            handle.DrawRect(viewport, Color.White);
+        }
+        else
+        {
+            _oldPainLevel = PainLevel;
+        }
+
+        level = State != MobState.Dead ? _oldCritLevel : DeadLevel;
+        if (level > 0f)
+        {
+            var outerMaxLevel = 2.0f * distance;
+            var outerMinLevel = 1.0f * distance;
+            var innerMaxLevel = 0.6f * distance;
+            var innerMinLevel = 0.02f * distance;
+
+            var outerRadius = outerMaxLevel - level * (outerMaxLevel - outerMinLevel);
+            var innerRadius = innerMaxLevel - level * (innerMaxLevel - innerMinLevel);
+
+            var pulse = MathF.Max(0f, MathF.Sin(time));
+
+            _critCircleShader.SetParameter("time", pulse);
+            _critCircleShader.SetParameter("color", new Vector3(1f, 1f, 1f));
+            _critCircleShader.SetParameter("darknessAlphaOuter", 1.0f);
+
+            _critCircleShader.SetParameter("innerCircleRadius", innerRadius);
+            _critCircleShader.SetParameter("innerCircleMaxRadius", innerRadius + 0.005f * distance);
+            _critCircleShader.SetParameter("outerCircleRadius", outerRadius);
+            _critCircleShader.SetParameter("outerCircleMaxRadius", outerRadius + 0.2f * distance);
+
+            handle.UseShader(_critCircleShader);
+            handle.DrawRect(viewport, Color.White);
+        }
+
+        handle.UseShader(null);
+    }
+
+    private float GetDiff(float value, float lastFrameTime)
+    {
+        var adjustment = value * 5f * lastFrameTime;
+        return value < 0f ? Math.Clamp(adjustment, value, -value) : Math.Clamp(adjustment, -value, value);
+    }
+}
diff --git a/Content.Client/_White/Body/Pain/Overlays/PainOverlayUiController.cs b/Content.Client/_White/Body/Pain/Overlays/PainOverlayUiController.cs
new file mode 100644
index 00000000000..a0e7901eb56
--- /dev/null
+++ b/Content.Client/_White/Body/Pain/Overlays/PainOverlayUiController.cs
@@ -0,0 +1,132 @@
+using Content.Client._White.Body.Pain.Systems;
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Body.Pain.Systems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Player;
+
+namespace Content.Client._White.Body.Pain.Overlays;
+
+[UsedImplicitly]
+public sealed class PainOverlayUiController : UIController
+{
+    [Dependency] private readonly IOverlayManager _overlay = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    [UISystemDependency] private readonly PainSystem _pain = default!;
+
+    private PainOverlay _painOverlay = default!;
+
+    public override void Initialize()
+    {
+        _painOverlay = new PainOverlay();
+
+        SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnPlayerAttach);
+        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<AfterPainChangedEvent>(OnPainChange);
+    }
+
+    private void OnPlayerAttach(LocalPlayerAttachedEvent args)
+    {
+        ClearOverlay();
+
+        if (!EntityManager.TryGetComponent<MobStateComponent>(args.Entity, out var mobState))
+            return;
+
+        if (mobState.CurrentState != MobState.Dead)
+            UpdateOverlays((args.Entity, mobState));
+
+        _overlay.AddOverlay(_painOverlay);
+    }
+
+    private void OnPlayerDetached(LocalPlayerDetachedEvent args)
+    {
+        _overlay.RemoveOverlay(_painOverlay);
+        ClearOverlay();
+    }
+
+    private void OnMobStateChanged(MobStateChangedEvent args)
+    {
+        if (args.Target != _player.LocalEntity)
+            return;
+
+        UpdateOverlays((args.Target, args.Component));
+    }
+
+    private void OnPainChange(AfterPainChangedEvent args)
+    {
+        if (args.Target != _player.LocalEntity
+            || !EntityManager.TryGetComponent<PainfulComponent>(args.Target, out var painful))
+            return;
+
+        UpdateOverlays(args.Target);
+
+        if (args.CurrentPain - args.OldPain < 5)
+            return;
+
+        _painOverlay.PainBlink = FixedPoint2.Min(1f, args.CurrentPain - args.OldPain / painful.MaxPainIncreasePerSecond).Float();
+    }
+
+    private void ClearOverlay()
+    {
+        _painOverlay.DeadLevel = 0f;
+        _painOverlay.CritLevel = 0f;
+        _painOverlay.PainLevel = 0f;
+        _painOverlay.PainBlink = 0f;
+    }
+
+    private void UpdateOverlays(Entity<MobStateComponent?, PainfulComponent?, PainThresholdsComponent?> entity)
+    {
+        if (entity.Comp1 == null && !EntityManager.TryGetComponent(entity, out entity.Comp1)
+            || entity.Comp2 == null && !EntityManager.TryGetComponent(entity, out entity.Comp2)
+            || entity.Comp3 == null && !EntityManager.TryGetComponent(entity, out entity.Comp3))
+            return;
+
+        _painOverlay.State = entity.Comp1.CurrentState;
+
+        switch (entity.Comp1.CurrentState)
+        {
+            case MobState.Alive:
+            {
+                if (!_pain.TryGetNextState(entity.Comp3.MobStateThresholds, MobState.Alive, out var nextState)
+                    || !_pain.TryGetThresholdFromState(entity.Comp3.MobStateThresholds, nextState.Value, out var critLevel))
+                    return;
+
+                _painOverlay.PainLevel = FixedPoint2.Min(1f, entity.Comp2.CurrentPain / critLevel.Value).Float();
+
+                if (_painOverlay.PainLevel < 0.05f)
+                    _painOverlay.PainLevel = 0;
+
+                _painOverlay.CritLevel = 0;
+                _painOverlay.DeadLevel = 0;
+
+                break;
+            }
+            case MobState.Critical:
+            {
+                if (!_pain.TryGetThresholdFromState(entity.Comp3.MobStateThresholds, MobState.Dead, out var deadLevel))
+                    return;
+
+                _painOverlay.CritLevel = FixedPoint2.Min(1f, entity.Comp2.CurrentPain / deadLevel.Value).Float();
+                _painOverlay.PainLevel = 0;
+                _painOverlay.DeadLevel = 0;
+
+                break;
+            }
+            case MobState.Dead:
+            {
+                _painOverlay.PainLevel = 0;
+                _painOverlay.CritLevel = 0;
+
+                break;
+            }
+        }
+    }
+}
diff --git a/Content.Client/_White/Body/Pain/Systems/PainSystem.cs b/Content.Client/_White/Body/Pain/Systems/PainSystem.cs
new file mode 100644
index 00000000000..6bc32f86b45
--- /dev/null
+++ b/Content.Client/_White/Body/Pain/Systems/PainSystem.cs
@@ -0,0 +1,64 @@
+using Content.Client.Alerts;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Body.Pain.Systems;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameStates;
+
+namespace Content.Client._White.Body.Pain.Systems;
+
+public sealed class PainSystem : SharedPainSystem
+{
+    [Dependency] private readonly SpriteSystem _system = default!;
+
+    public override void Initialize()
+    {
+       base.Initialize();
+
+       SubscribeLocalEvent<PainfulComponent, ComponentHandleState>(OnHandleState);
+
+       SubscribeLocalEvent<PainThresholdsComponent, UpdateAlertSpriteEvent>(OnUpdateAlertSprite);
+    }
+
+    #region Event Handling
+
+    private void OnHandleState(Entity<PainfulComponent> painful, ref ComponentHandleState args)
+    {
+        if (args.Current is not PainfulComponentState state)
+            return;
+
+        var oldPain = painful.Comp.CurrentPain;
+
+        painful.Comp.Pain = state.Pain;
+        painful.Comp.PainMultiplier = state.PainMultiplier;
+        painful.Comp.LastUpdate = state.LastUpdate;
+
+        if (oldPain != painful.Comp.CurrentPain)
+            RaiseLocalEvent(painful, new AfterPainChangedEvent(painful, painful.Comp.CurrentPain, oldPain), true);
+    }
+
+    private void OnUpdateAlertSprite(Entity<PainThresholdsComponent> painThresholds, ref UpdateAlertSpriteEvent args)
+    {
+        if (args.Alert.ID != painThresholds.Comp.BodyStatusAlert)
+            return;
+
+        var sprite = args.SpriteViewEnt.AsNullable();
+
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.Head, GetState(painThresholds, BodyPartType.Head));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.Chest, GetState(painThresholds, BodyPartType.Chest));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.Groin, GetState(painThresholds, BodyPartType.Groin));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.LeftArm, GetState(painThresholds, BodyPartType.LeftArm));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.LeftHand, GetState(painThresholds, BodyPartType.LeftHand));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.RightArm, GetState(painThresholds, BodyPartType.RightArm));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.RightHand, GetState(painThresholds, BodyPartType.RightHand));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.LeftLeg, GetState(painThresholds, BodyPartType.LeftLeg));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.LeftFoot, GetState(painThresholds, BodyPartType.LeftFoot));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.RightLeg, GetState(painThresholds, BodyPartType.RightLeg));
+        _system.LayerSetRsiState(sprite, BodyStatusVisualLayers.RightFoot, GetState(painThresholds, BodyPartType.RightFoot));
+    }
+
+    private string GetState(Entity<PainThresholdsComponent> painThresholds, BodyPartType bodyPartType) =>
+        $"{bodyPartType.ToString().ToLower()}_{painThresholds.Comp.PainStatus[bodyPartType].ToString().ToLower()}";
+
+    #endregion
+}
diff --git a/Content.Client/_White/Body/Systems/BodySystem.Appearance.cs b/Content.Client/_White/Body/Systems/BodySystem.Appearance.cs
new file mode 100644
index 00000000000..733372edbf5
--- /dev/null
+++ b/Content.Client/_White/Body/Systems/BodySystem.Appearance.cs
@@ -0,0 +1,347 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
+using Robust.Shared.Utility;
+
+namespace Content.Client._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    private void InitializeAppearance() =>
+        SubscribeLocalEvent<BodyAppearanceComponent, AfterAutoHandleStateEvent>(OnBodyAppearanceHandleState);
+
+    #region Event Handling
+
+    private void OnBodyAppearanceHandleState(Entity<BodyAppearanceComponent> bodyAppearance, ref AfterAutoHandleStateEvent args) =>
+        BodySpriteUpdate(bodyAppearance.AsNullable());
+
+    protected override void OnBodyPartRemoved(Entity<BodyAppearanceComponent> bodyAppearance, ref BodyPartRemovedEvent args)
+    {
+        base.OnBodyPartRemoved(bodyAppearance, ref args);
+
+        if (!TryComp<BodyPartAppearanceComponent>(args.Part, out var bodyPartAppearanceComponent))
+            return;
+
+        RemoveMarkingSprites(bodyAppearance.Owner, bodyPartAppearanceComponent.MarkingsLayers);
+    }
+
+    protected override void OnOrganRemoved(Entity<BodyAppearanceComponent> bodyAppearance, ref OrganRemovedEvent args)
+    {
+        base.OnOrganRemoved(bodyAppearance, ref args);
+
+        if (!TryComp<OrganAppearanceComponent>(args.Organ, out var organAppearanceComponent))
+            return;
+
+        RemoveMarkingSprites(bodyAppearance.Owner, organAppearanceComponent.MarkingsLayers);
+    }
+
+    #endregion
+
+    #region Private API
+
+    #region Marking
+
+    public void AddMarkingSprite(Entity<SpriteComponent?> sprite, MarkingLayerInfo markingLayerInfo, int index)
+    {
+        if (!Resolve(sprite, ref sprite.Comp)
+            || !_sprite.LayerMapTryGet(sprite, markingLayerInfo.Layer, out var layerIndex, false))
+            return;
+
+        var layerId = $"{markingLayerInfo.MarkingId}-{markingLayerInfo.State}";
+        if (!_sprite.LayerMapTryGet(sprite, layerId, out _, false))
+        {
+            var spriteSpecifier = new SpriteSpecifier.Rsi(markingLayerInfo.Sprite, markingLayerInfo.State);
+            var markingInex = _sprite.AddLayer(sprite, spriteSpecifier, layerIndex + index + 1);
+
+            _sprite.LayerMapSet(sprite, layerId, markingInex);
+            _sprite.LayerSetSprite(sprite, layerId, spriteSpecifier);
+        }
+
+        _sprite.LayerSetVisible(sprite, layerId, markingLayerInfo.Visible);
+
+        if (!markingLayerInfo.Visible)
+            return;
+
+        _sprite.LayerSetColor(sprite, layerId, markingLayerInfo.Color);
+
+        if (!string.IsNullOrEmpty(markingLayerInfo.Shader))
+            sprite.Comp.LayerSetShader(layerId, markingLayerInfo.Shader);
+    }
+
+    private void AddMarkingSprites(Entity<SpriteComponent?> sprite, List<MarkingLayerInfo> markingsLayers)
+    {
+        if (!Resolve(sprite, ref sprite.Comp))
+            return;
+
+        for (var i = 0; i < markingsLayers.Count; i++)
+        {
+            var markingLayer = markingsLayers[i];
+            AddMarkingSprite(sprite, markingLayer, i);
+        }
+    }
+
+    private void RemoveMarkingSprite(Entity<SpriteComponent?> sprite, MarkingLayerInfo markingLayer)
+    {
+        if (!Resolve(sprite, ref sprite.Comp))
+            return;
+
+        var layerId = $"{markingLayer.MarkingId}-{markingLayer.State}";
+        if (!_sprite.LayerMapTryGet(sprite, layerId, out var index, false))
+            return;
+
+        _sprite.LayerMapRemove(sprite, layerId);
+        _sprite.RemoveLayer(sprite, index);
+    }
+
+    private void RemoveMarkingSprites(Entity<SpriteComponent?> sprite, List<MarkingLayerInfo> markingsLayers)
+    {
+        if (!Resolve(sprite, ref sprite.Comp))
+            return;
+
+        foreach (var markingLayer in markingsLayers)
+            RemoveMarkingSprite(sprite, markingLayer);
+    }
+
+    private void UpdateMarkingSprite(Entity<SpriteComponent?> sprite, MarkingLayerInfo markingLayer)
+    {
+        if (!Resolve(sprite, ref sprite.Comp))
+            return;
+
+        var layerId = $"{markingLayer.MarkingId}-{markingLayer.State}";
+        if (!_sprite.LayerMapTryGet(sprite, layerId, out _, false))
+            return;
+
+        _sprite.LayerSetColor(sprite, layerId, markingLayer.Color);
+
+        if (!string.IsNullOrEmpty(markingLayer.Shader))
+            sprite.Comp.LayerSetShader(layerId, markingLayer.Shader);
+    }
+
+    private void UpdateMarkingSprites(Entity<SpriteComponent?> sprite, List<MarkingLayerInfo> markingsLayers)
+    {
+        if (!Resolve(sprite, ref sprite.Comp))
+            return;
+
+        foreach (var markingLayer in markingsLayers)
+            UpdateMarkingSprite(sprite, markingLayer);
+    }
+
+    #endregion
+
+    private string GetState(RSI rsi, Sex sex, string? bodyType, string state)
+    {
+        if (rsi.TryGetState($"{state}_{sex.ToString().ToLower()}", out _))
+            state = $"{state}_{sex.ToString().ToLower()}";
+
+        if (bodyType != null && rsi.TryGetState($"{state}_{bodyType.ToLower()}", out _))
+            state = $"{state}_{bodyType.ToLower()}";
+
+        return state;
+    }
+
+    private void BodySpriteUpdate(Entity<BodyAppearanceComponent?> bodyAppearance)
+    {
+        if (!Resolve(bodyAppearance, ref bodyAppearance.Comp)
+            || !TryComp<SpriteComponent>(bodyAppearance, out var spriteComponent))
+            return;
+
+        var sprite = (bodyAppearance.Owner, spriteComponent);
+        foreach (var (layer, info) in bodyAppearance.Comp.Layers)
+        {
+            if (info == null)
+            {
+                _sprite.LayerSetVisible(sprite, layer, false);
+                continue;
+            }
+
+            RemoveMarkingSprites(sprite, info.MarkingsLayers);
+            AddMarkingSprites(sprite, info.MarkingsLayers);
+
+            _sprite.LayerSetVisible(sprite, layer, info.Visible);
+
+            if (!info.Visible)
+                continue;
+
+            _sprite.LayerSetColor(sprite, layer, info.Color);
+
+            var rsi = _resourceCache.GetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / info.Sprite).RSI;
+            _sprite.LayerSetRsi(sprite, layer, rsi, GetState(rsi, info.Sex, info.BodyType, info.State));
+        }
+    }
+
+    #endregion
+
+    #region Public API
+
+    public override void SetupBodyAppearance(Entity<BodyComponent?, BodyAppearanceComponent?, HumanoidAppearanceComponent?> body, bool sync = true)
+    {
+        base.SetupBodyAppearance(body, false);
+        BodySpriteUpdate((body, body.Comp2));
+    }
+
+    public override void SetBodyPartColor(Entity<BodyPartAppearanceComponent?> bodyPartAppearance, Color color, bool sync = true)
+    {
+        if (!Resolve(bodyPartAppearance, ref bodyPartAppearance.Comp) || !bodyPartAppearance.Comp.CanChangeColor)
+            return;
+
+        bodyPartAppearance.Comp.Color = color;
+
+        if (!TryComp<BodyPartComponent>(bodyPartAppearance, out var bodyPart) || !bodyPart.Body.HasValue)
+            return;
+
+        _sprite.LayerSetColor(bodyPart.Body.Value, bodyPartAppearance.Comp.Layer, color);
+    }
+
+    public override void SetBodyColor(Entity<BodyComponent?, BodyAppearanceComponent?> body, Color color, bool sync = true)
+    {
+        if (!Resolve(body, ref body.Comp2))
+            return;
+
+        base.SetBodyColor(body, color, false);
+
+        if (!TryComp<SpriteComponent>(body, out var spriteComponent))
+            return;
+
+        var sprite = (body.Owner, spriteComponent);
+        foreach (var (layer, info) in body.Comp2.Layers)
+        {
+            if (info == null)
+                continue;
+
+            _sprite.LayerSetColor(sprite, layer, info.Color);
+        }
+    }
+
+    #region Marking
+
+    public override void AddMarking(Entity<BodyComponent?, HumanoidAppearanceComponent?> body, Marking marking)
+    {
+        if (!Resolve(body, ref body.Comp1, false)
+            || !Resolve(body, ref body.Comp2, false)
+            || !_marking.TryGetMarking(marking, out var markingPrototype)
+            || !TryComp<SpriteComponent>(body, out var spriteComponent))
+            return;
+
+        var sprite = (body.Owner, spriteComponent);
+        for (var i = 0; i < markingPrototype.Sprites.Count; i++)
+        {
+            var markingSprite = new MarkingLayerInfo(markingPrototype.Sprites[i]);
+
+            markingSprite.Color = marking.MarkingColors[i];
+
+            if (markingSprite.Organ != OrganType.None && GetOrgans<OrganAppearanceComponent>((body, body.Comp1), markingSprite.Organ).FirstOrNull() is { } organ)
+            {
+                organ.Comp2.MarkingsLayers.Add(markingSprite);
+                AddMarkingSprite(sprite, markingSprite, i);
+
+                continue;
+            }
+
+            if (GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1), markingSprite.BodyPart).FirstOrNull() is not { } bodyPart)
+            {
+                if (!markingSprite.ReplacementBodyPart.HasValue)
+                    continue;
+
+                var bodyPartUid = Spawn(markingSprite.ReplacementBodyPart);
+
+                if (!TryComp<BodyPartComponent>(bodyPartUid, out var bodyPartComponent)
+                    || !TryComp<BodyPartAppearanceComponent>(bodyPartUid, out var bodyPartAppearanceComponent)
+                    || !TryAttachBodyPart((body, body.Comp1), (bodyPartUid, bodyPartComponent)))
+                {
+                    QueueDel(bodyPartUid);
+                    continue;
+                }
+
+                bodyPartAppearanceComponent.IsMarking = true;
+                bodyPart = (bodyPartUid, bodyPartComponent, bodyPartAppearanceComponent);
+            }
+
+            if (markingSprite.ReplacementBodyPart.HasValue && bodyPart.Comp2.Visible)
+            {
+                bodyPart.Comp2.Visible = false;
+                _sprite.LayerSetVisible(sprite, bodyPart.Comp2.Layer, false);
+            }
+
+            bodyPart.Comp2.MarkingsLayers.Add(markingSprite);
+
+            AddMarkingSprite(sprite, markingSprite, i);
+        }
+    }
+
+    public override void RemoveMarking(Entity<BodyComponent?, HumanoidAppearanceComponent?> body, Marking marking)
+    {
+        if (!Resolve(body, ref body.Comp1, false)
+            || !Resolve(body, ref body.Comp2, false)
+            || !_marking.TryGetMarking(marking, out var markingPrototype)
+            || !TryComp<SpriteComponent>(body, out var spriteComponent))
+            return;
+
+        var sprite = (body.Owner, spriteComponent);
+        foreach (var markingSprite in markingPrototype.Sprites)
+        {
+            if (markingSprite.Organ != OrganType.None && GetOrgans<OrganAppearanceComponent>((body, body.Comp1), markingSprite.Organ).FirstOrNull() is { } organ)
+            {
+                organ.Comp2.MarkingsLayers.Remove(markingSprite);
+                continue;
+            }
+
+            if (markingSprite.BodyPart == BodyPartType.None || GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1), markingSprite.BodyPart).FirstOrNull() is not { } bodyPart)
+                continue;
+
+            bodyPart.Comp2.MarkingsLayers.Remove(markingSprite);
+
+            if (markingSprite.ReplacementBodyPart.HasValue && !bodyPart.Comp2.Visible)
+            {
+                bodyPart.Comp2.Visible = true;
+                _sprite.LayerSetVisible(sprite, bodyPart.Comp2.Layer, true);
+            }
+
+            if (markingSprite.ReplacementBodyPart.HasValue && bodyPart.Comp2.IsMarking)
+            {
+                QueueDel(bodyPart);
+                continue;
+            }
+
+            RemoveMarkingSprite(sprite, markingSprite);
+        }
+    }
+
+    public override void UpdateMarking(Entity<BodyComponent?, HumanoidAppearanceComponent?> body, Marking marking)
+    {
+        if (!Resolve(body, ref body.Comp1, false)
+            || !Resolve(body, ref body.Comp2, false)
+            || !_marking.TryGetMarking(marking, out var markingPrototype)
+            || !TryComp<SpriteComponent>(body, out var spriteComponent))
+            return;
+
+        var sprite = (body.Owner, spriteComponent);
+        for (var i = 0; i < markingPrototype.Sprites.Count; i++)
+        {
+            var prototypeMarkingSprite = new MarkingLayerInfo(markingPrototype.Sprites[i]);
+
+            List<MarkingLayerInfo> markingLayers;
+            if (GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1), prototypeMarkingSprite.BodyPart).FirstOrNull() is { } bodyPart)
+                markingLayers = bodyPart.Comp2.MarkingsLayers;
+            else if (GetOrgans<OrganAppearanceComponent>((body, body.Comp1), prototypeMarkingSprite.Organ).FirstOrNull() is { } organ)
+                markingLayers = organ.Comp2.MarkingsLayers;
+            else
+                continue;
+
+            if (!TryGetMarkingLayer(markingLayers, prototypeMarkingSprite.MarkingId, prototypeMarkingSprite.State, out var markingSprite))
+                continue;
+
+            markingSprite.Color = marking.MarkingColors[i];
+
+            UpdateMarkingSprite(sprite, markingSprite);
+        }
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/Content.Client/_White/Body/Systems/BodySystem.Body.cs b/Content.Client/_White/Body/Systems/BodySystem.Body.cs
new file mode 100644
index 00000000000..3a5eec795d9
--- /dev/null
+++ b/Content.Client/_White/Body/Systems/BodySystem.Body.cs
@@ -0,0 +1,78 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+
+namespace Content.Client._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    private void InitializeBody() => SubscribeLocalEvent<BodyComponent, ComponentHandleState>(OnBodyHandleState);
+
+    #region Event Handling
+
+    private void OnBodyHandleState(Entity<BodyComponent> body, ref ComponentHandleState args)
+    {
+        if (args.Current is not BodyComponentState state)
+            return;
+
+        foreach (var (key, slot) in body.Comp.BodyParts)
+        {
+            if (state.BodyParts.ContainsKey(key) || slot.ContainerSlot == null)
+                continue;
+
+            _container.ShutdownContainer(slot.ContainerSlot);
+            body.Comp.BodyParts.Remove(key);
+        }
+
+        foreach (var (key, slot) in body.Comp.Organs)
+        {
+            if (state.Organs.ContainsKey(key) || slot.ContainerSlot == null)
+                continue;
+
+            _container.ShutdownContainer(slot.ContainerSlot);
+            body.Comp.Organs.Remove(key);
+        }
+
+        foreach (var (stateKey, (stateSlot, stateOwner)) in state.BodyParts)
+        {
+            if (GetEntity(stateOwner) is not {} uid || !uid.Valid)
+                continue;
+
+            if (body.Comp.BodyParts.TryGetValue(stateKey, out var slot))
+            {
+                slot.CopyFrom(stateSlot);
+                slot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(uid, GetBodyPartSlotContainerId(stateKey));
+            }
+            else
+            {
+                slot = new (stateSlot)
+                {
+                    ContainerSlot = _container.EnsureContainer<ContainerSlot>(uid, GetBodyPartSlotContainerId(stateKey))
+                };
+                body.Comp.BodyParts[stateKey] = slot;
+            }
+        }
+
+        foreach (var (stateKey, (stateSlot, stateOwner)) in state.Organs)
+        {
+            if (GetEntity(stateOwner) is not {} uid || !uid.Valid)
+                continue;
+
+            if (body.Comp.Organs.TryGetValue(stateKey, out var slot))
+            {
+                slot.CopyFrom(stateSlot);
+                slot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(uid, GetOrganContainerId(stateKey));
+            }
+            else
+            {
+                slot = new (stateSlot)
+                {
+                    ContainerSlot = _container.EnsureContainer<ContainerSlot>(uid, GetOrganContainerId(stateKey))
+                };
+                body.Comp.Organs[stateKey] = slot;
+            }
+        }
+    }
+
+    #endregion
+}
diff --git a/Content.Client/_White/Body/Systems/BodySystem.BodyPart.cs b/Content.Client/_White/Body/Systems/BodySystem.BodyPart.cs
new file mode 100644
index 00000000000..23b1e5d1ba9
--- /dev/null
+++ b/Content.Client/_White/Body/Systems/BodySystem.BodyPart.cs
@@ -0,0 +1,105 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+
+namespace Content.Client._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    private void InitializeBodyPart()
+    {
+        SubscribeLocalEvent<BodyPartComponent, ComponentHandleState>(OnBodyPartHandleState);
+    }
+
+    #region Event Handling
+
+    private void OnBodyPartHandleState(Entity<BodyPartComponent> bodyPart, ref ComponentHandleState args)
+    {
+        if (args.Current is not BodyPartComponentState state)
+            return;
+
+        foreach (var (key, slot) in bodyPart.Comp.BodyParts)
+        {
+            if (state.BodyParts.ContainsKey(key) || slot.ContainerSlot == null)
+                continue;
+
+            _container.ShutdownContainer(slot.ContainerSlot);
+            bodyPart.Comp.BodyParts.Remove(key);
+        }
+
+        foreach (var (key, slot) in bodyPart.Comp.Bones)
+        {
+            if (state.Bones.ContainsKey(key) || slot.ContainerSlot == null)
+                continue;
+
+            _container.ShutdownContainer(slot.ContainerSlot);
+            bodyPart.Comp.Bones.Remove(key);
+        }
+
+        foreach (var (key, slot) in bodyPart.Comp.Organs)
+        {
+            if (state.Organs.ContainsKey(key) || slot.ContainerSlot == null)
+                continue;
+
+            _container.ShutdownContainer(slot.ContainerSlot);
+            bodyPart.Comp.Organs.Remove(key);
+        }
+
+        foreach (var (stateKey, stateSlot) in state.BodyParts)
+        {
+            if (bodyPart.Comp.BodyParts.TryGetValue(stateKey, out var slot))
+            {
+                slot.CopyFrom(stateSlot);
+                slot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetBodyPartSlotContainerId(stateKey));
+            }
+            else
+            {
+                slot = new (stateSlot)
+                {
+                    ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetBodyPartSlotContainerId(stateKey))
+                };
+                bodyPart.Comp.BodyParts[stateKey] = slot;
+            }
+        }
+
+        foreach (var (stateKey, stateSlot) in state.Bones)
+        {
+            if (bodyPart.Comp.Bones.TryGetValue(stateKey, out var slot))
+            {
+                slot.CopyFrom(stateSlot);
+                slot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetBoneContainerId(stateKey));
+            }
+            else
+            {
+                slot = new (stateSlot)
+                {
+                    ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetBoneContainerId(stateKey))
+                };
+                bodyPart.Comp.Bones[stateKey] = slot;
+            }
+        }
+
+        foreach (var (stateKey, stateSlot) in state.Organs)
+        {
+            if (bodyPart.Comp.Organs.TryGetValue(stateKey, out var slot))
+            {
+                slot.CopyFrom(stateSlot);
+                slot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetOrganContainerId(stateKey));
+            }
+            else
+            {
+                slot = new (stateSlot)
+                {
+                    ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetOrganContainerId(stateKey))
+                };
+                bodyPart.Comp.Organs[stateKey] = slot;
+            }
+        }
+
+        bodyPart.Comp.Type = state.Type;
+        bodyPart.Comp.Body = GetEntity(state.Body);
+        bodyPart.Comp.Parent = GetEntity(state.Parent);
+    }
+
+    #endregion
+}
diff --git a/Content.Client/_White/Body/Systems/BodySystem.Bone.cs b/Content.Client/_White/Body/Systems/BodySystem.Bone.cs
new file mode 100644
index 00000000000..f6953704bba
--- /dev/null
+++ b/Content.Client/_White/Body/Systems/BodySystem.Bone.cs
@@ -0,0 +1,53 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+
+namespace Content.Client._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    private void InitializeBone()
+    {
+        SubscribeLocalEvent<BoneComponent, ComponentHandleState>(OnBoneHandleState);
+    }
+
+    #region Event Handling
+
+    private void OnBoneHandleState(Entity<BoneComponent> bone, ref ComponentHandleState args)
+    {
+        if (args.Current is not BoneComponentState state)
+            return;
+
+        foreach (var (key, slot) in bone.Comp.Organs)
+        {
+            if (state.Organs.ContainsKey(key) || slot.ContainerSlot == null)
+                continue;
+
+            _container.ShutdownContainer(slot.ContainerSlot);
+            bone.Comp.Organs.Remove(key);
+        }
+
+        foreach (var (stateKey, stateSlot) in state.Organs)
+        {
+            if (bone.Comp.Organs.TryGetValue(stateKey, out var slot))
+            {
+                slot.CopyFrom(stateSlot);
+                slot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(bone, GetOrganContainerId(stateKey));
+            }
+            else
+            {
+                slot = new (stateSlot)
+                {
+                    ContainerSlot = _container.EnsureContainer<ContainerSlot>(bone, GetOrganContainerId(stateKey))
+                };
+                bone.Comp.Organs[stateKey] = slot;
+            }
+        }
+
+        bone.Comp.Type = state.Type;
+        bone.Comp.Body = GetEntity(state.Body);
+        bone.Comp.Parent = GetEntity(state.Parent);
+    }
+
+    #endregion
+}
diff --git a/Content.Client/_White/Body/Systems/BodySystem.cs b/Content.Client/_White/Body/Systems/BodySystem.cs
new file mode 100644
index 00000000000..3823d7110ce
--- /dev/null
+++ b/Content.Client/_White/Body/Systems/BodySystem.cs
@@ -0,0 +1,25 @@
+using Content.Shared._White.Body.Systems;
+using Content.Shared.Humanoid.Markings;
+using Robust.Client.GameObjects;
+using Robust.Client.ResourceManagement;
+
+namespace Content.Client._White.Body.Systems;
+
+public sealed partial class BodySystem : SharedBodySystem
+{
+    [Dependency] private readonly MarkingManager _marking = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    [Dependency] private readonly ContainerSystem _container = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeAppearance();
+        InitializeBody();
+        InitializeBodyPart();
+        InitializeBone();
+    }
+}
diff --git a/Content.Client/_White/Body/Wound/Systems/WoundSystem.cs b/Content.Client/_White/Body/Wound/Systems/WoundSystem.cs
new file mode 100644
index 00000000000..1b9824b5e05
--- /dev/null
+++ b/Content.Client/_White/Body/Wound/Systems/WoundSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._White.Body.Wounds.Systems;
+
+namespace Content.Client._White.Body.Wound.Systems;
+
+public sealed class WoundSystem : SharedWoundSystem;
diff --git a/Content.Client/_White/Gibbing/GibbingSystem.cs b/Content.Client/_White/Gibbing/GibbingSystem.cs
new file mode 100644
index 00000000000..36ff6d72701
--- /dev/null
+++ b/Content.Client/_White/Gibbing/GibbingSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._White.Gibbing;
+
+namespace Content.Client._White.Gibbing;
+
+public sealed class GibbingSystem : SharedGibbingSystem;
diff --git a/Content.Client/_White/TargetDoll/TargetDollSystem.cs b/Content.Client/_White/TargetDoll/TargetDollSystem.cs
new file mode 100644
index 00000000000..36ffb342c52
--- /dev/null
+++ b/Content.Client/_White/TargetDoll/TargetDollSystem.cs
@@ -0,0 +1,72 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.TargetDoll;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Client._White.TargetDoll;
+
+public sealed class TargetDollSystem : SharedTargetDollSystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    /// <summary>
+    /// Raised whenever selected body part changes.
+    /// </summary>
+    public event Action<BodyPartType>? LocalPlayerTargetDollUpdated;
+
+    public event Action<TargetDollComponent>? LocalPlayerTargetDollAdded;
+    public event Action? LocalPlayerTargetDollRemoved;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TargetDollComponent, AfterAutoHandleStateEvent>(OnHandleState);
+        SubscribeLocalEvent<TargetDollComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<TargetDollComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<TargetDollComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<TargetDollComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnHandleState(EntityUid uid, TargetDollComponent component, AfterAutoHandleStateEvent args)
+    {
+        if (!_gameTiming.IsFirstTimePredicted)
+            return;
+
+        LocalPlayerTargetDollUpdated?.Invoke(component.SelectedBodyPartType);
+    }
+
+    private void OnPlayerAttached(EntityUid uid, TargetDollComponent component, LocalPlayerAttachedEvent args)
+    {
+        LocalPlayerTargetDollAdded?.Invoke(component);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, TargetDollComponent component, LocalPlayerDetachedEvent args)
+    {
+        LocalPlayerTargetDollRemoved?.Invoke();
+    }
+
+    private void OnStartup(EntityUid uid, TargetDollComponent component, ComponentStartup args)
+    {
+        if (_playerManager.LocalEntity == uid)
+            LocalPlayerTargetDollAdded?.Invoke(component);
+    }
+
+    private void OnShutdown(EntityUid uid, TargetDollComponent component, ComponentShutdown args)
+    {
+        if (_playerManager.LocalEntity == uid)
+            LocalPlayerTargetDollRemoved?.Invoke();
+    }
+
+    public override void SelectBodyPart(Entity<TargetDollComponent> ent, BodyPartType bodyPartType)
+    {
+        base.SelectBodyPart(ent, bodyPartType);
+
+        if (!_gameTiming.IsFirstTimePredicted)
+            return;
+
+        LocalPlayerTargetDollUpdated?.Invoke(ent.Comp.SelectedBodyPartType);
+    }
+}
diff --git a/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/BodyPartButton.cs b/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/BodyPartButton.cs
new file mode 100644
index 00000000000..f2333d02aef
--- /dev/null
+++ b/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/BodyPartButton.cs
@@ -0,0 +1,71 @@
+using Content.Shared._White.Body.Components;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client._White.UserInterface.Systems.TargetDoll.Controls;
+
+public sealed class BodyPartButton : TextureButton
+{
+    [ViewVariables]
+    public BodyPartType BodyPartType { get; set; } = BodyPartType.None;
+
+    private string? _texturePathFocused;
+    public string TexturePathFocused
+    {
+        set
+        {
+            _texturePathFocused = value;
+            if (_texturePathFocused != null)
+                TextureFocused = Theme.ResolveTexture(_texturePathFocused);
+        }
+    }
+
+    private string? _texturePathHovered;
+    public string TexturePathHovered
+    {
+        set
+        {
+            _texturePathHovered = value;
+            if (_texturePathHovered != null)
+                TextureHovered = Theme.ResolveTexture(_texturePathHovered);
+        }
+    }
+
+    private Texture? _textureFocused;
+    public Texture? TextureFocused
+    {
+        get => _textureFocused;
+        set
+        {
+            _textureFocused = value;
+            InvalidateMeasure();
+        }
+    }
+
+    private Texture? _textureHovered;
+    public Texture? TextureHovered
+    {
+        get => _textureHovered;
+        set
+        {
+            _textureHovered = value;
+            InvalidateMeasure();
+        }
+    }
+
+    public BodyPartButton()
+    {
+        IoCManager.InjectDependencies(this);
+    }
+
+    protected override void OnThemeUpdated()
+    {
+        base.OnThemeUpdated();
+
+        if (_texturePathFocused != null)
+            TextureFocused = Theme.ResolveTexture(_texturePathFocused);
+
+        if (_texturePathHovered != null)
+            TextureHovered = Theme.ResolveTexture(_texturePathHovered);
+    }
+}
diff --git a/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/TargetDollControl.xaml b/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/TargetDollControl.xaml
new file mode 100644
index 00000000000..585b42e80b1
--- /dev/null
+++ b/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/TargetDollControl.xaml
@@ -0,0 +1,118 @@
+<controls:TargetDollControl
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client._White.UserInterface.Systems.TargetDoll.Controls">
+    <PanelContainer Name="BodyParts" Access="Public" SetSize="64 64">
+        <controls:BodyPartButton
+            Name="HeadButton"
+            BodyPartType="Head"
+            Access="Public"
+            TexturePathFocused="TargetDoll/head.png"
+            TexturePathHovered="TargetDoll/head_hover.png"
+            MinSize="18 14"
+            Margin="22 6 24 44"/>
+        <controls:BodyPartButton
+            Name="ChestButton"
+            BodyPartType="Chest"
+            Access="Public"
+            TexturePathFocused="TargetDoll/chest.png"
+            TexturePathHovered="TargetDoll/chest_hover.png"
+            MinSize="18 20"
+            Margin="22 20 24 24"/>
+        <controls:BodyPartButton
+            Name="GroinButton"
+            BodyPartType="Groin"
+            Access="Public"
+            TexturePathFocused="TargetDoll/groin.png"
+            TexturePathHovered="TargetDoll/groin_hover.png"
+            MinSize="18 8"
+            Margin="22 38 24 18"/>
+        <controls:BodyPartButton
+            Name="RightArmButton"
+            BodyPartType="RightArm"
+            Access="Public"
+            TexturePathFocused="TargetDoll/right_arm.png"
+            TexturePathHovered="TargetDoll/right_arm_hover.png"
+            MinSize="8 16"
+            Margin="14 22 42 26"/>
+        <controls:BodyPartButton
+            Name="RightHandButton"
+            BodyPartType="RightHand"
+            Access="Public"
+            TexturePathFocused="TargetDoll/right_hand.png"
+            TexturePathHovered="TargetDoll/right_hand_hover.png"
+            MinSize="8 8"
+            Margin="14 36 42 20"/>
+        <controls:BodyPartButton
+            Name="LeftArmButton"
+            BodyPartType="LeftArm"
+            Access="Public"
+            TexturePathFocused="TargetDoll/left_arm.png"
+            TexturePathHovered="TargetDoll/left_arm_hover.png"
+            MinSize="8 16"
+            Margin="40 22 16 26"/>
+        <controls:BodyPartButton
+            Name="LeftHandButton"
+            BodyPartType="LeftHand"
+            Access="Public"
+            TexturePathFocused="TargetDoll/left_hand.png"
+            TexturePathHovered="TargetDoll/left_hand_hover.png"
+            MinSize="8 8"
+            Margin="40 36 16 20"/>
+        <controls:BodyPartButton
+            Name="RightLegButton"
+            BodyPartType="RightLeg"
+            Access="Public"
+            TexturePathFocused="TargetDoll/right_leg.png"
+            TexturePathHovered="TargetDoll/right_leg_hover.png"
+            MinSize="8 18"
+            Margin="22 42 34 4"/>
+        <controls:BodyPartButton
+            Name="RightFootButton"
+            BodyPartType="RightFoot"
+            Access="Public"
+            TexturePathFocused="TargetDoll/right_foot.png"
+            TexturePathHovered="TargetDoll/right_foot_hover.png"
+            MinSize="12 6"
+            Margin="18 58 34 0"/>
+        <controls:BodyPartButton
+            Name="LeftLegButton"
+            BodyPartType="LeftLeg"
+            Access="Public"
+            TexturePathFocused="TargetDoll/left_leg.png"
+            TexturePathHovered="TargetDoll/left_leg_hover.png"
+            MinSize="8 18"
+            Margin="32 42 24 4"/>
+        <controls:BodyPartButton
+            Name="LeftFootButton"
+            BodyPartType="LeftFoot"
+            Access="Public"
+            TexturePathFocused="TargetDoll/left_foot.png"
+            TexturePathHovered="TargetDoll/left_foot_hover.png"
+            MinSize="12 6"
+            Margin="32 58 20 0"/>
+        <controls:BodyPartButton
+            Name="TailButton"
+            BodyPartType="Tail"
+            Access="Public"
+            TexturePathFocused="TargetDoll/tail.png"
+            TexturePathHovered="TargetDoll/tail_hover.png"
+            MinSize="14 16"
+            Margin="40 44 10 4"/>
+        <controls:BodyPartButton
+            Name="EyesButton"
+            BodyPartType="Eyes"
+            Access="Public"
+            TexturePathFocused="TargetDoll/eyes.png"
+            TexturePathHovered="TargetDoll/eyes_hover.png"
+            MinSize="10 6"
+            Margin="26 10 28 48"/>
+        <controls:BodyPartButton
+            Name="MouthButton"
+            BodyPartType="Mouth"
+            Access="Public"
+            TexturePathFocused="TargetDoll/mouth.png"
+            TexturePathHovered="TargetDoll/mouth_hover.png"
+            MinSize="6 4"
+            Margin="28 16 30 44"/>
+    </PanelContainer>
+</controls:TargetDollControl>
diff --git a/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/TargetDollControl.xaml.cs b/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/TargetDollControl.xaml.cs
new file mode 100644
index 00000000000..54fa52fb6da
--- /dev/null
+++ b/Content.Client/_White/UserInterface/Systems/TargetDoll/Controls/TargetDollControl.xaml.cs
@@ -0,0 +1,40 @@
+using System.Numerics;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._White.UserInterface.Systems.TargetDoll.Controls;
+
+[GenerateTypedNameReferences]
+public sealed partial class TargetDollControl : TextureRect
+{
+    public Texture? TextureHovered;
+    public Texture? TextureFocused;
+
+    public float DrawScale = 2;
+
+    public TargetDollControl()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+
+        if (TextureHovered != null)
+            DrawTexture(handle, TextureHovered);
+
+        if (TextureFocused != null)
+            DrawTexture(handle, TextureFocused);
+    }
+
+    public void DrawTexture(DrawingHandleScreen handle, Texture tex, Color? color = null)
+    {
+        var texSize = new Vector2(tex.Width * DrawScale * UIScale, tex.Height * DrawScale * UIScale);
+        var offset = Vector2.Zero;
+
+        handle.DrawTextureRect(tex, new UIBox2(Vector2.Zero - offset, texSize - offset), color);
+    }
+}
diff --git a/Content.Client/_White/UserInterface/Systems/TargetDoll/TargetDollUIController.cs b/Content.Client/_White/UserInterface/Systems/TargetDoll/TargetDollUIController.cs
new file mode 100644
index 00000000000..838c0eeb0cd
--- /dev/null
+++ b/Content.Client/_White/UserInterface/Systems/TargetDoll/TargetDollUIController.cs
@@ -0,0 +1,58 @@
+using Content.Client.Gameplay;
+using Content.Client._White.TargetDoll;
+using Content.Client._White.UserInterface.Systems.TargetDoll.Widgets;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.TargetDoll;
+using Robust.Client.UserInterface.Controllers;
+
+namespace Content.Client._White.UserInterface.Systems.TargetDoll;
+
+public sealed class TargetDollUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetDollSystem>
+{
+    private TargetDollComponent? _targetingComponent;
+    private TargetDollGui? TargetDollGui => UIManager.GetActiveUIWidgetOrNull<TargetDollGui>();
+
+    public void OnSystemLoaded(TargetDollSystem system)
+    {
+        system.LocalPlayerTargetDollUpdated += OnTargetDollUpdated;
+        system.LocalPlayerTargetDollAdded += OnTargetDollAdded;
+        system.LocalPlayerTargetDollRemoved += OnTargetDollRemoved;
+    }
+
+    public void OnSystemUnloaded(TargetDollSystem system)
+    {
+        system.LocalPlayerTargetDollUpdated -= OnTargetDollUpdated;
+        system.LocalPlayerTargetDollAdded -= OnTargetDollAdded;
+        system.LocalPlayerTargetDollRemoved -= OnTargetDollRemoved;
+    }
+
+    public void OnStateEntered(GameplayState state)
+    {
+        if (TargetDollGui == null)
+            return;
+
+        TargetDollGui.Visible = _targetingComponent != null;
+    }
+
+    private void OnTargetDollUpdated(BodyPartType bodyPartType) => TargetDollGui?.OnTargetDollUpdated(bodyPartType);
+
+    private void OnTargetDollAdded(TargetDollComponent component)
+    {
+        if (TargetDollGui != null)
+            TargetDollGui.Visible = true;
+
+        _targetingComponent = component;
+        OnTargetDollUpdated(component.SelectedBodyPartType);
+    }
+
+    private void OnTargetDollRemoved()
+    {
+        if (TargetDollGui != null)
+            TargetDollGui.Visible = false;
+
+        _targetingComponent = null;
+    }
+
+    public void SelectBodyPart(BodyPartType bodyPartType) =>
+        EntityManager.RaisePredictiveEvent(new SelectBodyPartRequestEvent(bodyPartType));
+}
diff --git a/Content.Client/_White/UserInterface/Systems/TargetDoll/Widgets/TargetDollGui.xaml b/Content.Client/_White/UserInterface/Systems/TargetDoll/Widgets/TargetDollGui.xaml
new file mode 100644
index 00000000000..e5c4449c724
--- /dev/null
+++ b/Content.Client/_White/UserInterface/Systems/TargetDoll/Widgets/TargetDollGui.xaml
@@ -0,0 +1,13 @@
+<widgets:TargetDollGui
+    xmlns="https://spacestation14.io"
+    xmlns:widgets="clr-namespace:Content.Client._White.UserInterface.Systems.TargetDoll.Widgets"
+    xmlns:controls="clr-namespace:Content.Client._White.UserInterface.Systems.TargetDoll.Controls">
+    <!--TODO: Use TextureRect when TexturePath set() starts using Theme -->
+    <TextureButton
+        Name="TargetDollTexture"
+        TexturePath="target_doll.png"
+        SetSize="64 64"
+        Scale = "2 2">
+        <controls:TargetDollControl Name="Control" SetSize="64 64"/>
+    </TextureButton>
+</widgets:TargetDollGui>
diff --git a/Content.Client/_White/UserInterface/Systems/TargetDoll/Widgets/TargetDollGui.xaml.cs b/Content.Client/_White/UserInterface/Systems/TargetDoll/Widgets/TargetDollGui.xaml.cs
new file mode 100644
index 00000000000..557b3cbdd09
--- /dev/null
+++ b/Content.Client/_White/UserInterface/Systems/TargetDoll/Widgets/TargetDollGui.xaml.cs
@@ -0,0 +1,34 @@
+using Content.Client._White.UserInterface.Systems.TargetDoll.Controls;
+using Content.Shared._White.Body.Components;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._White.UserInterface.Systems.TargetDoll.Widgets;
+
+[GenerateTypedNameReferences]
+public sealed partial class TargetDollGui : UIWidget
+{
+    private readonly Dictionary<BodyPartType, BodyPartButton?> _bodyPartButtons;
+
+    public TargetDollGui()
+    {
+        RobustXamlLoader.Load(this);
+        var controller = UserInterfaceManager.GetUIController<TargetDollUIController>();
+
+        _bodyPartButtons = new();
+        foreach (var bodyPart in Control.BodyParts.Children)
+        {
+            if (bodyPart is not BodyPartButton bodyPartButton)
+                continue;
+
+            bodyPartButton.MouseFilter = MouseFilterMode.Stop;
+            bodyPartButton.OnPressed += _ => controller.SelectBodyPart(bodyPartButton.BodyPartType);
+            bodyPartButton.OnMouseEntered += _ => Control.TextureHovered = bodyPartButton.TextureHovered;
+            bodyPartButton.OnMouseExited += _ => Control.TextureHovered = null;
+            _bodyPartButtons[bodyPartButton.BodyPartType] = bodyPartButton;
+        }
+    }
+
+    public void OnTargetDollUpdated(BodyPartType bodyPartType) => Control.TextureFocused = _bodyPartButtons[bodyPartType]?.TextureFocused;
+}
diff --git a/Content.Client/_White/Xenomorphs/Plasma/PlasmaSystem.cs b/Content.Client/_White/Xenomorphs/Plasma/PlasmaSystem.cs
index 479ab59cf89..35df2d75c20 100644
--- a/Content.Client/_White/Xenomorphs/Plasma/PlasmaSystem.cs
+++ b/Content.Client/_White/Xenomorphs/Plasma/PlasmaSystem.cs
@@ -1,11 +1,14 @@
 using Content.Client.Alerts;
 using Content.Shared._White.Xenomorphs.Plasma;
 using Content.Shared._White.Xenomorphs.Plasma.Components;
+using Robust.Client.GameObjects;
 
 namespace Content.Client._White.Xenomorphs.Plasma;
 
 public sealed class PlasmaSystem : SharedPlasmaSystem
 {
+    [Dependency] private readonly SpriteSystem _system = default!;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -18,11 +21,11 @@ private void OnUpdateAlertSprite(EntityUid uid, PlasmaVesselComponent component,
         if (args.Alert.ID != component.PlasmaAlert)
             return;
 
-        var sprite = args.SpriteViewEnt.Comp;
+        var sprite = args.SpriteViewEnt.AsNullable();
         var plasma = Math.Clamp(component.Plasma.Int(), 0, 999);
 
-        sprite.LayerSetState(PlasmaVisualLayers.Digit1, $"{plasma / 100 % 10}");
-        sprite.LayerSetState(PlasmaVisualLayers.Digit2, $"{plasma / 10 % 10}");
-        sprite.LayerSetState(PlasmaVisualLayers.Digit3, $"{plasma % 10}");
+        _system.LayerSetRsiState(sprite, PlasmaVisualLayers.Digit1, $"{plasma / 100 % 10}");
+        _system.LayerSetRsiState(sprite, PlasmaVisualLayers.Digit2, $"{plasma / 10 % 10}");
+        _system.LayerSetRsiState(sprite, PlasmaVisualLayers.Digit3, $"{plasma % 10}");
     }
 }
diff --git a/Content.IntegrationTests/Tests/Body/GibTest.cs b/Content.IntegrationTests/Tests/Body/GibTest.cs
index 4627c79f64d..a0a041eaf42 100644
--- a/Content.IntegrationTests/Tests/Body/GibTest.cs
+++ b/Content.IntegrationTests/Tests/Body/GibTest.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using Content.Server._White.Gibbing;
 using Content.Server.Body.Systems;
 using Robust.Shared.GameObjects;
 
@@ -28,8 +29,8 @@ public async Task TestGib()
         Assert.That(client.EntMan.EntityExists(nuid1));
         Assert.That(client.EntMan.EntityExists(nuid2));
 
-        await server.WaitAssertion(() => server.System<BodySystem>().GibBody(target1, gibOrgans: false));
-        await server.WaitAssertion(() => server.System<BodySystem>().GibBody(target2, gibOrgans: true));
+        await server.WaitAssertion(() => server.System<GibbingSystem>().GibBody(target1, gibOrgans: false)); // WD EDIT
+        await server.WaitAssertion(() => server.System<GibbingSystem>().GibBody(target2, gibOrgans: true)); // WD EDIT
 
         await pair.RunTicksSync(5);
         await pair.WaitCommand("dirty");
diff --git a/Content.IntegrationTests/Tests/Body/LegTest.cs b/Content.IntegrationTests/Tests/Body/LegTest.cs
index 7b49bbe84a3..af59f5fd7a2 100644
--- a/Content.IntegrationTests/Tests/Body/LegTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LegTest.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
+using Content.Server._White.Body.Systems;
 using Content.Server.Body.Systems;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Rotation;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -57,11 +57,11 @@ await server.WaitAssertion(() =>
                 Assert.That(!appearanceSystem.TryGetData(human, RotationVisuals.RotationState, out RotationState _, appearance));
 
                 var bodySystem = entityManager.System<BodySystem>();
-                var legs = bodySystem.GetBodyChildrenOfType(human, BodyPartType.Leg, body);
+                var legs = bodySystem.GetBodyParts((human, body), BodyPartType.Leg); // WD EDIT
 
                 foreach (var leg in legs)
                 {
-                    xformSystem.DetachEntity(leg.Id, entityManager.GetComponent<TransformComponent>(leg.Id));
+                    xformSystem.DetachEntity(leg, entityManager.GetComponent<TransformComponent>(leg)); // WD EDIT
                 }
             });
 
diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index c6ae3e04339..00a234b3129 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -2,7 +2,6 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
-using Content.Shared.Body.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared;
 using Robust.Shared.Configuration;
@@ -11,6 +10,7 @@
 using Robust.Shared.Map.Components;
 using System.Linq;
 using System.Numerics;
+using Content.Shared._White.Body.Components;
 using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.Utility;
 
diff --git a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs
index 67163d07961..20ad9d424b1 100644
--- a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs
+++ b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
@@ -44,8 +44,8 @@ await server.WaitAssertion(() =>
 
             Assert.That(entities.HasComponent<BodyComponent>(human), Is.True);
 
-            var parts = bodySystem.GetBodyChildren(human).Skip(1).ToArray();
-            var organs = bodySystem.GetBodyOrgans(human).ToArray();
+            var parts = bodySystem.GetBodyParts(human).Skip(1).ToArray(); // WD EDIT
+            var organs = bodySystem.GetOrgans(human).ToArray(); // WD EDIT
 
             Assert.Multiple(() =>
             {
@@ -59,25 +59,18 @@ await server.WaitAssertion(() =>
                 {
                     Assert.That(component.Body, Is.EqualTo(human));
                     Assert.That(component.Body, Is.Not.Null);
-                    var parent = bodySystem.GetParentPartOrNull(id);
+                    var parent = component.Parent; // WD EDIT
                     Assert.That(parent, Is.Not.EqualTo(default(EntityUid)));
-                    if (!bodySystem.IsPartRoot(component.Body.Value, id, null, component))
-                    {
-                        Assert.That(parent, Is.Not.Null);
-                    }
-                    else
-                    {
-                        Assert.That(parent, Is.Null);
-                    }
+                    Assert.That(parent, Is.Null);
                 });
 
-                foreach (var (slotId, slot) in component.Children)
+                foreach (var (slotId, slot) in component.BodyParts) // WD EDIT
                 {
                     Assert.Multiple(() =>
                     {
                         Assert.That(slot.Id, Is.EqualTo(slotId));
                         var container =
-                            containerSystem.GetContainer(id, SharedBodySystem.GetPartSlotContainerId(slotId));
+                            containerSystem.GetContainer(id, SharedBodySystem.GetBodyPartSlotContainerId(slotId)); // WD EDIT
                         Assert.That(container.ContainedEntities, Is.Not.Empty);
                     });
                 }
@@ -85,7 +78,7 @@ await server.WaitAssertion(() =>
 
             foreach (var (id, component) in organs)
             {
-                var parent = bodySystem.GetParentPartOrNull(id);
+                var parent = component.ParentPart; // WD EDIT
 
                 Assert.Multiple(() =>
                 {
@@ -129,8 +122,8 @@ await server.WaitAssertion(() =>
             foreach (var (uid, body) in query)
             {
                 human = uid;
-                parts = bodySystem.GetBodyChildren(human).Skip(1).ToArray();
-                organs = bodySystem.GetBodyOrgans(human).ToArray();
+                parts = bodySystem.GetBodyParts(human).Skip(1).ToArray(); // WD EDIT
+                organs = bodySystem.GetOrgans(human).ToArray(); // WD EDIT
 
                 Assert.Multiple(() =>
                 {
@@ -140,7 +133,7 @@ await server.WaitAssertion(() =>
 
                 foreach (var (id, component) in parts)
                 {
-                    var parent = bodySystem.GetParentPartOrNull(id);
+                    var parent = component.Parent; // WD EDIT
 
                     Assert.Multiple(() =>
                     {
@@ -149,13 +142,13 @@ await server.WaitAssertion(() =>
                         Assert.That(parent.Value, Is.Not.EqualTo(default(EntityUid)));
                     });
 
-                    foreach (var (slotId, slot) in component.Children)
+                    foreach (var (slotId, slot) in component.BodyParts) // WD EDIT
                     {
                         Assert.Multiple(() =>
                         {
                             Assert.That(slot.Id, Is.EqualTo(slotId));
                             var container =
-                                containerSystem.GetContainer(id, SharedBodySystem.GetPartSlotContainerId(slotId));
+                                containerSystem.GetContainer(id, SharedBodySystem.GetBodyPartSlotContainerId(slotId)); // WD EDIT
                             Assert.That(container.ContainedEntities, Is.Not.Empty);
                         });
                     }
@@ -163,7 +156,7 @@ await server.WaitAssertion(() =>
 
                 foreach (var (id, component) in organs)
                 {
-                    var parent = bodySystem.GetParentPartOrNull(id);
+                    var parent = component.ParentPart; // WD EDIT
 
                     Assert.Multiple(() =>
                     {
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 1b31fe38c28..d543a0e2dce 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -1,9 +1,9 @@
 using System.Numerics;
+using Content.Server._White.Body.Systems;
 using Content.Server.Body.Systems;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Buckle;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -299,12 +299,12 @@ await server.WaitAssertion(() =>
                 }
 
                 var bodySystem = entityManager.System<BodySystem>();
-                var legs = bodySystem.GetBodyChildrenOfType(human, BodyPartType.Leg, body);
+                var legs = bodySystem.GetBodyParts((human, body), BodyPartType.Leg); // WD EDIT
 
                 // Break our guy's kneecaps
                 foreach (var leg in legs)
                 {
-                    entityManager.DeleteEntity(leg.Id);
+                    entityManager.DeleteEntity(leg); // WD EDIT
                 }
             });
 
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index 2570e2246a6..1ee4342ff60 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using Content.Server.Cuffs;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Hands.Components;
 using Robust.Server.Console;
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index b3d684e01a0..32f782c54e2 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -5,11 +5,12 @@
 using Content.Client.Examine;
 using Content.Client.Gameplay;
 using Content.IntegrationTests.Pair;
+using Content.Server._White.Body.Systems;
 using Content.Server.Body.Systems;
 using Content.Server.Hands.Systems;
 using Content.Server.Stack;
 using Content.Server.Tools;
-using Content.Shared.Body.Part;
+using Content.Shared._White.Body.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
@@ -135,10 +136,17 @@ public abstract partial class InteractionTest
 - type: entity
   id: InteractionTestMob
   components:
-  - type: Body
-    prototype: Aghost
   - type: DoAfter
   - type: Hands
+    # WD EDIT START
+    hands:
+      right_hand:
+        name: right_hand
+        location: Right
+      left_hand:
+        name: left_hand
+        location: Left
+    # WD EDIT END
   - type: ComplexInteraction
   - type: MindContainer
   - type: Stripping
@@ -236,11 +244,11 @@ await Server.WaitPost(() =>
             // I lost an hour of my life trying to track down how the hell interaction tests were breaking
             // so greatz to this. Just make your own body prototype!
             var bodySystem = SEntMan.System<BodySystem>();
-            var hands = bodySystem.GetBodyChildrenOfType(SEntMan.GetEntity(Player), BodyPartType.Hand).ToArray();
+            var hands = bodySystem.GetBodyParts(SEntMan.GetEntity(Player), BodyPartType.Hand).ToArray(); // WD EDIT
 
             for (var i = 1; i < hands.Length; i++)
             {
-                SEntMan.DeleteEntity(hands[i].Id);
+                SEntMan.DeleteEntity(hands[i]);
             }
         });
 
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index d4d551f4e0a..d5942652c56 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -34,7 +34,6 @@ public sealed partial class MindTests
     damageContainer: Biological
   - type: Body
     prototype: Human
-    requiredLegs: 2
   - type: MobState
   - type: MobThresholds
     thresholds:
diff --git a/Content.IntegrationTests/Tests/_Shitmed/Body/SpeciesBUiTest.cs b/Content.IntegrationTests/Tests/_Shitmed/Body/SpeciesBUiTest.cs
deleted file mode 100644
index 3315ce43960..00000000000
--- a/Content.IntegrationTests/Tests/_Shitmed/Body/SpeciesBUiTest.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Content.Shared.Humanoid.Prototypes;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-
-namespace Content.IntegrationTests.Tests._Shitmed.Body;
-
-[TestFixture]
-public sealed class SpeciesBUiTest
-{
-    [TestPrototypes]
-    private const string Prototypes = @"
-- type: entity
-  name: BaseMobSpeciesTest
-  id: BaseMobSpeciesTest
-  parent: BaseMobSpecies
-";
-
-    private Dictionary<Enum, InterfaceData> GetInterfaces(UserInterfaceComponent comp) =>
-        (Dictionary<Enum, InterfaceData>)
-            typeof(UserInterfaceComponent).GetField("Interfaces", BindingFlags.NonPublic | BindingFlags.Instance)!
-            .GetValue(comp);
-
-    [Test]
-    public async Task AllSpeciesHaveBaseBUiTest()
-    {
-        await using var pair = await PoolManager.GetServerClient(new PoolSettings
-        {
-            Dirty = true,
-            Connected = false
-        });
-
-        var server = pair.Server;
-        var proto = server.ResolveDependency<IPrototypeManager>();
-        var factoryComp = server.ResolveDependency<IComponentFactory>();
-
-        await server.WaitAssertion(() =>
-        {
-            var bUiSys = server.System<SharedUserInterfaceSystem>();
-
-            Assert.That(proto.TryIndex("BaseMobSpeciesTest", out var baseEnt), Is.True);
-            Assert.That(baseEnt, Is.Not.Null);
-            Assert.That(baseEnt.TryGetComponent<UserInterfaceComponent>(out var bUiBase, factoryComp), Is.True);
-            Assert.That(bUiBase, Is.Not.Null);
-            var baseKeys = GetInterfaces(bUiBase).Keys.ToArray();
-
-            foreach (var species in proto.EnumeratePrototypes<SpeciesPrototype>())
-            {
-                var ent = proto.Index(species.Prototype);
-                Assert.That(ent.TryGetComponent<UserInterfaceComponent>(out var bUi, factoryComp), Is.True);
-                Assert.That(bUi, Is.Not.Null);
-                var states = GetInterfaces(bUiBase);
-                foreach (var key in baseKeys)
-                {
-                    Assert.That(states.ContainsKey(key), Is.True, $"Species {species.ID} has not UserInterface of type enum.{key.GetType().Name}");
-                }
-            }
-        });
-        await pair.CleanReturnAsync();
-    }
-}
diff --git a/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index 83835a01afb..43064c6bc39 100644
--- a/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -1,8 +1,8 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.DoAfter;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
@@ -88,7 +88,7 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen
 
             var solution = new Solution();
             solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete));
-            _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
+            _bloodstreamSystem.TryAddToBloodstream((uid, stream), solution); // WD EDIT
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/AddBodyPartCommand.cs b/Content.Server/Administration/Commands/AddBodyPartCommand.cs
deleted file mode 100644
index 892a88d41ae..00000000000
--- a/Content.Server/Administration/Commands/AddBodyPartCommand.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Administration;
-using Content.Shared.Body.Part;
-using Robust.Shared.Console;
-
-namespace Content.Server.Administration.Commands
-{
-    [AdminCommand(AdminFlags.Admin)]
-    public sealed class AddBodyPartCommand : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-
-        public string Command => "addbodypart";
-        public string Description => "Adds a given entity to a containing body.";
-        public string Help => "Usage: addbodypart <entity uid> <body uid> <part slot> <part type>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            if (args.Length != 3)
-            {
-                shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[0], out var childNetId))
-            {
-                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[1], out var parentNetId))
-            {
-                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
-                return;
-            }
-
-            var childId = _entManager.GetEntity(childNetId);
-            var parentId = _entManager.GetEntity(parentNetId);
-            var bodySystem = _entManager.System<BodySystem>();
-
-
-
-            if (Enum.TryParse<BodyPartType>(args[3], out var partType) &&
-                bodySystem.TryCreatePartSlotAndAttach(parentId, args[2], childId, partType))
-            {
-                shell.WriteLine($@"Added {childId} to {parentId}.");
-            }
-            else
-            {
-                shell.WriteError($@"Could not add {childId} to {parentId}.");
-            }
-        }
-    }
-}
diff --git a/Content.Server/Administration/Commands/AddMechanismCommand.cs b/Content.Server/Administration/Commands/AddMechanismCommand.cs
deleted file mode 100644
index e62ddea47ba..00000000000
--- a/Content.Server/Administration/Commands/AddMechanismCommand.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Administration;
-using Robust.Shared.Console;
-
-namespace Content.Server.Administration.Commands
-{
-    [AdminCommand(AdminFlags.Admin)]
-    public sealed class AddMechanismCommand : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-
-        public string Command => "addmechanism";
-        public string Description => "Adds a given entity to a containing body.";
-        public string Help => "Usage: addmechanism <entity uid> <bodypart uid>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            if (args.Length != 2)
-            {
-                shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[0], out var organIdNet) || !_entManager.TryGetEntity(organIdNet, out var organId))
-            {
-                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[1], out var partIdNet) || !_entManager.TryGetEntity(partIdNet, out var partId))
-            {
-                shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
-                return;
-            }
-
-            var bodySystem = _entManager.System<BodySystem>();
-
-            if (bodySystem.AddOrganToFirstValidSlot(partId.Value, organId.Value))
-            {
-                shell.WriteLine($@"Added {organId} to {partId}.");
-            }
-            else
-            {
-                shell.WriteError($@"Could not add {organId} to {partId}.");
-            }
-        }
-    }
-}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 4cd1f952880..2658fe8cded 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -1,10 +1,12 @@
 using System.Threading;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Administration.Commands;
 using Content.Server.Administration.Components;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Electrocution;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.GhostKick;
@@ -18,10 +20,10 @@
 using Content.Server.Storage.EntitySystems;
 using Content.Server.Tabletop;
 using Content.Server.Tabletop.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Components;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
 using Content.Shared.Clumsy;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Cluwne;
@@ -80,6 +82,7 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly SuperBonkSystem _superBonkSystem = default!;
     [Dependency] private readonly SlipperySystem _slipperySystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     // All smite verbs have names so invokeverb works.
     private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
@@ -110,7 +113,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                         4, 1, 2, args.Target, maxTileBreak: 0), // it gibs, damage doesn't need to be high.
                     CancellationToken.None);
 
-                _bodySystem.GibBody(args.Target);
+                _gibbing.GibBody(args.Target); // WD EDIT
             },
             Impact = LogImpact.Extreme,
             Message = string.Join(": ", explodeName, Loc.GetString("admin-smite-explode-description")) // we do this so the description tells admins the Text to run it via console.
@@ -274,7 +277,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Fluids/tomato_splat.rsi"), "puddle-1"),
                 Act = () =>
                 {
-                    _bloodstreamSystem.SpillAllSolutions(args.Target, bloodstream);
+                    _bloodstreamSystem.SpillAllSolutions((args.Target, bloodstream)); // WD EDIT
                     var xform = Transform(args.Target);
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-blood-self"), args.Target,
                         args.Target, PopupType.LargeCaution);
@@ -299,14 +302,14 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Act = () =>
                 {
                     _vomitSystem.Vomit(args.Target, -1000, -1000); // You feel hollow!
-                    var organs = _bodySystem.GetBodyOrganEntityComps<TransformComponent>((args.Target, body));
+                    var organs = _bodySystem.GetOrgans((args.Target, body)); // WD EDIT
                     var baseXform = Transform(args.Target);
                     foreach (var organ in organs)
                     {
                         if (HasComp<BrainComponent>(organ.Owner) || HasComp<EyeComponent>(organ.Owner))
                             continue;
 
-                        _transformSystem.PlaceNextTo((organ.Owner, organ.Comp1), (args.Target, baseXform));
+                        _transformSystem.PlaceNextTo(organ.Owner, (args.Target, baseXform)); // WD EDIT
                     }
 
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-vomit-organs-self"), args.Target,
@@ -328,9 +331,9 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Act = () =>
                 {
                     var baseXform = Transform(args.Target);
-                    foreach (var part in _bodySystem.GetBodyChildrenOfType(args.Target, BodyPartType.Hand))
+                    foreach (var part in _bodySystem.GetBodyParts(args.Target, BodyPartType.Hand)) // WD EDIT
                     {
-                        _transformSystem.AttachToGridOrMap(part.Id);
+                        _transformSystem.AttachToGridOrMap(part.Owner); // WD EDIT
                     }
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,
                         args.Target, PopupType.LargeCaution);
@@ -351,9 +354,9 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Act = () =>
                 {
                     var baseXform = Transform(args.Target);
-                    foreach (var part in _bodySystem.GetBodyChildrenOfType(args.Target, BodyPartType.Hand, body))
+                    foreach (var part in _bodySystem.GetBodyParts((args.Target, body), BodyPartType.Hand)) // WD EDIT
                     {
-                        _transformSystem.AttachToGridOrMap(part.Id);
+                        _transformSystem.AttachToGridOrMap(part.Owner); // WD EDIT
                         break;
                     }
                     _popupSystem.PopupEntity(Loc.GetString("admin-smite-remove-hands-self"), args.Target,
@@ -374,7 +377,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"),
                 Act = () =>
                 {
-                    foreach (var entity in _bodySystem.GetBodyOrganEntityComps<StomachComponent>((args.Target, body)))
+                    foreach (var entity in _bodySystem.GetOrgans((args.Target, body), OrganType.Stomach)) // WD EDIT
                     {
                         QueueDel(entity.Owner);
                     }
@@ -395,7 +398,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"),
                 Act = () =>
                 {
-                    foreach (var entity in _bodySystem.GetBodyOrganEntityComps<LungComponent>((args.Target, body)))
+                    foreach (var entity in _bodySystem.GetOrgans((args.Target, body), OrganType.Lungs)) // WD EDIT
                     {
                         QueueDel(entity.Owner);
                     }
diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
index 5380a1aa0a1..feb12ae706b 100644
--- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
@@ -1,13 +1,13 @@
+using Content.Server._White.Gibbing;
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Systems;
 using Content.Server.Chat.Managers;
 using Content.Server.Jittering;
 using Content.Server.Mind;
 using Content.Server.Stunnable;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Mobs;
@@ -24,7 +24,6 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
     [Dependency] private readonly IAdminLogManager _adminLog = default!;
     [Dependency] private readonly AnomalySystem _anomaly = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly BodySystem _body = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly JitteringSystem _jitter = default!;
@@ -32,6 +31,7 @@ public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly StunSystem _stun = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     private readonly Color _messageColor = Color.FromSrgb(new Color(201, 22, 94));
 
@@ -132,7 +132,7 @@ private void OnAnomalySupercritical(Entity<InnerBodyAnomalyComponent> ent, ref A
         if (!TryComp<BodyComponent>(ent, out var body))
             return;
 
-        _body.GibBody(ent, true, body, splatModifier: 5f);
+        _gibbing.GibBody((ent.Owner, body, null), true, splatModifier: 5f); // WD EDIT
     }
 
     private void OnSeverityChanged(Entity<InnerBodyAnomalyComponent> ent, ref AnomalySeverityChangedEvent args)
diff --git a/Content.Server/Atmos/Components/IgniteFromGasComponent.cs b/Content.Server/Atmos/Components/IgniteFromGasComponent.cs
index 0d20d8553bd..194d2d2a995 100644
--- a/Content.Server/Atmos/Components/IgniteFromGasComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteFromGasComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared._Shitmed.Targeting;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Atmos;
 
 namespace Content.Server.Atmos.Components;
@@ -38,7 +38,7 @@ public sealed partial class IgniteFromGasComponent : Component
     ///   The body parts that are vulnerable to ignition when exposed, and their fire stack values.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public Dictionary<TargetBodyPart, float> IgnitableBodyParts = new();
+    public Dictionary<BodyPartType, float> IgnitableBodyParts = new(); // WD EDIT
 
     /// <summary>
     ///   How many moles of the gas is needed to trigger ignition.
diff --git a/Content.Server/Atmos/Components/IgniteFromGasImmunityComponent.cs b/Content.Server/Atmos/Components/IgniteFromGasImmunityComponent.cs
index 16b286c8208..2f0556c00ed 100644
--- a/Content.Server/Atmos/Components/IgniteFromGasImmunityComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteFromGasImmunityComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared._Shitmed.Targeting;
+using Content.Shared._White.Body.Components;
 
 namespace Content.Server.Atmos.Components;
 
@@ -12,5 +12,5 @@ public sealed partial class IgniteFromGasImmunityComponent : Component
     //   Which body parts are given ignition immunity.
     // </summary>
     [DataField(required: true)]
-    public HashSet<TargetBodyPart> Parts;
+    public HashSet<BodyPartType> Parts; // WD EDIT
 }
diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
index 04079aea478..6eea4ae448a 100644
--- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -261,7 +261,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, canSever: false, doPartDamage: false); // Shitmed Change
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false);
                     if (!barotrauma.TakingDamage)
                     {
                         barotrauma.TakingDamage = true;
@@ -274,7 +274,7 @@ public override void Update(float frameTime)
                 {
                     var damageScale = MathF.Min(((pressure / Atmospherics.HazardHighPressure) - 1) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
 
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, canSever: false, doPartDamage: false); // Shitmed Change
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false);
                     RaiseLocalEvent(uid, new MoodEffectEvent("MobHighPressure"));
 
                     if (!barotrauma.TakingDamage)
diff --git a/Content.Server/Atmos/EntitySystems/IgniteFromGasSystem.cs b/Content.Server/Atmos/EntitySystems/IgniteFromGasSystem.cs
index ab4e5180c2c..42d6b4b9021 100644
--- a/Content.Server/Atmos/EntitySystems/IgniteFromGasSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/IgniteFromGasSystem.cs
@@ -2,10 +2,9 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Bed.Components;
 using Content.Server.Cloning.Components;
-using Content.Shared._Shitmed.Targeting;
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
+using Content.Shared._White.Body;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Mobs;
@@ -27,49 +26,36 @@ public sealed class IgniteFromGasSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<FlammableComponent, BodyPartAddedEvent>(OnBodyPartAdded);
-        SubscribeLocalEvent<FlammableComponent, BodyPartAttachedEvent>(OnBodyPartAttached);
 
         SubscribeLocalEvent<IgniteFromGasComponent, BodyPartRemovedEvent>(OnBodyPartRemoved);
-        SubscribeLocalEvent<IgniteFromGasComponent, BodyPartDroppedEvent>(OnBodyPartDropped);
 
         SubscribeLocalEvent<IgniteFromGasImmunityComponent, GotEquippedEvent>(OnIgniteFromGasImmunityEquipped);
         SubscribeLocalEvent<IgniteFromGasImmunityComponent, GotUnequippedEvent>(OnIgniteFromGasImmunityUnequipped);
     }
 
-    private void OnBodyPartAdded(Entity<FlammableComponent> ent, ref BodyPartAddedEvent args) =>
-        HandleAddBodyPart(ent.Owner, args.Part);
-    private void OnBodyPartAttached(Entity<FlammableComponent> ent, ref BodyPartAttachedEvent args) =>
-        HandleAddBodyPart(ent.Owner, args.Part);
-
-    private void HandleAddBodyPart(EntityUid uid, Entity<BodyPartComponent> part)
+    // WD EDIT START
+    private void OnBodyPartAdded(Entity<FlammableComponent> ent, ref BodyPartAddedEvent args)
     {
-        if (!TryComp<IgniteFromGasPartComponent>(part, out var ignitePart) ||
-            _body.GetTargetBodyPart(part.Comp.PartType, part.Comp.Symmetry) is not { } targetBodyPart)
+        if (!TryComp<IgniteFromGasPartComponent>(args.Part, out var ignitePart))
             return;
 
-        if (!TryComp<IgniteFromGasComponent>(uid, out var ignite))
+        if (!TryComp<IgniteFromGasComponent>(ent, out var ignite))
         {
-            ignite = EnsureComp<IgniteFromGasComponent>(uid);
+            ignite = EnsureComp<IgniteFromGasComponent>(ent);
             ignite.Gas = ignitePart.Gas;
         }
 
-        ignite.IgnitableBodyParts[targetBodyPart] = ignitePart.FireStacks;
+        ignite.IgnitableBodyParts[args.Part.Comp.Type] = ignitePart.FireStacks;
 
-        UpdateIgniteImmunity((uid, ignite));
+        UpdateIgniteImmunity((ent, ignite));
     }
 
-    private void OnBodyPartRemoved(Entity<IgniteFromGasComponent> ent, ref BodyPartRemovedEvent args) =>
-        HandleRemoveBodyPart(ent, args.Part);
-    private void OnBodyPartDropped(Entity<IgniteFromGasComponent> ent, ref BodyPartDroppedEvent args) =>
-        HandleRemoveBodyPart(ent, args.Part);
-
-    private void HandleRemoveBodyPart(Entity<IgniteFromGasComponent> ent, Entity<BodyPartComponent> part)
+    private void OnBodyPartRemoved(Entity<IgniteFromGasComponent> ent, ref BodyPartRemovedEvent args)
     {
-        if (!HasComp<IgniteFromGasPartComponent>(part) ||
-            _body.GetTargetBodyPart(part.Comp.PartType, part.Comp.Symmetry) is not { } targetBodyPart)
+        if (!HasComp<IgniteFromGasPartComponent>(args.Part))
             return;
 
-        ent.Comp.IgnitableBodyParts.Remove(targetBodyPart);
+        ent.Comp.IgnitableBodyParts.Remove(args.Part.Comp.Type);
 
         if (ent.Comp.IgnitableBodyParts.Count == 0)
         {
@@ -79,6 +65,7 @@ private void HandleRemoveBodyPart(Entity<IgniteFromGasComponent> ent, Entity<Bod
 
         UpdateIgniteImmunity((ent, ent.Comp));
     }
+    // WD EDIT END
 
     private void OnIgniteFromGasImmunityEquipped(Entity<IgniteFromGasImmunityComponent> ent, ref GotEquippedEvent args) =>
         UpdateIgniteImmunity(args.Equipee);
@@ -90,7 +77,7 @@ public void UpdateIgniteImmunity(Entity<IgniteFromGasComponent?, InventoryCompon
         if (!Resolve(ent, ref ent.Comp1, ref ent.Comp2, false))
             return;
 
-        var exposedBodyParts = new Dictionary<TargetBodyPart, float>(ent.Comp1.IgnitableBodyParts);
+        var exposedBodyParts = new Dictionary<BodyPartType, float>(ent.Comp1.IgnitableBodyParts); // WD EDIT
 
         var containerSlotEnumerator = _inventory.GetSlotEnumerator((ent, ent.Comp2));
         while (containerSlotEnumerator.NextItem(out var item, out _))
diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs
index 2c4fa989c1b..fc7052e25f4 100644
--- a/Content.Server/Bed/BedSystem.cs
+++ b/Content.Server/Bed/BedSystem.cs
@@ -1,12 +1,11 @@
 using Content.Server.Actions;
 using Content.Server.Bed.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Construction;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Shared._White.Bed.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
 using Content.Shared.Bed;
 using Content.Shared.Bed.Sleep;
-using Content.Shared.Body.Components;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
 using Content.Shared.Emag.Components;
@@ -28,6 +27,7 @@ public sealed class BedSystem : EntitySystem
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly SharedMetabolizerSystem _metabolizer = default!; // WD EDIT
 
         public override void Initialize()
         {
@@ -40,6 +40,8 @@ public override void Initialize()
             SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnEmagged);
             SubscribeLocalEvent<StasisBedComponent, RefreshPartsEvent>(OnRefreshParts);
             SubscribeLocalEvent<StasisBedComponent, UpgradeExamineEvent>(OnUpgradeExamine);
+
+            SubscribeLocalEvent<StasisBedBuckledComponent, GetMetabolicMultiplierEvent>(OnStasisGetMetabolicMultiplier); // WD EDIT
         }
 
         private void OnStrapped(Entity<HealOnBuckleComponent> bed, ref StrappedEvent args)
@@ -97,24 +99,18 @@ private void UpdateAppearance(EntityUid uid, bool isOn)
 
         private void OnStasisStrapped(Entity<StasisBedComponent> bed, ref StrappedEvent args)
         {
-            if (!HasComp<BodyComponent>(args.Buckle) || !this.IsPowered(bed, EntityManager))
-                return;
-
-            var metabolicEvent = new ApplyMetabolicMultiplierEvent(args.Buckle, bed.Comp.Multiplier, true);
-            RaiseLocalEvent(args.Buckle, ref metabolicEvent);
-
-            EnsureComp<InStasisComponent>(args.Buckle);
+            // WD EDIT START
+            EnsureComp<StasisBedBuckledComponent>(args.Buckle);
+            _metabolizer.UpdateMetabolicRate(args.Buckle);
+            // WD EDIT END
         }
 
         private void OnStasisUnstrapped(Entity<StasisBedComponent> bed, ref UnstrappedEvent args)
         {
-            if (!HasComp<BodyComponent>(args.Buckle) || !this.IsPowered(bed, EntityManager))
-                return;
-
-            var metabolicEvent = new ApplyMetabolicMultiplierEvent(args.Buckle, bed.Comp.Multiplier, false);
-            RaiseLocalEvent(args.Buckle, ref metabolicEvent);
-
-            RemComp<InStasisComponent>(args.Buckle);
+            // WD EDIT START
+            RemComp<StasisBedBuckledComponent>(args.Buckle);
+            _metabolizer.UpdateMetabolicRate(args.Buckle);
+            // WD EDIT END
         }
 
         private void OnPowerChanged(EntityUid uid, StasisBedComponent component, ref PowerChangedEvent args)
@@ -145,8 +141,7 @@ private void UpdateMetabolisms(EntityUid uid, StasisBedComponent component, bool
 
             foreach (var buckledEntity in strap.BuckledEntities)
             {
-                var metabolicEvent = new ApplyMetabolicMultiplierEvent(buckledEntity, component.Multiplier, shouldApply);
-                RaiseLocalEvent(buckledEntity, ref metabolicEvent);
+                _metabolizer.UpdateMetabolicRate(buckledEntity); // WD EDIT
             }
         }
 
@@ -162,5 +157,21 @@ private void OnUpgradeExamine(EntityUid uid, StasisBedComponent component, Upgra
         {
             args.AddPercentageUpgrade("stasis-bed-component-upgrade-stasis", component.Multiplier / component.BaseMultiplier);
         }
+
+        // WD EDIT START
+        private void OnStasisGetMetabolicMultiplier(Entity<StasisBedBuckledComponent> ent, ref GetMetabolicMultiplierEvent args)
+        {
+            if (!TryComp<BuckleComponent>(ent, out var buckle) || buckle.BuckledTo is not { } buckledTo)
+                return;
+
+            if (!TryComp<StasisBedComponent>(buckledTo, out var stasis))
+                return;
+
+            if (!this.IsPowered(buckledTo, EntityManager))
+                return;
+
+            args.Multiplier *= stasis.Multiplier;
+        }
+        // WD EDIT END
     }
 }
diff --git a/Content.Server/Bed/Components/StasisBedComponent.cs b/Content.Server/Bed/Components/StasisBedComponent.cs
index 6e0042b2df8..55ea3c085eb 100644
--- a/Content.Server/Bed/Components/StasisBedComponent.cs
+++ b/Content.Server/Bed/Components/StasisBedComponent.cs
@@ -7,14 +7,13 @@ namespace Content.Server.Bed.Components
     public sealed partial class StasisBedComponent : Component
     {
         [DataField]
-        public float BaseMultiplier = 10f;
+        public float BaseMultiplier = 0.1f; // WD EDIT
 
         /// <summary>
-        ///     What the metabolic update rate will be multiplied by (higher = slower metabolism)
+        ///     What the metabolic update rate will be multiplied by (lesser = slower metabolism)
         /// </summary>
-        [ViewVariables(VVAccess.ReadOnly)] // Writing is is not supported. ApplyMetabolicMultiplierEvent needs to be refactored first
         [DataField]
-        public float Multiplier = 10f;
+        public float Multiplier = 0.1f; // WD EDIT
 
         [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
         public string MachinePartMetabolismModifier = "Capacitor";
diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
deleted file mode 100644
index eba8a7e5172..00000000000
--- a/Content.Server/Body/Commands/AddHandCommand.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System.Linq;
-using Content.Server.Administration;
-using Content.Server.Body.Systems;
-using Content.Shared.Administration;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Robust.Shared.Console;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Server.Body.Commands
-{
-    [AdminCommand(AdminFlags.Fun)]
-    sealed class AddHandCommand : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-        [Dependency] private readonly IPrototypeManager _protoManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-
-        [ValidatePrototypeId<EntityPrototype>]
-        public const string DefaultHandPrototype = "LeftHandHuman";
-
-        public string Command => "addhand";
-        public string Description => "Adds a hand to your entity.";
-        public string Help => $"Usage: {Command} <entityUid> <handPrototypeId> / {Command} <entityUid> / {Command} <handPrototypeId> / {Command}";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var player = shell.Player;
-
-            EntityUid entity;
-            EntityUid hand;
-
-            switch (args.Length)
-            {
-                case 0:
-                    if (player == null)
-                    {
-                        shell.WriteLine("Only a player can run this command without arguments.");
-                        return;
-                    }
-
-                    if (player.AttachedEntity == null)
-                    {
-                        shell.WriteLine("You don't have an entity to add a hand to.");
-                        return;
-                    }
-
-                    entity = player.AttachedEntity.Value;
-                    hand = _entManager.SpawnEntity(DefaultHandPrototype, _entManager.GetComponent<TransformComponent>(entity).Coordinates);
-                    break;
-                case 1:
-                    {
-                        if (NetEntity.TryParse(args[0], out var uidNet) && _entManager.TryGetEntity(uidNet, out var uid))
-                        {
-                            if (!_entManager.EntityExists(uid))
-                            {
-                                shell.WriteLine($"No entity found with uid {uid}");
-                                return;
-                            }
-
-                            entity = uid.Value;
-                            hand = _entManager.SpawnEntity(DefaultHandPrototype, _entManager.GetComponent<TransformComponent>(entity).Coordinates);
-                        }
-                        else
-                        {
-                            if (player == null)
-                            {
-                                shell.WriteLine("You must specify an entity to add a hand to when using this command from the server terminal.");
-                                return;
-                            }
-
-                            if (player.AttachedEntity == null)
-                            {
-                                shell.WriteLine("You don't have an entity to add a hand to.");
-                                return;
-                            }
-
-                            entity = player.AttachedEntity.Value;
-                            hand = _entManager.SpawnEntity(args[0], _entManager.GetComponent<TransformComponent>(entity).Coordinates);
-                        }
-
-                        break;
-                    }
-                case 2:
-                    {
-                        if (!NetEntity.TryParse(args[0], out var netEnt) || !_entManager.TryGetEntity(netEnt, out var uid))
-                        {
-                            shell.WriteLine($"{args[0]} is not a valid entity uid.");
-                            return;
-                        }
-
-                        if (!_entManager.EntityExists(uid))
-                        {
-                            shell.WriteLine($"No entity exists with uid {uid}.");
-                            return;
-                        }
-
-                        entity = uid.Value;
-
-                        if (!_protoManager.HasIndex<EntityPrototype>(args[1]))
-                        {
-                            shell.WriteLine($"No hand entity exists with id {args[1]}.");
-                            return;
-                        }
-
-                        hand = _entManager.SpawnEntity(args[1], _entManager.GetComponent<TransformComponent>(entity).Coordinates);
-
-                        break;
-                    }
-                default:
-                    shell.WriteLine(Help);
-                    return;
-            }
-
-            if (!_entManager.TryGetComponent(entity, out BodyComponent? body) || body.RootContainer.ContainedEntity == null)
-            {
-                var text = $"You have no body{(_random.Prob(0.2f) ? " and you must scream." : ".")}";
-
-                shell.WriteLine(text);
-                return;
-            }
-
-            if (!_entManager.TryGetComponent(hand, out BodyPartComponent? part))
-            {
-                shell.WriteLine($"Hand entity {hand} does not have a {nameof(BodyPartComponent)} component.");
-                return;
-            }
-
-            var bodySystem = _entManager.System<BodySystem>();
-
-            var attachAt = bodySystem.GetBodyChildrenOfType(entity, BodyPartType.Arm, body).FirstOrDefault();
-            if (attachAt == default)
-                attachAt = bodySystem.GetBodyChildren(entity, body).First();
-
-            // Shitmed Change Start
-            var slotId = $"{part.Symmetry.ToString().ToLower()} {part.GetHashCode().ToString()}";
-            part.SlotId = part.GetHashCode().ToString();
-            // Shitmed Change End
-
-            if (!bodySystem.TryCreatePartSlotAndAttach(attachAt.Id, slotId, hand, BodyPartType.Hand, attachAt.Component, part))
-            {
-                shell.WriteError($"Couldn't create a slot with id {slotId} on entity {_entManager.ToPrettyString(entity)}");
-                return;
-            }
-
-            shell.WriteLine($"Added hand to entity {_entManager.GetComponent<MetaDataComponent>(entity).EntityName}");
-        }
-    }
-}
diff --git a/Content.Server/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
deleted file mode 100644
index db8ad3c7db5..00000000000
--- a/Content.Server/Body/Commands/AttachBodyPartCommand.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using Content.Server.Administration;
-using Content.Server.Body.Systems;
-using Content.Shared.Administration;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Robust.Shared.Console;
-
-namespace Content.Server.Body.Commands
-{
-    [AdminCommand(AdminFlags.Fun)]
-    public sealed class AttachBodyPartCommand : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-
-        public string Command => "attachbodypart";
-        public string Description => "Attaches a body part to you or someone else.";
-        public string Help => $"{Command} <partEntityUid> / {Command} <entityUid> <partEntityUid>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var player = shell.Player;
-
-            EntityUid bodyId;
-            EntityUid? partUid;
-
-            switch (args.Length)
-            {
-                case 1:
-                    if (player == null)
-                    {
-                        shell.WriteLine($"You need to specify an entity to attach the part to if you aren't a player.\n{Help}");
-                        return;
-                    }
-
-                    if (player.AttachedEntity == null)
-                    {
-                        shell.WriteLine($"You need to specify an entity to attach the part to if you aren't attached to an entity.\n{Help}");
-                        return;
-                    }
-
-                    if (!NetEntity.TryParse(args[0], out var partNet) || !_entManager.TryGetEntity(partNet, out partUid))
-                    {
-                        shell.WriteLine($"{args[0]} is not a valid entity uid.");
-                        return;
-                    }
-
-                    bodyId = player.AttachedEntity.Value;
-
-                    break;
-                case 2:
-                    if (!NetEntity.TryParse(args[0], out var entityNet) || !_entManager.TryGetEntity(entityNet, out var entityUid))
-                    {
-                        shell.WriteLine($"{args[0]} is not a valid entity uid.");
-                        return;
-                    }
-
-                    if (!NetEntity.TryParse(args[1], out partNet) || !_entManager.TryGetEntity(partNet, out partUid))
-                    {
-                        shell.WriteLine($"{args[1]} is not a valid entity uid.");
-                        return;
-                    }
-
-                    if (!_entManager.EntityExists(entityUid))
-                    {
-                        shell.WriteLine($"{entityUid} is not a valid entity.");
-                        return;
-                    }
-
-                    bodyId = entityUid.Value;
-                    break;
-                default:
-                    shell.WriteLine(Help);
-                    return;
-            }
-
-            if (!_entManager.TryGetComponent(bodyId, out BodyComponent? body))
-            {
-                shell.WriteLine($"Entity {_entManager.GetComponent<MetaDataComponent>(bodyId).EntityName} with uid {bodyId} does not have a {nameof(BodyComponent)}.");
-                return;
-            }
-
-            if (!_entManager.EntityExists(partUid))
-            {
-                shell.WriteLine($"{partUid} is not a valid entity.");
-                return;
-            }
-
-            if (!_entManager.TryGetComponent(partUid, out BodyPartComponent? part))
-            {
-                shell.WriteLine($"Entity {_entManager.GetComponent<MetaDataComponent>(partUid.Value).EntityName} with uid {args[0]} does not have a {nameof(BodyPartComponent)}.");
-                return;
-            }
-
-            var bodySystem = _entManager.System<BodySystem>();
-            if (bodySystem.BodyHasChild(bodyId, partUid.Value, body, part))
-            {
-                shell.WriteLine($"Body part {_entManager.GetComponent<MetaDataComponent>(partUid.Value).EntityName} with uid {partUid} is already attached to entity {_entManager.GetComponent<MetaDataComponent>(bodyId).EntityName} with uid {bodyId}");
-                return;
-            }
-
-            // Shitmed Change Start
-            var slotId = "";
-            if (part.Symmetry != BodyPartSymmetry.None)
-                slotId = $"{part.Symmetry.ToString().ToLower()} {part.GetHashCode().ToString()}";
-            else
-                slotId = $"{part.GetHashCode().ToString()}";
-
-            part.SlotId = part.GetHashCode().ToString();
-            // Shitmed Change End
-            // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
-            if (body.RootContainer.ContainedEntity != null)
-            {
-                bodySystem.AttachPartToRoot(bodyId, partUid.Value, body, part);
-            }
-            else
-            {
-                var (rootPartId, rootPart) = bodySystem.GetRootPartOrNull(bodyId, body)!.Value;
-                if (!bodySystem.TryCreatePartSlotAndAttach(rootPartId, slotId, partUid.Value, part.PartType, rootPart, part))
-                {
-                    shell.WriteError($"Could not create slot {slotId} on entity {_entManager.ToPrettyString(bodyId)}");
-                    return;
-                }
-            }
-
-            shell.WriteLine($"Attached part {_entManager.ToPrettyString(partUid.Value)} to {_entManager.ToPrettyString(bodyId)}");
-        }
-    }
-}
diff --git a/Content.Server/Body/Commands/DestroyMechanismCommand.cs b/Content.Server/Body/Commands/DestroyMechanismCommand.cs
deleted file mode 100644
index 3aa28f40720..00000000000
--- a/Content.Server/Body/Commands/DestroyMechanismCommand.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Content.Server.Administration;
-using Content.Server.Body.Systems;
-using Content.Shared.Administration;
-using Content.Shared.Body.Components;
-using Robust.Shared.Console;
-using Robust.Shared.Random;
-
-namespace Content.Server.Body.Commands
-{
-    [AdminCommand(AdminFlags.Fun)]
-    sealed class DestroyMechanismCommand : IConsoleCommand
-    {
-        public string Command => "destroymechanism";
-        public string Description => "Destroys a mechanism from your entity";
-        public string Help => $"Usage: {Command} <mechanism>";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var player = shell.Player;
-            if (player == null)
-            {
-                shell.WriteLine("Only a player can run this command.");
-                return;
-            }
-
-            if (args.Length == 0)
-            {
-                shell.WriteLine(Help);
-                return;
-            }
-
-            if (player.AttachedEntity is not {} attached)
-            {
-                shell.WriteLine("You have no entity.");
-                return;
-            }
-
-            var entityManager = IoCManager.Resolve<IEntityManager>();
-            var fac = IoCManager.Resolve<IComponentFactory>();
-
-            if (!entityManager.TryGetComponent(attached, out BodyComponent? body))
-            {
-                var random = IoCManager.Resolve<IRobustRandom>();
-                var text = $"You have no body{(random.Prob(0.2f) ? " and you must scream." : ".")}";
-
-                shell.WriteLine(text);
-                return;
-            }
-
-            var mechanismName = string.Join(" ", args).ToLowerInvariant();
-            var bodySystem = entityManager.System<BodySystem>();
-
-            foreach (var organ in bodySystem.GetBodyOrgans(attached, body))
-            {
-                if (fac.GetComponentName(organ.Component.GetType()).ToLowerInvariant() == mechanismName)
-                {
-                    entityManager.QueueDeleteEntity(organ.Id);
-                    shell.WriteLine($"Mechanism with name {mechanismName} has been destroyed.");
-                    return;
-                }
-            }
-
-            shell.WriteLine($"No mechanism was found with name {mechanismName}.");
-        }
-    }
-}
diff --git a/Content.Server/Body/Commands/RemoveHandCommand.cs b/Content.Server/Body/Commands/RemoveHandCommand.cs
deleted file mode 100644
index 4a2956ae7ab..00000000000
--- a/Content.Server/Body/Commands/RemoveHandCommand.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Linq;
-using Content.Server.Administration;
-using Content.Server.Body.Systems;
-using Content.Shared.Administration;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Robust.Shared.Console;
-using Robust.Shared.Random;
-
-namespace Content.Server.Body.Commands
-{
-    [AdminCommand(AdminFlags.Fun)]
-    public sealed class RemoveHandCommand : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-
-        public string Command => "removehand";
-        public string Description => "Removes a hand from your entity.";
-        public string Help => $"Usage: {Command}";
-
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
-        {
-            var player = shell.Player;
-            if (player == null)
-            {
-                shell.WriteLine("Only a player can run this command.");
-                return;
-            }
-
-            if (player.AttachedEntity == null)
-            {
-                shell.WriteLine("You have no entity.");
-                return;
-            }
-
-            if (!_entManager.TryGetComponent(player.AttachedEntity, out BodyComponent? body))
-            {
-                var text = $"You have no body{(_random.Prob(0.2f) ? " and you must scream." : ".")}";
-
-                shell.WriteLine(text);
-                return;
-            }
-
-            var bodySystem = _entManager.System<BodySystem>();
-            var hand = bodySystem.GetBodyChildrenOfType(player.AttachedEntity.Value, BodyPartType.Hand, body).FirstOrDefault();
-
-            if (hand == default)
-            {
-                shell.WriteLine("You have no hands.");
-            }
-            else
-            {
-                _entManager.System<SharedTransformSystem>().AttachToGridOrMap(hand.Id);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
deleted file mode 100644
index b4dbdc233be..00000000000
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Server.Chemistry.EntitySystems;
-using Content.Server.Traits;
-using Content.Server.Traits.Assorted;
-using Content.Shared.Alert;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Body.Components
-{
-    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem), typeof(BloodDeficiencySystem), typeof(HemophiliaSystem))]
-    public sealed partial class BloodstreamComponent : Component
-    {
-        public static string DefaultChemicalsSolutionName = "chemicals";
-        public static string DefaultBloodSolutionName = "bloodstream";
-        public static string DefaultBloodTemporarySolutionName = "bloodstreamTemporary";
-
-        /// <summary>
-        /// The next time that blood level will be updated and bloodloss damage dealt.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan NextUpdate;
-
-        /// <summary>
-        /// The interval at which this component updates.
-        /// </summary>
-        [DataField]
-        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(3);
-
-        /// <summary>
-        ///     How much is this entity currently bleeding?
-        ///     Higher numbers mean more blood lost every tick.
-        ///
-        ///     Goes down slowly over time, and items like bandages
-        ///     or clotting reagents can lower bleeding.
-        /// </summary>
-        /// <remarks>
-        ///     This generally corresponds to an amount of damage and can't go above 100.
-        /// </remarks>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float BleedAmount;
-
-        /// <summary>
-        ///     How much should bleeding be reduced every update interval?
-        /// </summary>
-        [DataField]
-        public float BleedReductionAmount = 0.33f;
-
-        /// <summary>
-        ///     How high can <see cref="BleedAmount"/> go?
-        /// </summary>
-        [DataField]
-        public float MaxBleedAmount = 10.0f;
-
-        /// <summary>
-        ///     What percentage of current blood is necessary to avoid dealing blood loss damage?
-        /// </summary>
-        [DataField]
-        public float BloodlossThreshold = 0.9f;
-
-        /// <summary>
-        ///     The base bloodloss damage to be incurred if below <see cref="BloodlossThreshold"/>
-        ///     The default values are defined per mob/species in YML.
-        /// </summary>
-        [DataField(required: true)]
-        public DamageSpecifier BloodlossDamage = new();
-
-        /// <summary>
-        ///     The base bloodloss damage to be healed if above <see cref="BloodlossThreshold"/>
-        ///     The default values are defined per mob/species in YML.
-        /// </summary>
-        [DataField(required: true)]
-        public DamageSpecifier BloodlossHealDamage = new();
-
-        // TODO shouldn't be hardcoded, should just use some organ simulation like bone marrow or smth.
-        /// <summary>
-        ///     How much reagent of blood should be restored each update interval?
-        /// </summary>
-        [DataField]
-        public FixedPoint2 BloodRefreshAmount = 1.0f;
-
-        /// <summary>
-        ///     How much hunger/thirst is used to regenerate one unit of blood. Set to zero to disable.
-        ///     The actual thirst/hunger rate will scale with <see cref="BloodRefreshAmount"/>.
-        /// </summary>
-        /// <remarks>Those will have no effect if the entity has no hunger/thirst components.</remarks>
-        [DataField]
-        public float BloodRegenerationHunger = 1f, BloodRegenerationThirst = 1f;
-
-        /// <summary>
-        ///     How much blood needs to be in the temporary solution in order to create a puddle?
-        /// </summary>
-        [DataField]
-        public FixedPoint2 BleedPuddleThreshold = 1.0f;
-
-        /// <summary>
-        ///     A modifier set prototype ID corresponding to how damage should be modified
-        ///     before taking it into account for bloodloss.
-        /// </summary>
-        /// <remarks>
-        ///     For example, piercing damage is increased while poison damage is nullified entirely.
-        /// </remarks>
-        [DataField]
-        public ProtoId<DamageModifierSetPrototype> DamageBleedModifiers = "BloodlossHuman";
-
-        /// <summary>
-        ///     The sound to be played when a weapon instantly deals blood loss damage.
-        /// </summary>
-        [DataField]
-        public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("blood");
-
-        /// <summary>
-        ///     The sound to be played when some damage actually heals bleeding rather than starting it.
-        /// </summary>
-        [DataField]
-        public SoundSpecifier BloodHealedSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
-
-        /// <summary>
-        /// The minimum amount damage reduction needed to play the healing sound/popup.
-        /// This prevents tiny amounts of heat damage from spamming the sound, e.g. spacing.
-        /// </summary>
-        [DataField]
-        public float BloodHealedSoundThreshold = -0.1f;
-
-        // TODO probably damage bleed thresholds.
-
-        /// <summary>
-        ///     Max volume of internal chemical solution storage
-        /// </summary>
-        [DataField]
-        public FixedPoint2 ChemicalMaxVolume = FixedPoint2.New(250);
-
-        /// <summary>
-        ///     Max volume of internal blood storage,
-        ///     and starting level of blood.
-        /// </summary>
-        [DataField]
-        public FixedPoint2 BloodMaxVolume = FixedPoint2.New(300);
-
-        /// <summary>
-        ///     Which reagent is considered this entities 'blood'?
-        /// </summary>
-        /// <remarks>
-        ///     Slime-people might use slime as their blood or something like that.
-        /// </remarks>
-        [DataField]
-        public ProtoId<ReagentPrototype> BloodReagent = "Blood";
-
-        /// <summary>Name/Key that <see cref="BloodSolution"/> is indexed by.</summary>
-        [DataField]
-        public string BloodSolutionName = DefaultBloodSolutionName;
-
-        /// <summary>Name/Key that <see cref="ChemicalSolution"/> is indexed by.</summary>
-        [DataField]
-        public string ChemicalSolutionName = DefaultChemicalsSolutionName;
-
-        /// <summary>Name/Key that <see cref="TemporarySolution"/> is indexed by.</summary>
-        [DataField]
-        public string BloodTemporarySolutionName = DefaultBloodTemporarySolutionName;
-
-        /// <summary>
-        ///     Internal solution for blood storage
-        /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? BloodSolution;
-
-        /// <summary>
-        ///     Internal solution for reagent storage
-        /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? ChemicalSolution;
-
-        /// <summary>
-        ///     Temporary blood solution.
-        ///     When blood is lost, it goes to this solution, and when this
-        ///     solution hits a certain cap, the blood is actually spilled as a puddle.
-        /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? TemporarySolution;
-
-        /// <summary>
-        /// Variable that stores the amount of status time added by having a low blood level.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public TimeSpan StatusTime;
-
-        [DataField]
-        public ProtoId<AlertPrototype> BleedingAlert = "Bleed";
-
-        [DataField]
-        public string? CauterizeMessage = "bloodstream-component-wounds-cauterized";
-    }
-}
diff --git a/Content.Server/Body/Components/BrainComponent.cs b/Content.Server/Body/Components/BrainComponent.cs
index 441bcd31549..004ff24eaff 100644
--- a/Content.Server/Body/Components/BrainComponent.cs
+++ b/Content.Server/Body/Components/BrainComponent.cs
@@ -5,10 +5,5 @@ namespace Content.Server.Body.Components
     [RegisterComponent, Access(typeof(BrainSystem))]
     public sealed partial class BrainComponent : Component
     {
-        /// <summary>
-        ///     Shitmed Change: Is this brain currently controlling the entity?
-        /// </summary>
-        [DataField]
-        public bool Active = true;
     }
 }
diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Server/Body/Components/LungComponent.cs
deleted file mode 100644
index a2c73ebf402..00000000000
--- a/Content.Server/Body/Components/LungComponent.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Alert;
-using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Body.Components;
-
-[RegisterComponent, Access(typeof(LungSystem))]
-public sealed partial class LungComponent : Component
-{
-    [DataField]
-    [Access(typeof(LungSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends
-    public GasMixture Air = new()
-    {
-        Volume = 6,
-        Temperature = Atmospherics.NormalBodyTemperature
-    };
-
-    /// <summary>
-    /// The name/key of the solution on this entity which these lungs act on.
-    /// </summary>
-    [DataField]
-    public string SolutionName = LungSystem.LungSolutionName;
-
-    /// <summary>
-    /// The solution on this entity that these lungs act on.
-    /// </summary>
-    [ViewVariables]
-    public Entity<SolutionComponent>? Solution = null;
-
-    /// <summary>
-    /// The type of gas this lung needs. Used only for the breathing alerts, not actual metabolism.
-    /// </summary>
-    [DataField]
-    public ProtoId<AlertPrototype> Alert = "LowOxygen";
-
-    [DataField]
-    public float MaxVolume = 100f;
-
-    [DataField]
-    public bool CanReact = false; // No Dexalin lungs... right?
-}
diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs
deleted file mode 100644
index d4fa3ae8834..00000000000
--- a/Content.Server/Body/Components/MetabolizerComponent.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Server.Traits.Assorted;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Content.Server.Limbus.Traits;
-using Content.Server._White.Traits; //wwdp blue blood trait
-
-namespace Content.Server.Body.Components
-{
-    /// <summary>
-    ///     Handles metabolizing various reagents with given effects.
-    /// </summary>
-    [RegisterComponent, Access(typeof(MetabolizerSystem))]
-    public sealed partial class MetabolizerComponent : Component
-    {
-        /// <summary>
-        ///     The next time that reagents will be metabolized.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan NextUpdate;
-
-        /// <summary>
-        ///     How often to metabolize reagents.
-        /// </summary>
-        /// <returns></returns>
-        [DataField]
-        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
-
-        /// <summary>
-        ///     From which solution will this metabolizer attempt to metabolize chemicals
-        /// </summary>
-        [DataField("solution")]
-        public string SolutionName = BloodstreamComponent.DefaultChemicalsSolutionName;
-
-        /// <summary>
-        ///     Does this component use a solution on it's parent entity (the body) or itself
-        /// </summary>
-        /// <remarks>
-        ///     Most things will use the parent entity (bloodstream).
-        /// </remarks>
-        [DataField]
-        public bool SolutionOnBody = true;
-
-        /// <summary>
-        ///     List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e.
-        /// </summary>
-        [DataField]
-        [Access(typeof(MetabolizerSystem), typeof(LiquorLifelineSystem), typeof(VampirismSystem), typeof(BlueBloodTraitSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends //wwdp blue blood trait
-        public HashSet<ProtoId<MetabolizerTypePrototype>>? MetabolizerTypes = null;
-
-        /// <summary>
-        ///     Should this metabolizer remove chemicals that have no metabolisms defined?
-        ///     As a stop-gap, basically.
-        /// </summary>
-        [DataField]
-        public bool RemoveEmpty = false;
-
-        /// <summary>
-        ///     How many reagents can this metabolizer process at once?
-        ///     Used to nerf 'stacked poisons' where having 5+ different poisons in a syringe, even at low
-        ///     quantity, would be muuuuch better than just one poison acting.
-        /// </summary>
-        [DataField("maxReagents")]
-        public int MaxReagentsProcessable = 3;
-
-        /// <summary>
-        ///     A list of metabolism groups that this metabolizer will act on, in order of precedence.
-        /// </summary>
-        [DataField("groups")]
-        public List<MetabolismGroupEntry>? MetabolismGroups = default!;
-    }
-
-    /// <summary>
-    ///     Contains data about how a metabolizer will metabolize a single group.
-    ///     This allows metabolizers to remove certain groups much faster, or not at all.
-    /// </summary>
-    [DataDefinition]
-    public sealed partial class MetabolismGroupEntry
-    {
-        [DataField(required: true)]
-        public ProtoId<MetabolismGroupPrototype> Id = default!;
-
-        [DataField("rateModifier")]
-        public FixedPoint2 MetabolismRateModifier = 1.0;
-    }
-}
diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs
deleted file mode 100644
index a81062362ae..00000000000
--- a/Content.Server/Body/Components/RespiratorComponent.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Shared.Chat.Prototypes;
-using Content.Shared.Damage;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Body.Components
-{
-    [RegisterComponent, Access(typeof(RespiratorSystem))]
-    public sealed partial class RespiratorComponent : Component
-    {
-        /// <summary>
-        ///     The next time that this body will inhale or exhale.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan NextUpdate;
-
-        /// <summary>
-        ///     The interval between updates. Each update is either inhale or exhale,
-        ///     so a full cycle takes twice as long.
-        /// </summary>
-        [DataField]
-        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(2);
-
-        /// <summary>
-        ///     Saturation level. Reduced by UpdateInterval each tick.
-        ///     Can be thought of as 'how many seconds you have until you start suffocating' in this configuration.
-        /// </summary>
-        [DataField]
-        public float Saturation = 5.0f;
-
-        /// <summary>
-        ///     At what level of saturation will you begin to suffocate?
-        /// </summary>
-        [DataField]
-        public float SuffocationThreshold;
-
-        [DataField]
-        public float MaxSaturation = 5.0f;
-
-        [DataField]
-        public float MinSaturation = -2.0f;
-
-        // TODO HYPEROXIA?
-
-        [DataField(required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier Damage = default!;
-
-        [DataField(required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier DamageRecovery = default!;
-
-        [DataField]
-        public TimeSpan GaspEmoteCooldown = TimeSpan.FromSeconds(8);
-
-        [ViewVariables]
-        public TimeSpan LastGaspEmoteTime;
-
-        /// <summary>
-        ///     The emote when gasps
-        /// </summary>
-        [DataField]
-        public ProtoId<EmotePrototype> GaspEmote = "Gasp";
-
-        /// <summary>
-        ///     How many cycles in a row has the mob been under-saturated?
-        /// </summary>
-        [ViewVariables]
-        public int SuffocationCycles = 0;
-
-        /// <summary>
-        ///     How many cycles in a row does it take for the suffocation alert to pop up?
-        /// </summary>
-        [ViewVariables]
-        public int SuffocationCycleThreshold = 3;
-
-        [ViewVariables]
-        public RespiratorStatus Status = RespiratorStatus.Inhaling;
-    }
-}
-
-public enum RespiratorStatus
-{
-    Inhaling,
-    Exhaling
-}
diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs
deleted file mode 100644
index 2e5584ebdec..00000000000
--- a/Content.Server/Body/Components/StomachComponent.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Server.Nutrition.EntitySystems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Whitelist;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Body.Components
-{
-    [RegisterComponent, Access(typeof(StomachSystem), typeof(FoodSystem))]
-    public sealed partial class StomachComponent : Component
-    {
-        /// <summary>
-        ///     The next time that the stomach will try to digest its contents.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan NextUpdate;
-
-        /// <summary>
-        ///     The interval at which this stomach digests its contents.
-        /// </summary>
-        [DataField]
-        public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
-
-        /// <summary>
-        ///     The solution inside of this stomach this transfers reagents to the body.
-        /// </summary>
-        [ViewVariables]
-        public Entity<SolutionComponent>? Solution;
-
-        /// <summary>
-        ///     What solution should this stomach push reagents into, on the body?
-        /// </summary>
-        [DataField]
-        public string BodySolutionName = BloodstreamComponent.DefaultChemicalsSolutionName;
-
-        /// <summary>
-        ///     Time between reagents being ingested and them being
-        ///     transferred to <see cref="BloodstreamComponent"/>
-        /// </summary>
-        [DataField]
-        public TimeSpan DigestionDelay = TimeSpan.FromSeconds(20);
-
-        /// <summary>
-        ///     A whitelist for what special-digestible-required foods this stomach is capable of eating.
-        /// </summary>
-        [DataField]
-        [Access(Other = AccessPermissions.ReadWriteExecute)]
-        public EntityWhitelist? SpecialDigestible = null;
-
-        /// <summary>
-        ///     Used to track how long each reagent has been in the stomach
-        /// </summary>
-        [ViewVariables]
-        public readonly List<ReagentDelta> ReagentDeltas = new();
-
-        /// <summary>
-        ///     Used to track quantity changes when ingesting & digesting reagents
-        /// </summary>
-        public sealed class ReagentDelta
-        {
-            public readonly ReagentQuantity ReagentQuantity;
-            public TimeSpan Lifetime { get; private set; }
-
-            public ReagentDelta(ReagentQuantity reagentQuantity)
-            {
-                ReagentQuantity = reagentQuantity;
-                Lifetime = TimeSpan.Zero;
-            }
-
-            public void Increment(TimeSpan delta) => Lifetime += delta;
-        }
-    }
-}
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
deleted file mode 100644
index 644db11367a..00000000000
--- a/Content.Server/Body/Systems/BloodstreamSystem.cs
+++ /dev/null
@@ -1,595 +0,0 @@
-using Content.Server._White.Other.BloodLust;
-using Content.Server.Body.Components;
-using Content.Server.Body.Events;
-using Content.Server.EntityEffects.Effects;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Forensics;
-using Content.Server.Popups;
-using Content.Shared.Alert;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.Drunk;
-using Content.Shared.FixedPoint;
-using Content.Shared.Forensics;
-using Content.Shared.Forensics.Components;
-using Content.Shared.HealthExaminable;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Popups;
-using Content.Shared.Rejuvenate;
-using Content.Shared.Speech.EntitySystems;
-using Robust.Server.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Body.Systems;
-
-public sealed class BloodstreamSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly PuddleSystem _puddleSystem = default!;
-    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly SharedDrunkSystem _drunkSystem = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly SharedStutteringSystem _stutteringSystem = default!;
-    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-    [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
-    [Dependency] private readonly HungerSystem _hunger = default!;
-    [Dependency] private readonly ThirstSystem _thirst = default!;
-    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; // WD EDIT
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<BloodstreamComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<BloodstreamComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<BloodstreamComponent, EntityUnpausedEvent>(OnUnpaused);
-        SubscribeLocalEvent<BloodstreamComponent, DamageChangedEvent>(OnDamageChanged);
-        SubscribeLocalEvent<BloodstreamComponent, HealthBeingExaminedEvent>(OnHealthBeingExamined);
-        SubscribeLocalEvent<BloodstreamComponent, BeingGibbedEvent>(OnBeingGibbed);
-        SubscribeLocalEvent<BloodstreamComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-        SubscribeLocalEvent<BloodstreamComponent, ReactionAttemptEvent>(OnReactionAttempt);
-        SubscribeLocalEvent<BloodstreamComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
-        SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
-        SubscribeLocalEvent<BloodstreamComponent, GenerateDnaEvent>(OnDnaGenerated);
-    }
-
-    private void OnMapInit(Entity<BloodstreamComponent> ent, ref MapInitEvent args)
-    {
-        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
-    }
-
-    private void OnUnpaused(Entity<BloodstreamComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextUpdate += args.PausedTime;
-    }
-
-    private void OnReactionAttempt(Entity<BloodstreamComponent> entity, ref ReactionAttemptEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        foreach (var effect in args.Reaction.Effects)
-        {
-            switch (effect)
-            {
-                case CreateEntityReactionEffect: // Prevent entities from spawning in the bloodstream
-                case AreaReactionEffect: // No spontaneous smoke or foam leaking out of blood vessels.
-                    args.Cancelled = true;
-                    return;
-            }
-        }
-
-        // The area-reaction effect canceling is part of avoiding smoke-fork-bombs (create two smoke bombs, that when
-        // ingested by mobs create more smoke). This also used to act as a rapid chemical-purge, because all the
-        // reagents would get carried away by the smoke/foam. This does still work for the stomach (I guess people vomit
-        // up the smoke or spawned entities?).
-
-        // TODO apply organ damage instead of just blocking the reaction?
-        // Having cheese-clots form in your veins can't be good for you.
-    }
-
-    private void OnReactionAttempt(Entity<BloodstreamComponent> entity, ref SolutionRelayEvent<ReactionAttemptEvent> args)
-    {
-        if (args.Name != entity.Comp.BloodSolutionName
-            && args.Name != entity.Comp.ChemicalSolutionName
-            && args.Name != entity.Comp.BloodTemporarySolutionName)
-        {
-            return;
-        }
-
-        OnReactionAttempt(entity, ref args.Event);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<BloodstreamComponent>();
-        while (query.MoveNext(out var uid, out var bloodstream))
-        {
-            if (_gameTiming.CurTime < bloodstream.NextUpdate)
-                continue;
-
-            bloodstream.NextUpdate += bloodstream.UpdateInterval;
-
-            if (!_solutionContainerSystem.ResolveSolution(uid, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
-                continue;
-
-            // Try to apply natural blood regeneration/bloodloss
-            if (!_mobStateSystem.IsDead(uid))
-                TryDoNaturalRegeneration((uid, bloodstream), bloodSolution);
-
-            // Removes blood from the bloodstream based on bleed amount (bleed rate)
-            // as well as stop their bleeding to a certain extent.
-            if (bloodstream.BleedAmount > 0)
-            {
-                // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
-                TryModifyBloodLevel(uid, (-bloodstream.BleedAmount), bloodstream);
-                // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
-                TryModifyBleedAmount(uid, -bloodstream.BleedReductionAmount, bloodstream);
-            }
-
-            // deal bloodloss damage if their blood level is below a threshold.
-            var bloodPercentage = GetBloodLevelPercentage(uid, bloodstream);
-            if (bloodPercentage < bloodstream.BloodlossThreshold && !_mobStateSystem.IsDead(uid))
-            {
-                // bloodloss damage is based on the base value, and modified by how low your blood level is.
-                var amt = bloodstream.BloodlossDamage / (0.1f + bloodPercentage);
-
-                _damageableSystem.TryChangeDamage(uid, amt,
-                    ignoreResistances: false, interruptsDoAfters: false);
-
-                // Apply dizziness as a symptom of bloodloss.
-                // The effect is applied in a way that it will never be cleared without being healthy.
-                // Multiplying by 2 is arbitrary but works for this case, it just prevents the time from running out
-                _drunkSystem.TryApplyDrunkenness(
-                    uid,
-                    (float) bloodstream.UpdateInterval.TotalSeconds * 2,
-                    applySlur: false);
-                _stutteringSystem.DoStutter(uid, bloodstream.UpdateInterval * 2, refresh: false);
-
-                // storing the drunk and stutter time so we can remove it independently from other effects additions
-                bloodstream.StatusTime += bloodstream.UpdateInterval * 2;
-            }
-            else if (!_mobStateSystem.IsDead(uid))
-            {
-                // If they're healthy, we'll try and heal some bloodloss instead.
-                _damageableSystem.TryChangeDamage(
-                    uid,
-                    bloodstream.BloodlossHealDamage * bloodPercentage,
-                    ignoreResistances: true, interruptsDoAfters: false);
-
-                // Remove the drunk effect when healthy. Should only remove the amount of drunk and stutter added by low blood level
-                _drunkSystem.TryRemoveDrunkenessTime(uid, bloodstream.StatusTime.TotalSeconds);
-                _stutteringSystem.DoRemoveStutterTime(uid, bloodstream.StatusTime.TotalSeconds);
-                // Reset the drunk and stutter time to zero
-                bloodstream.StatusTime = TimeSpan.Zero;
-            }
-        }
-    }
-
-    private void OnComponentInit(Entity<BloodstreamComponent> entity, ref ComponentInit args)
-    {
-        if (!_solutionContainerSystem.EnsureSolution(entity.Owner,
-                entity.Comp.ChemicalSolutionName,
-                out var chemicalSolution) ||
-            !_solutionContainerSystem.EnsureSolution(entity.Owner,
-                entity.Comp.BloodSolutionName,
-                out var bloodSolution) ||
-            !_solutionContainerSystem.EnsureSolution(entity.Owner,
-                entity.Comp.BloodTemporarySolutionName,
-                out var tempSolution))
-            return;
-
-        chemicalSolution.MaxVolume = entity.Comp.ChemicalMaxVolume;
-        bloodSolution.MaxVolume = entity.Comp.BloodMaxVolume;
-        tempSolution.MaxVolume = entity.Comp.BleedPuddleThreshold * 4; // give some leeway, for chemstream as well
-
-        // Ensure blood that should have DNA has it; must be run here, in case DnaComponent has not yet been initialized
-
-        if (TryComp<DnaComponent>(entity.Owner, out var donorComp) && donorComp.DNA == String.Empty)
-        {
-            donorComp.DNA = _forensicsSystem.GenerateDNA();
-
-            var ev = new GenerateDnaEvent { Owner = entity.Owner, DNA = donorComp.DNA };
-            RaiseLocalEvent(entity.Owner, ref ev);
-        }
-
-        // Fill blood solution with BLOOD
-        bloodSolution.AddReagent(new ReagentId(entity.Comp.BloodReagent, GetEntityBloodData(entity.Owner)), entity.Comp.BloodMaxVolume - bloodSolution.Volume);
-    }
-
-    private void OnDamageChanged(Entity<BloodstreamComponent> ent, ref DamageChangedEvent args)
-    {
-        if (args.DamageDelta is null || !args.DamageIncreased)
-        {
-            return;
-        }
-
-        // TODO probably cache this or something. humans get hurt a lot
-        if (!_prototypeManager.TryIndex<DamageModifierSetPrototype>(ent.Comp.DamageBleedModifiers, out var modifiers))
-            return;
-
-        var bloodloss = DamageSpecifier.ApplyModifierSet(args.DamageDelta, modifiers);
-
-        if (bloodloss.Empty)
-            return;
-
-        // Does the calculation of how much bleed rate should be added/removed, then applies it
-        var oldBleedAmount = ent.Comp.BleedAmount;
-        var total = bloodloss.GetTotal();
-        var totalFloat = total.Float();
-        TryModifyBleedAmount(ent, totalFloat, ent);
-
-        /// <summary>
-        ///     Critical hit. Causes target to lose blood, using the bleed rate modifier of the weapon, currently divided by 5
-        ///     The crit chance is currently the bleed rate modifier divided by 25.
-        ///     Higher damage weapons have a higher chance to crit!
-        /// </summary>
-        var prob = Math.Clamp(totalFloat / 25, 0, 1);
-        if (totalFloat > 0 && _robustRandom.Prob(prob))
-        {
-            TryModifyBloodLevel(ent, (-total) / 5, ent);
-            _audio.PlayPvs(ent.Comp.InstantBloodSound, ent);
-        }
-
-        // Heat damage will cauterize, causing the bleed rate to be reduced.
-        else if (ent.Comp.CauterizeMessage is not null
-            && totalFloat <= ent.Comp.BloodHealedSoundThreshold && oldBleedAmount > 0)
-        {
-            // Magically, this damage has healed some bleeding, likely
-            // because it's burn damage that cauterized their wounds.
-
-            // We'll play a special sound and popup for feedback.
-            _audio.PlayPvs(ent.Comp.BloodHealedSound, ent);
-            _popupSystem.PopupEntity(Loc.GetString(ent.Comp.CauterizeMessage), ent,
-                ent, PopupType.Medium);
-        }
-    }
-    /// <summary>
-    ///     Shows text on health examine, based on bleed rate and blood level.
-    /// </summary>
-    private void OnHealthBeingExamined(Entity<BloodstreamComponent> ent, ref HealthBeingExaminedEvent args)
-    {
-        // Shows profusely bleeding at half the max bleed rate.
-        if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount / 2)
-        {
-            args.Message.PushNewline();
-            if (!args.IsSelfAware)
-                args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", ent.Owner)));
-            else
-                args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-selfaware-profusely-bleeding"));
-        }
-        // Shows bleeding message when bleeding, but less than profusely.
-        else if (ent.Comp.BleedAmount > 0)
-        {
-            args.Message.PushNewline();
-            if (!args.IsSelfAware)
-                args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner)));
-            else
-                args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-selfaware-bleeding"));
-        }
-
-        // If the mob's blood level is below the damage threshhold, the pale message is added.
-        if (GetBloodLevelPercentage(ent, ent) < ent.Comp.BloodlossThreshold)
-        {
-            args.Message.PushNewline();
-            if (!args.IsSelfAware)
-                args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner)));
-            else
-                args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-selfaware-looks-pale"));
-        }
-    }
-
-    private void OnBeingGibbed(Entity<BloodstreamComponent> ent, ref BeingGibbedEvent args)
-    {
-        SpillAllSolutions(ent, ent);
-    }
-
-    private void OnApplyMetabolicMultiplier(
-        Entity<BloodstreamComponent> ent,
-        ref ApplyMetabolicMultiplierEvent args)
-    {
-        // TODO REFACTOR THIS
-        // This will slowly drift over time due to floating point errors.
-        // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-        if (args.Apply)
-        {
-            ent.Comp.UpdateInterval *= args.Multiplier;
-            return;
-        }
-        ent.Comp.UpdateInterval /= args.Multiplier;
-    }
-
-    private void OnRejuvenate(Entity<BloodstreamComponent> entity, ref RejuvenateEvent args)
-    {
-        TryModifyBleedAmount(entity.Owner, -entity.Comp.BleedAmount, entity.Comp);
-
-        if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))
-            TryModifyBloodLevel(entity.Owner, bloodSolution.AvailableVolume, entity.Comp);
-
-        if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.ChemicalSolutionName, ref entity.Comp.ChemicalSolution))
-            _solutionContainerSystem.RemoveAllSolution(entity.Comp.ChemicalSolution.Value);
-    }
-
-    /// <summary>
-    ///     Attempt to transfer provided solution to internal solution.
-    /// </summary>
-    public bool TryAddToChemicals(EntityUid uid, Solution solution, BloodstreamComponent? component = null)
-    {
-        return Resolve(uid, ref component, logMissing: false)
-            && _solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution)
-            && _solutionContainerSystem.TryAddSolution(component.ChemicalSolution.Value, solution);
-    }
-
-    public bool FlushChemicals(EntityUid uid, string excludedReagentID, FixedPoint2 quantity, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false)
-            || !_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution, out var chemSolution))
-            return false;
-
-        for (var i = chemSolution.Contents.Count - 1; i >= 0; i--)
-        {
-            var (reagentId, _) = chemSolution.Contents[i];
-            if (reagentId.Prototype != excludedReagentID)
-            {
-                _solutionContainerSystem.RemoveReagent(component.ChemicalSolution.Value, reagentId, quantity);
-            }
-        }
-
-        return true;
-    }
-
-    public float GetBloodLevelPercentage(EntityUid uid, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component)
-            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
-        {
-            return 0.0f;
-        }
-
-        return bloodSolution.FillFraction;
-    }
-
-    public void SetBloodLossThreshold(EntityUid uid, float threshold, BloodstreamComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        comp.BloodlossThreshold = threshold;
-    }
-
-    public void SetBloodMaxVolume(EntityUid uid, FixedPoint2 volume, BloodstreamComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        comp.BloodMaxVolume = volume;
-    }
-
-    /// <summary>
-    ///     Attempts to modify the blood level of this entity directly.
-    /// </summary>
-    public bool TryModifyBloodLevel(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null,
-        bool createPuddle = true)
-    {
-        if (!Resolve(uid, ref component, logMissing: false)
-            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution))
-        {
-            return false;
-        }
-
-        if (amount >= 0)
-            return _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, amount, null, GetEntityBloodData(uid));
-
-        // Removal is more involved,
-        // since we also wanna handle moving it to the temporary solution
-        // and then spilling it if necessary.
-        var newSol = _solutionContainerSystem.SplitSolution(component.BloodSolution.Value, -amount);
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.BloodTemporarySolutionName, ref component.TemporarySolution, out var tempSolution))
-            return true;
-
-        tempSolution.AddSolution(newSol, _prototypeManager);
-
-        if (tempSolution.Volume > component.BleedPuddleThreshold && createPuddle)
-        {
-            // Pass some of the chemstream into the spilled blood.
-            if (_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution))
-            {
-                var temp = _solutionContainerSystem.SplitSolution(component.ChemicalSolution.Value, tempSolution.Volume / 10);
-                tempSolution.AddSolution(temp, _prototypeManager);
-            }
-
-            _puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, sound: false);
-
-            tempSolution.RemoveAllSolution();
-        }
-
-        _solutionContainerSystem.UpdateChemicals(component.TemporarySolution.Value);
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Tries to make an entity bleed more or less
-    /// </summary>
-    public bool TryModifyBleedAmount(EntityUid uid, float amount, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false))
-            return false;
-
-        component.BleedAmount += amount;
-        component.BleedAmount = Math.Clamp(component.BleedAmount, 0, component.MaxBleedAmount);
-
-        // WD EDIT START
-        if (HasComp<BloodLustComponent>(uid))
-        {
-            if (component.BleedAmount == 0f)
-                RemComp<BloodLustComponent>(uid);
-
-            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-        }
-        // WD EDIT END
-
-        if (component.BleedAmount == 0)
-            _alertsSystem.ClearAlert(uid, component.BleedingAlert);
-        else
-        {
-            var severity = (short) Math.Clamp(Math.Round(component.BleedAmount, MidpointRounding.ToZero), 0, 10);
-            _alertsSystem.ShowAlert(uid, component.BleedingAlert, severity);
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     BLOOD FOR THE BLOOD GOD
-    /// </summary>
-    public void SpillAllSolutions(EntityUid uid, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        var tempSol = new Solution();
-
-        if (_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
-        {
-            tempSol.MaxVolume += bloodSolution.MaxVolume;
-            tempSol.AddSolution(bloodSolution, _prototypeManager);
-            _solutionContainerSystem.RemoveAllSolution(component.BloodSolution.Value);
-        }
-
-        if (_solutionContainerSystem.ResolveSolution(uid, component.ChemicalSolutionName, ref component.ChemicalSolution, out var chemSolution))
-        {
-            tempSol.MaxVolume += chemSolution.MaxVolume;
-            tempSol.AddSolution(chemSolution, _prototypeManager);
-            _solutionContainerSystem.RemoveAllSolution(component.ChemicalSolution.Value);
-        }
-
-        if (_solutionContainerSystem.ResolveSolution(uid, component.BloodTemporarySolutionName, ref component.TemporarySolution, out var tempSolution))
-        {
-            tempSol.MaxVolume += tempSolution.MaxVolume;
-            tempSol.AddSolution(tempSolution, _prototypeManager);
-            _solutionContainerSystem.RemoveAllSolution(component.TemporarySolution.Value);
-        }
-
-        _puddleSystem.TrySpillAt(uid, tempSol, out var puddleUid);
-    }
-
-    /// <summary>
-    ///     Change what someone's blood is made of, on the fly.
-    /// </summary>
-    public void ChangeBloodReagent(EntityUid uid, string reagent, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false)
-            || reagent == component.BloodReagent)
-        {
-            return;
-        }
-
-        if (!_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
-        {
-            component.BloodReagent = reagent;
-            return;
-        }
-
-        var currentVolume = bloodSolution.RemoveReagent(component.BloodReagent, bloodSolution.Volume, ignoreReagentData: true);
-
-        component.BloodReagent = reagent;
-
-        if (currentVolume > 0)
-            _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, currentVolume, null, GetEntityBloodData(uid));
-    }
-
-    private void OnDnaGenerated(Entity<BloodstreamComponent> entity, ref GenerateDnaEvent args)
-    {
-        if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution))
-        {
-            foreach (var reagent in bloodSolution.Contents)
-            {
-                List<ReagentData> reagentData = reagent.Reagent.EnsureReagentData();
-                reagentData.RemoveAll(x => x is DnaData);
-                reagentData.AddRange(GetEntityBloodData(entity.Owner));
-            }
-        }
-    }
-
-    /// <summary>
-    /// Get the reagent data for blood that a specific entity should have.
-    /// </summary>
-    public List<ReagentData> GetEntityBloodData(EntityUid uid)
-    {
-        var bloodData = new List<ReagentData>();
-        var dnaData = new DnaData();
-
-        if (TryComp<DnaComponent>(uid, out var donorComp))
-        {
-            dnaData.DNA = donorComp.DNA;
-        } else
-        {
-            dnaData.DNA = Loc.GetString("forensics-dna-unknown");
-        }
-
-        bloodData.Add(dnaData);
-
-        return bloodData;
-    }
-
-    /// <summary>
-    ///   Remove blood from an entity, without spilling it.
-    /// </summary>
-    private void RemoveBlood(EntityUid uid, FixedPoint2 amount, BloodstreamComponent? component = null)
-    {
-        if (!Resolve(uid, ref component, logMissing: false)
-            || !_solutionContainerSystem.ResolveSolution(uid, component.BloodSolutionName, ref component.BloodSolution, out var bloodSolution))
-            return;
-
-        bloodSolution.RemoveReagent(component.BloodReagent, amount);
-    }
-
-    /// <summary>
-    ///     Tries to apply natural blood regeneration/loss to the entity. Returns true if succesful.
-    /// </summary>
-    private bool TryDoNaturalRegeneration(Entity<BloodstreamComponent> ent, Solution bloodSolution)
-    {
-        var ev = new NaturalBloodRegenerationAttemptEvent { Amount = ent.Comp.BloodRefreshAmount };
-        RaiseLocalEvent(ent, ref ev);
-
-        if (ev.Cancelled || (ev.Amount > 0 && bloodSolution.Volume >= bloodSolution.MaxVolume))
-            return false;
-
-        var usedHunger = ev.Amount * ent.Comp.BloodRegenerationHunger;
-        var usedThirst = ev.Amount * ent.Comp.BloodRegenerationThirst;
-
-        // First, check if the entity has enough hunger/thirst
-        var hungerComp = CompOrNull<HungerComponent>(ent);
-        var thirstComp = CompOrNull<ThirstComponent>(ent);
-        if (usedHunger > 0 && hungerComp is not null && (_hunger.GetHunger(hungerComp) < usedHunger || hungerComp.CurrentThreshold <= HungerThreshold.Starving)
-            ||  usedThirst > 0 && thirstComp is not null && (thirstComp.CurrentThirst < usedThirst || thirstComp.CurrentThirstThreshold <= ThirstThreshold.Parched))
-            return false;
-
-        // Then actually expend hunger and thirst (if necessary) and regenerate blood.
-        if (usedHunger > 0 && hungerComp is not null)
-            _hunger.ModifyHunger(ent, (float) -usedHunger, hungerComp);
-
-        if (usedThirst > 0 && thirstComp is not null)
-            _thirst.ModifyThirst(ent, thirstComp, (float) -usedThirst);
-
-        return TryModifyBloodLevel(ent, ev.Amount, ent.Comp);
-    }
-}
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
deleted file mode 100644
index b5af5ac30c3..00000000000
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Ghost;
-using Content.Server.Humanoid;
-using Content.Shared._Shitmed.Body.Part;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
-using Content.Shared.Gibbing.Events;
-using Content.Shared.Humanoid;
-using Content.Shared.Mind;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Movement.Events;
-using Content.Shared.Movement.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.Timing;
-using System.Numerics;
-using System.Linq;
-
-namespace Content.Server.Body.Systems;
-
-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!; // Shitmed Change
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<BodyComponent, MoveInputEvent>(OnRelayMoveInput);
-        SubscribeLocalEvent<BodyComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-    }
-
-    private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
-    {
-        // If they haven't actually moved then ignore it.
-        if ((args.Entity.Comp.HeldMoveButtons &
-             (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
-        {
-            return;
-        }
-
-        if (_mobState.IsDead(ent) && _mindSystem.TryGetMind(ent, out var mindId, out var mind))
-        {
-            mind.TimeOfDeath ??= _gameTiming.CurTime;
-            _ghostSystem.OnGhostAttempt(mindId, canReturnGlobal: true, mind: mind);
-        }
-    }
-
-    private void OnApplyMetabolicMultiplier(
-        Entity<BodyComponent> ent,
-        ref ApplyMetabolicMultiplierEvent args)
-    {
-        foreach (var organ in GetBodyOrgans(ent, ent))
-        {
-            RaiseLocalEvent(organ.Id, ref args);
-        }
-    }
-
-    protected override void AddPart(
-        Entity<BodyComponent?> bodyEnt,
-        Entity<BodyPartComponent> partEnt,
-        string slotId)
-    {
-        // TODO: Predict this probably.
-        base.AddPart(bodyEnt, partEnt, slotId);
-
-        if (TryComp<HumanoidAppearanceComponent>(bodyEnt, out var humanoid))
-        {
-            var layer = partEnt.Comp.ToHumanoidLayers();
-            if (layer != null)
-            {
-                var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
-                _humanoidSystem.SetLayersVisibility(
-                    bodyEnt, new[] { layer.Value }, visible: true, permanent: true, humanoid); // Shitmed Change
-            }
-        }
-    }
-
-    protected override void RemovePart(
-        Entity<BodyComponent?> bodyEnt,
-        Entity<BodyPartComponent> partEnt,
-        string slotId)
-    {
-        base.RemovePart(bodyEnt, partEnt, slotId);
-
-        if (!TryComp<HumanoidAppearanceComponent>(bodyEnt, out var humanoid))
-            return;
-
-        var layer = partEnt.Comp.ToHumanoidLayers();
-
-        if (layer is null)
-            return;
-
-        var layers = HumanoidVisualLayersExtension.Sublayers(layer.Value);
-        _humanoidSystem.SetLayersVisibility(
-            bodyEnt, layers, visible: false, permanent: true, humanoid);
-        _appearance.SetData(bodyEnt, layer, true); // Shitmed Change
-    }
-
-    public override HashSet<EntityUid> GibBody(
-        EntityUid bodyId,
-        bool gibOrgans = false,
-        BodyComponent? body = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null,
-        // Shitmed Change
-        GibType gib = GibType.Gib,
-        GibContentsOption contents = GibContentsOption.Drop)
-    {
-        if (!Resolve(bodyId, ref body, logMissing: false)
-            || TerminatingOrDeleted(bodyId)
-            || EntityManager.IsQueuedForDeletion(bodyId))
-        {
-            return new HashSet<EntityUid>();
-        }
-
-        var xform = Transform(bodyId);
-        if (xform.MapUid is null)
-            return new HashSet<EntityUid>();
-
-        var gibs = base.GibBody(bodyId, gibOrgans, body, launchGibs: launchGibs,
-            splatDirection: splatDirection, splatModifier: splatModifier, splatCone: splatCone,
-            gib: gib, contents: contents); // Shitmed Change
-
-        var ev = new BeingGibbedEvent(gibs);
-        RaiseLocalEvent(bodyId, ref ev);
-
-        QueueDel(bodyId);
-
-        return gibs;
-    }
-
-    // Shitmed Change Start
-    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;
-    }
-
-    public override bool BurnPart(EntityUid partId, BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false)
-            || TerminatingOrDeleted(partId)
-            || EntityManager.IsQueuedForDeletion(partId))
-            return false;
-
-        return base.BurnPart(partId, part);
-    }
-
-    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);
-    }
-
-    // Shitmed Change End
-}
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index 0c655707050..94e2318f84a 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -1,106 +1,44 @@
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Components;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Events;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Pointing;
 
-// Shitmed Change
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.Body.Systems;
-using Content.Shared.Silicons.Borgs.Components;
-
 namespace Content.Server.Body.Systems
 {
     public sealed class BrainSystem : EntitySystem
     {
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-        [Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed Change
+
         public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>(HandleAddition);
-        // Shitmed Change Start
-            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>(HandleRemoval);
+            SubscribeLocalEvent<BrainComponent, OrganAddedEvent>((uid, _, args) => HandleMind(args.Body, uid)); // WD EDIT
+            SubscribeLocalEvent<BrainComponent, OrganRemovedEvent>((uid, _, args) => HandleMind(uid, args.Body)); // WD EDIT
             SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
         }
 
-        private void HandleRemoval(EntityUid uid, BrainComponent brain, ref OrganRemovedFromBodyEvent args)
-        {
-            if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
-                return;
-
-            brain.Active = false;
-            if (!CheckOtherBrains(args.OldBody))
-            {
-                // Prevents revival, should kill the user within a given timespan too.
-                EnsureComp<DebrainedComponent>(args.OldBody);
-                HandleMind(uid, args.OldBody);
-            }
-        }
-
-        private void HandleAddition(EntityUid uid, BrainComponent brain, ref OrganAddedToBodyEvent args)
-        {
-            if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.Body))
-                return;
-
-            if (!CheckOtherBrains(args.Body))
-            {
-                RemComp<DebrainedComponent>(args.Body);
-                HandleMind(args.Body, uid, brain);
-            }
-        }
-
-
-        private void HandleMind(EntityUid newEntity, EntityUid oldEntity, BrainComponent? brain = null)
+        private void HandleMind(EntityUid? newEntity, EntityUid? oldEntity) // WD EDIT
         {
-            if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
+            if (!newEntity.HasValue || !oldEntity.HasValue || TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity)) // WD EDIT
                 return;
 
-            EnsureComp<MindContainerComponent>(newEntity);
-            EnsureComp<MindContainerComponent>(oldEntity);
+            EnsureComp<MindContainerComponent>(newEntity.Value); // WD EDIT
+            EnsureComp<MindContainerComponent>(oldEntity.Value); // WD EDIT
 
-            var ghostOnMove = EnsureComp<GhostOnMoveComponent>(newEntity);
+            var ghostOnMove = EnsureComp<GhostOnMoveComponent>(newEntity.Value); // WD EDIT
             if (HasComp<BodyComponent>(newEntity))
                 ghostOnMove.MustBeDead = true;
 
-            if (HasComp<BorgBrainComponent>(newEntity))
-                EntityManager.RemoveComponent<GhostOnMoveComponent>(newEntity);
-
-            if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind))
+            if (!_mindSystem.TryGetMind(oldEntity.Value, out var mindId, out var mind)) // WD EDIT
                 return;
 
             _mindSystem.TransferTo(mindId, newEntity, mind: mind);
-            if (brain != null)
-                brain.Active = true;
-        }
-
-        private bool CheckOtherBrains(EntityUid entity)
-        {
-            var hasOtherBrains = false;
-            if (TryComp<BodyComponent>(entity, out var body))
-            {
-                if (TryComp<BrainComponent>(entity, out var bodyBrain))
-                    hasOtherBrains = true;
-                else
-                {
-                    foreach (var (organ, _) in _bodySystem.GetBodyOrgans(entity, body))
-                    {
-                        if (TryComp<BrainComponent>(organ, out var brain) && brain.Active)
-                        {
-                            hasOtherBrains = true;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            return hasOtherBrains;
         }
 
-        // Shitmed Change End
         private void OnPointAttempt(Entity<BrainComponent> ent, ref PointAttemptEvent args)
         {
             args.Cancel();
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index 2c886225496..8880d3b0b6c 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server._White.Body.Respirator.Systems;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
@@ -52,7 +53,7 @@ private void OnStartingGear(EntityUid uid, InternalsComponent component, ref Sta
             return; // already connected
 
         // Can the entity breathe the air it is currently exposed to?
-        if (!TryComp(uid, out RespiratorComponent? respirator) || _respirator.CanMetabolizeInhaledAir((uid, respirator)))
+        if (_respirator.CanMetabolizeInhaledAir(uid)) // WD EDIT
             return;
 
         var tank = FindBestGasTank(uid);
@@ -60,7 +61,7 @@ private void OnStartingGear(EntityUid uid, InternalsComponent component, ref Sta
             return;
 
         // Could the entity metabolise the air in the linked gas tank?
-        if (!_respirator.CanMetabolizeGas(uid, tank.Value.Comp.Air))
+        if (!_respirator.CanMetabolizeInhaledAir(uid, tank.Value.Comp.Air)) // WD EDIT
             return;
 
         ToggleInternals(uid, uid, force: false, component);
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
deleted file mode 100644
index bb04e3517ca..00000000000
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
-using Content.Server.Power.EntitySystems;
-using Content.Shared.Atmos;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Clothing;
-using Content.Shared.Inventory;
-using Content.Shared.Inventory.Events;
-using Robust.Server.Containers;
-
-namespace Content.Server.Body.Systems;
-
-public sealed class LungSystem : EntitySystem
-{
-    [Dependency] private readonly AtmosphereSystem _atmos = default!;
-    [Dependency] private readonly InternalsSystem _internals = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!; // Goobstation
-
-    public static string LungSolutionName = "Lung";
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<LungComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<BreathToolComponent, ComponentInit>(OnBreathToolInit); // Goobstation - Modsuits - Update on component toggle
-        SubscribeLocalEvent<BreathToolComponent, GotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<BreathToolComponent, GotUnequippedEvent>(OnGotUnequipped);
-        SubscribeLocalEvent<BreathToolComponent, ItemMaskToggledEvent>(OnMaskToggled);
-    }
-
-    private void OnGotUnequipped(Entity<BreathToolComponent> ent, ref GotUnequippedEvent args)
-    {
-        _atmos.DisconnectInternals(ent);
-    }
-
-    private void OnGotEquipped(Entity<BreathToolComponent> ent, ref GotEquippedEvent args)
-    {
-        if ((args.SlotFlags & ent.Comp.AllowedSlots) == 0)
-        {
-            return;
-        }
-
-        ent.Comp.IsFunctional = true;
-
-        if (TryComp(args.Equipee, out InternalsComponent? internals))
-        {
-            ent.Comp.ConnectedInternalsEntity = args.Equipee;
-            _internals.ConnectBreathTool((args.Equipee, internals), ent);
-        }
-    }
-
-    private void OnComponentInit(Entity<LungComponent> entity, ref ComponentInit args)
-    {
-        if (_solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out var solution))
-        {
-            solution.MaxVolume = entity.Comp.MaxVolume;
-            solution.CanReact = entity.Comp.CanReact;
-        }
-    }
-
-    // Goobstation - Update component state on component toggle
-    private void OnBreathToolInit(Entity<BreathToolComponent> ent, ref ComponentInit args)
-    {
-        var comp = ent.Comp;
-
-        comp.IsFunctional = true;
-
-        if (!_inventory.TryGetContainingEntity(ent.Owner, out var parent)
-            || !_inventory.TryGetContainingSlot(ent.Owner, out var slot)
-            || (slot.SlotFlags & comp.AllowedSlots) == 0
-            || !TryComp(parent, out InternalsComponent? internals))
-            return;
-
-        ent.Comp.ConnectedInternalsEntity = parent;
-        _internals.ConnectBreathTool((parent.Value, internals), ent);
-    }
-
-
-    private void OnMaskToggled(Entity<BreathToolComponent> ent, ref ItemMaskToggledEvent args)
-    {
-        if (args.IsToggled || args.IsEquip)
-        {
-            _atmos.DisconnectInternals(ent);
-        }
-        else
-        {
-            ent.Comp.IsFunctional = true;
-
-            if (TryComp(args.Wearer, out InternalsComponent? internals))
-            {
-                ent.Comp.ConnectedInternalsEntity = args.Wearer;
-                _internals.ConnectBreathTool((args.Wearer, internals), ent);
-            }
-        }
-    }
-
-    public void GasToReagent(EntityUid uid, LungComponent lung)
-    {
-        if (!_solutionContainerSystem.ResolveSolution(uid, lung.SolutionName, ref lung.Solution, out var solution))
-            return;
-
-        GasToReagent(lung.Air, solution);
-        _solutionContainerSystem.UpdateChemicals(lung.Solution.Value);
-    }
-
-    private void GasToReagent(GasMixture gas, Solution solution)
-    {
-        foreach (var gasId in Enum.GetValues<Gas>())
-        {
-            var i = (int) gasId;
-            var moles = gas[i];
-            if (moles <= 0)
-                continue;
-
-            var reagent = _atmos.GasReagents[i];
-            if (reagent is null)
-                continue;
-
-            var amount = moles * Atmospherics.BreathMolesToReagentMultiplier;
-            solution.AddReagent(reagent, amount);
-        }
-    }
-
-    public Solution GasToReagent(GasMixture gas)
-    {
-        var solution = new Solution();
-        GasToReagent(gas, solution);
-        return solution;
-    }
-}
diff --git a/Content.Server/Body/Systems/MetabolizerSystem.cs b/Content.Server/Body/Systems/MetabolizerSystem.cs
deleted file mode 100644
index cd7f6f9b941..00000000000
--- a/Content.Server/Body/Systems/MetabolizerSystem.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Organ;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using Content.Shared.FixedPoint;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Robust.Shared.Collections;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Body.Systems
-{
-    public sealed class MetabolizerSystem : EntitySystem
-    {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-
-        private EntityQuery<OrganComponent> _organQuery;
-        private EntityQuery<SolutionContainerManagerComponent> _solutionQuery;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            _organQuery = GetEntityQuery<OrganComponent>();
-            _solutionQuery = GetEntityQuery<SolutionContainerManagerComponent>();
-
-            SubscribeLocalEvent<MetabolizerComponent, ComponentInit>(OnMetabolizerInit);
-            SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<MetabolizerComponent, EntityUnpausedEvent>(OnUnpaused);
-            SubscribeLocalEvent<MetabolizerComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-        }
-
-        private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
-        {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
-        }
-
-        private void OnUnpaused(Entity<MetabolizerComponent> ent, ref EntityUnpausedEvent args)
-        {
-            ent.Comp.NextUpdate += args.PausedTime;
-        }
-
-        private void OnMetabolizerInit(Entity<MetabolizerComponent> entity, ref ComponentInit args)
-        {
-            if (!entity.Comp.SolutionOnBody)
-            {
-                _solutionContainerSystem.EnsureSolution(entity.Owner, entity.Comp.SolutionName, out _);
-            }
-            else if (_organQuery.CompOrNull(entity)?.Body is { } body)
-            {
-                _solutionContainerSystem.EnsureSolution(body, entity.Comp.SolutionName, out _);
-            }
-        }
-
-        private void OnApplyMetabolicMultiplier(
-            Entity<MetabolizerComponent> ent,
-            ref ApplyMetabolicMultiplierEvent args)
-        {
-            // TODO REFACTOR THIS
-            // This will slowly drift over time due to floating point errors.
-            // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-            if (args.Apply)
-            {
-                ent.Comp.UpdateInterval *= args.Multiplier;
-                return;
-            }
-
-            ent.Comp.UpdateInterval /= args.Multiplier;
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var query = EntityQueryEnumerator<MetabolizerComponent>();
-            while (query.MoveNext(out var uid, out var comp))
-            {
-                // Only update as frequently as it should
-                if (_gameTiming.CurTime < comp.NextUpdate)
-                    continue;
-
-                comp.NextUpdate += comp.UpdateInterval;
-                TryMetabolize((uid, comp));
-            }
-        }
-
-        private void TryMetabolize(Entity<MetabolizerComponent, OrganComponent?, SolutionContainerManagerComponent?> ent)
-        {
-            _organQuery.Resolve(ent, ref ent.Comp2, logMissing: false);
-
-            // First step is get the solution we actually care about
-            var solutionName = ent.Comp1.SolutionName;
-            Solution? solution = null;
-            Entity<SolutionComponent>? soln = default!;
-            EntityUid? solutionEntityUid = null;
-
-            if (ent.Comp1.SolutionOnBody)
-            {
-                if (ent.Comp2?.Body is { } body)
-                {
-                    if (!_solutionQuery.Resolve(body, ref ent.Comp3, logMissing: false))
-                        return;
-
-                    _solutionContainerSystem.TryGetSolution((body, ent.Comp3), solutionName, out soln, out solution);
-                    solutionEntityUid = body;
-                }
-            }
-            else
-            {
-                if (!_solutionQuery.Resolve(ent, ref ent.Comp3, logMissing: false))
-                    return;
-
-                _solutionContainerSystem.TryGetSolution((ent, ent), solutionName, out soln, out solution);
-                solutionEntityUid = ent;
-            }
-
-            if (solutionEntityUid is null
-                || soln is null
-                || solution is null
-                || solution.Contents.Count == 0)
-            {
-                return;
-            }
-
-            // randomize the reagent list so we don't have any weird quirks
-            // like alphabetical order or insertion order mattering for processing
-            var list = solution.Contents.ToArray();
-            _random.Shuffle(list);
-
-            int reagents = 0;
-            foreach (var (reagent, quantity) in list)
-            {
-                if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
-                    continue;
-
-                var mostToRemove = FixedPoint2.Zero;
-                if (proto.Metabolisms is null)
-                {
-                    if (ent.Comp1.RemoveEmpty)
-                    {
-                        solution.RemoveReagent(reagent, FixedPoint2.New(1));
-                    }
-
-                    continue;
-                }
-
-                // we're done here entirely if this is true
-                if (reagents >= ent.Comp1.MaxReagentsProcessable)
-                    return;
-
-
-                // loop over all our groups and see which ones apply
-                if (ent.Comp1.MetabolismGroups is null)
-                    continue;
-
-                foreach (var group in ent.Comp1.MetabolismGroups)
-                {
-                    if (!proto.Metabolisms.TryGetValue(group.Id, out var entry))
-                        continue;
-
-                    var rate = entry.MetabolismRate * group.MetabolismRateModifier;
-
-                    // Remove $rate, as long as there's enough reagent there to actually remove that much
-                    mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
-
-                    float scale = (float) mostToRemove / (float) rate;
-
-                    // if it's possible for them to be dead, and they are,
-                    // then we shouldn't process any effects, but should probably
-                    // still remove reagents
-                    if (TryComp<MobStateComponent>(solutionEntityUid.Value, out var state))
-                    {
-                        if (!proto.WorksOnTheDead && _mobStateSystem.IsDead(solutionEntityUid.Value, state))
-                            continue;
-                    }
-
-                    var actualEntity = ent.Comp2?.Body ?? solutionEntityUid.Value;
-                    var ev = new TryMetabolizeReagent(reagent, proto, quantity);
-                    RaiseLocalEvent(actualEntity, ref ev);
-
-                    var args = new EntityEffectReagentArgs(actualEntity, EntityManager, ent, solution, mostToRemove, proto, null, scale);
-
-                    // do all effects, if conditions apply
-                    foreach (var effect in entry.Effects)
-                    {
-                        if (!effect.ShouldApply(args, _random))
-                            continue;
-
-                        if (effect.ShouldLog)
-                        {
-                            _adminLogger.Add(
-                                LogType.ReagentEffect,
-                                effect.LogImpact,
-                                $"Metabolism effect {effect.GetType().Name:effect}"
-                                + $" of reagent {proto.LocalizedName:reagent}"
-                                + $" applied on entity {actualEntity:entity}"
-                                + $" at {Transform(actualEntity).Coordinates:coordinates}"
-                            );
-                        }
-
-                        effect.Effect(args);
-                    }
-                }
-
-                // remove a certain amount of reagent
-                if (mostToRemove > FixedPoint2.Zero)
-                {
-                    solution.RemoveReagent(reagent, mostToRemove);
-
-                    // We have processed a reagant, so count it towards the cap
-                    reagents += 1;
-                }
-            }
-
-            _solutionContainerSystem.UpdateChemicals(soln.Value);
-        }
-    }
-
-    // TODO REFACTOR THIS
-    // This will cause rates to slowly drift over time due to floating point errors.
-    // Instead, the system that raised this should trigger an update and subscribe to get-modifier events.
-    [ByRefEvent]
-    public readonly record struct ApplyMetabolicMultiplierEvent(
-        EntityUid Uid,
-        float Multiplier,
-        bool Apply)
-    {
-        /// <summary>
-        /// The entity whose metabolism is being modified.
-        /// </summary>
-        public readonly EntityUid Uid = Uid;
-
-        /// <summary>
-        /// What the metabolism's update rate will be multiplied by.
-        /// </summary>
-        public readonly float Multiplier = Multiplier;
-
-        /// <summary>
-        /// If true, apply the multiplier. If false, revert it.
-        /// </summary>
-        public readonly bool Apply = Apply;
-    }
-}
-
-[ByRefEvent]
-public record struct TryMetabolizeReagent(ReagentId Reagent, ReagentPrototype Prototype, FixedPoint2 Quantity, float Scale = 1f, float QuantityMultiplier = 1f);
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
deleted file mode 100644
index 41334fb3ff1..00000000000
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
-using Content.Server.Chat.Systems;
-using Content.Server.EntityEffects.EffectConditions;
-using Content.Server.EntityEffects.Effects;
-using Content.Shared._Goobstation.MartialArts.Components; // Goobstation - Martial Arts
-using Content.Server.Popups;
-using Content.Shared.Alert;
-using Content.Shared.Atmos;
-using Content.Shared.Body.Components;
-using Content.Shared._Shitmed.Body.Components; // Shitmed Change
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Chat;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent; // Shitmed Change
-using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Mood;
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using Content.Shared.Movement.Pulling.Components; // Goobstation
-using Content.Shared.Movement.Pulling.Systems; // Goobstation
-
-namespace Content.Server.Body.Systems;
-
-[UsedImplicitly]
-public sealed class RespiratorSystem : EntitySystem
-{
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-    [Dependency] private readonly AtmosphereSystem _atmosSys = default!;
-    [Dependency] private readonly BodySystem _bodySystem = default!;
-    [Dependency] private readonly DamageableSystem _damageableSys = default!;
-    [Dependency] private readonly LungSystem _lungSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly IPrototypeManager _protoMan = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-
-    private static readonly ProtoId<MetabolismGroupPrototype> GasId = new("Gas");
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        // We want to process lung reagents before we inhale new reagents.
-        UpdatesAfter.Add(typeof(MetabolizerSystem));
-        SubscribeLocalEvent<RespiratorComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<RespiratorComponent, EntityUnpausedEvent>(OnUnpaused);
-        SubscribeLocalEvent<RespiratorComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-    }
-
-    // Goobstation start
-    // Can breathe check for grab
-    public bool CanBreathe(EntityUid uid, RespiratorComponent respirator)
-    {
-        if(respirator.Saturation < respirator.SuffocationThreshold)
-            return false;
-        if (TryComp<PullableComponent>(uid, out var pullable)
-            && pullable.GrabStage == GrabStage.Suffocate)
-            return false;
-
-        return !HasComp<KravMagaBlockedBreathingComponent>(uid);
-    }
-    // Goobstation end
-    private void OnMapInit(Entity<RespiratorComponent> ent, ref MapInitEvent args)
-    {
-        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
-    }
-
-    private void OnUnpaused(Entity<RespiratorComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextUpdate += args.PausedTime;
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<RespiratorComponent, BodyComponent>();
-        while (query.MoveNext(out var uid, out var respirator, out var body))
-        {
-            if (_gameTiming.CurTime < respirator.NextUpdate)
-                continue;
-
-            respirator.NextUpdate += respirator.UpdateInterval;
-
-            if (_mobState.IsDead(uid) || HasComp<BreathingImmunityComponent>(uid)) // Shitmed: BreathingImmunity
-                continue;
-
-            if (HasComp<RespiratorImmuneComponent>(uid))
-                continue;
-
-            UpdateSaturation(uid, -(float) respirator.UpdateInterval.TotalSeconds, respirator);
-
-            if (!_mobState.IsIncapacitated(uid) && !HasComp<DebrainedComponent>(uid)) // Shitmed: cannot breathe in crit or when no brain.
-            {
-                switch (respirator.Status)
-                {
-                    case RespiratorStatus.Inhaling:
-                        Inhale(uid, body);
-                        respirator.Status = RespiratorStatus.Exhaling;
-                        break;
-                    case RespiratorStatus.Exhaling:
-                        Exhale(uid, body);
-                        respirator.Status = RespiratorStatus.Inhaling;
-                        break;
-                }
-            }
-
-            if (!CanBreathe(uid, respirator)) // Goobstation edit
-            {
-                if (_gameTiming.CurTime >= respirator.LastGaspEmoteTime + respirator.GaspEmoteCooldown)
-                {
-                    respirator.LastGaspEmoteTime = _gameTiming.CurTime;
-                    _chat.TryEmoteWithChat(uid, respirator.GaspEmote, ChatTransmitRange.HideChat, ignoreActionBlocker: true);
-                }
-
-                TakeSuffocationDamage((uid, respirator));
-                respirator.SuffocationCycles += 1;
-                continue;
-            }
-
-            StopSuffocation((uid, respirator));
-            respirator.SuffocationCycles = 0;
-        }
-    }
-
-    public void Inhale(EntityUid uid, BodyComponent? body = null)
-    {
-        if (!Resolve(uid, ref body, logMissing: false))
-            return;
-
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
-
-        // Inhale gas
-        var ev = new InhaleLocationEvent();
-        RaiseLocalEvent(uid, ref ev);
-
-        ev.Gas ??= _atmosSys.GetContainingMixture(uid, excite: true);
-
-        if (ev.Gas is null)
-        {
-            return;
-        }
-
-        var actualGas = ev.Gas.RemoveVolume(Atmospherics.BreathVolume);
-
-        var lungRatio = 1.0f / organs.Count;
-        var gas = organs.Count == 1 ? actualGas : actualGas.RemoveRatio(lungRatio);
-        foreach (var (organUid, lung, _) in organs)
-        {
-            // Merge doesn't remove gas from the giver.
-            _atmosSys.Merge(lung.Air, gas);
-            _lungSystem.GasToReagent(organUid, lung);
-        }
-    }
-
-    public void Exhale(EntityUid uid, BodyComponent? body = null)
-    {
-        if (!Resolve(uid, ref body, logMissing: false))
-            return;
-
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((uid, body));
-
-        // exhale gas
-
-        var ev = new ExhaleLocationEvent();
-        RaiseLocalEvent(uid, ref ev, broadcast: false);
-
-        if (ev.Gas is null)
-        {
-            ev.Gas = _atmosSys.GetContainingMixture(uid, excite: true);
-
-            // Walls and grids without atmos comp return null. I guess it makes sense to not be able to exhale in walls,
-            // but this also means you cannot exhale on some grids.
-            ev.Gas ??= GasMixture.SpaceGas;
-        }
-
-        var outGas = new GasMixture(ev.Gas.Volume);
-        foreach (var (organUid, lung, _) in organs)
-        {
-            _atmosSys.Merge(outGas, lung.Air);
-            lung.Air.Clear();
-
-            if (_solutionContainerSystem.ResolveSolution(organUid, lung.SolutionName, ref lung.Solution))
-                _solutionContainerSystem.RemoveAllSolution(lung.Solution.Value);
-        }
-
-        _atmosSys.Merge(ev.Gas, outGas);
-    }
-
-    /// <summary>
-    /// Check whether or not an entity can metabolize inhaled air without suffocating or taking damage (i.e., no toxic
-    /// gasses).
-    /// </summary>
-    public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return false;
-
-        var ev = new InhaleLocationEvent();
-        RaiseLocalEvent(ent, ref ev);
-
-        var gas = ev.Gas ?? _atmosSys.GetContainingMixture(ent.Owner);
-        if (gas == null)
-            return false;
-
-        return CanMetabolizeGas(ent, gas);
-    }
-
-    /// <summary>
-    /// Check whether or not an entity can metabolize the given gas mixture without suffocating or taking damage
-    /// (i.e., no toxic gasses).
-    /// </summary>
-    public bool CanMetabolizeGas(Entity<RespiratorComponent?> ent, GasMixture gas)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return false;
-
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-        if (organs.Count == 0)
-            return false;
-
-        gas = new GasMixture(gas);
-        var lungRatio = 1.0f / organs.Count;
-        gas.Multiply(MathF.Min(lungRatio * gas.Volume/Atmospherics.BreathVolume, lungRatio));
-        var solution = _lungSystem.GasToReagent(gas);
-
-        float saturation = 0;
-        foreach (var organ in organs)
-        {
-            saturation += GetSaturation(solution, organ.Owner, out var toxic);
-            if (toxic)
-                return false;
-        }
-
-        return saturation > ent.Comp.UpdateInterval.TotalSeconds;
-    }
-
-    /// <summary>
-    /// Get the amount of saturation that would be generated if the lung were to metabolize the given solution.
-    /// </summary>
-    /// <remarks>
-    /// This assumes the metabolism rate is unbounded, which generally should be the case for lungs, otherwise we get
-    /// back to the old pulmonary edema bug.
-    /// </remarks>
-    /// <param name="solution">The reagents to metabolize</param>
-    /// <param name="lung">The entity doing the metabolizing</param>
-    /// <param name="toxic">Whether or not any of the reagents would deal damage to the entity</param>
-    private float GetSaturation(Solution solution, Entity<MetabolizerComponent?> lung, out bool toxic)
-    {
-        toxic = false;
-        if (!Resolve(lung, ref lung.Comp))
-            return 0;
-
-        if (lung.Comp.MetabolismGroups == null)
-            return 0;
-
-        float saturation = 0;
-        foreach (var (id, quantity) in solution.Contents)
-        {
-            var reagent = _protoMan.Index<ReagentPrototype>(id.Prototype);
-            if (reagent.Metabolisms == null)
-                continue;
-
-            if (!reagent.Metabolisms.TryGetValue(GasId, out var entry))
-                continue;
-
-            foreach (var effect in entry.Effects)
-            {
-                if (effect is HealthChange health)
-                    toxic |= CanMetabolize(health) && health.Damage.AnyPositive();
-                else if (effect is Oxygenate oxy && CanMetabolize(oxy))
-                    saturation += oxy.Factor * quantity.Float();
-            }
-        }
-
-        // TODO generalize condition checks
-        // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
-        // Applying actual reaction effects require a full ReagentEffectArgs struct.
-        bool CanMetabolize(EntityEffect effect)
-        {
-            if (effect.Conditions == null)
-                return true;
-
-            foreach (var cond in effect.Conditions)
-            {
-                if (cond is OrganType organ && !organ.Condition(lung, EntityManager))
-                    return false;
-            }
-
-            return true;
-        }
-
-        return saturation;
-    }
-
-    private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
-    {
-        if (ent.Comp.SuffocationCycles == 2)
-            _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} started suffocating");
-
-        if (ent.Comp.SuffocationCycles >= ent.Comp.SuffocationCycleThreshold)
-        {
-            // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
-            var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-            foreach (var entity in organs)
-            {
-                _alertsSystem.ShowAlert(ent, entity.Comp1.Alert);
-            }
-            RaiseLocalEvent(ent, new MoodEffectEvent("Suffocating"));
-        }
-
-        _damageableSys.TryChangeDamage(ent, HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage, interruptsDoAfters: false);
-    }
-
-    private void StopSuffocation(Entity<RespiratorComponent> ent)
-    {
-        if (ent.Comp.SuffocationCycles >= 2)
-            _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} stopped suffocating");
-
-        // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility
-        var organs = _bodySystem.GetBodyOrganEntityComps<LungComponent>((ent, null));
-        foreach (var entity in organs)
-        {
-            _alertsSystem.ClearAlert(ent, entity.Comp1.Alert);
-        }
-
-        _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery);
-    }
-
-    public void UpdateSaturation(EntityUid uid, float amount,
-        RespiratorComponent? respirator = null)
-    {
-        if (!Resolve(uid, ref respirator, false))
-            return;
-
-        respirator.Saturation += amount;
-        respirator.Saturation =
-            Math.Clamp(respirator.Saturation, respirator.MinSaturation, respirator.MaxSaturation);
-    }
-
-    private void OnApplyMetabolicMultiplier(
-        Entity<RespiratorComponent> ent,
-        ref ApplyMetabolicMultiplierEvent args)
-    {
-        // TODO REFACTOR THIS
-        // This will slowly drift over time due to floating point errors.
-        // Instead, raise an event with the base rates and allow modifiers to get applied to it.
-        if (args.Apply)
-        {
-            ent.Comp.UpdateInterval *= args.Multiplier;
-            ent.Comp.Saturation *= args.Multiplier;
-            ent.Comp.MaxSaturation *= args.Multiplier;
-            ent.Comp.MinSaturation *= args.Multiplier;
-            return;
-        }
-
-        // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-        ent.Comp.UpdateInterval /= args.Multiplier;
-        ent.Comp.Saturation /= args.Multiplier;
-        ent.Comp.MaxSaturation /= args.Multiplier;
-        ent.Comp.MinSaturation /= args.Multiplier;
-    }
-}
-
-[ByRefEvent]
-public record struct InhaleLocationEvent(GasMixture? Gas);
-
-[ByRefEvent]
-public record struct ExhaleLocationEvent(GasMixture? Gas);
diff --git a/Content.Server/Body/Systems/StomachSystem.cs b/Content.Server/Body/Systems/StomachSystem.cs
deleted file mode 100644
index 9fc7ff10e46..00000000000
--- a/Content.Server/Body/Systems/StomachSystem.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Body.Organ;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Body.Systems
-{
-    public sealed class StomachSystem : EntitySystem
-    {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-
-        public const string DefaultSolutionName = "stomach";
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<StomachComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<StomachComponent, EntityUnpausedEvent>(OnUnpaused);
-            SubscribeLocalEvent<StomachComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-        }
-
-        private void OnMapInit(Entity<StomachComponent> ent, ref MapInitEvent args)
-        {
-            ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.UpdateInterval;
-        }
-
-        private void OnUnpaused(Entity<StomachComponent> ent, ref EntityUnpausedEvent args)
-        {
-            ent.Comp.NextUpdate += args.PausedTime;
-        }
-
-        public override void Update(float frameTime)
-        {
-            var query = EntityQueryEnumerator<StomachComponent, OrganComponent, SolutionContainerManagerComponent>();
-            while (query.MoveNext(out var uid, out var stomach, out var organ, out var sol))
-            {
-                if (_gameTiming.CurTime < stomach.NextUpdate)
-                    continue;
-
-                stomach.NextUpdate += stomach.UpdateInterval;
-
-                // Get our solutions
-                if (!_solutionContainerSystem.ResolveSolution((uid, sol), DefaultSolutionName, ref stomach.Solution, out var stomachSolution))
-                    continue;
-
-                if (organ.Body is not { } body || !_solutionContainerSystem.TryGetSolution(body, stomach.BodySolutionName, out var bodySolution))
-                    continue;
-
-                var transferSolution = new Solution();
-
-                var queue = new RemQueue<StomachComponent.ReagentDelta>();
-                foreach (var delta in stomach.ReagentDeltas)
-                {
-                    delta.Increment(stomach.UpdateInterval);
-                    if (delta.Lifetime > stomach.DigestionDelay)
-                    {
-                        if (stomachSolution.TryGetReagent(delta.ReagentQuantity.Reagent, out var reagent))
-                        {
-                            if (reagent.Quantity > delta.ReagentQuantity.Quantity)
-                                reagent = new(reagent.Reagent, delta.ReagentQuantity.Quantity);
-
-                            stomachSolution.RemoveReagent(reagent);
-                            transferSolution.AddReagent(reagent);
-                        }
-
-                        queue.Add(delta);
-                    }
-                }
-
-                foreach (var item in queue)
-                {
-                    stomach.ReagentDeltas.Remove(item);
-                }
-
-                _solutionContainerSystem.UpdateChemicals(stomach.Solution.Value);
-
-                // Transfer everything to the body solution!
-                _solutionContainerSystem.TryAddSolution(bodySolution.Value, transferSolution);
-            }
-        }
-
-        private void OnApplyMetabolicMultiplier(
-            Entity<StomachComponent> ent,
-            ref ApplyMetabolicMultiplierEvent args)
-        {
-            if (args.Apply)
-            {
-                ent.Comp.UpdateInterval *= args.Multiplier;
-                return;
-            }
-
-            // This way we don't have to worry about it breaking if the stasis bed component is destroyed
-            ent.Comp.UpdateInterval /= args.Multiplier;
-        }
-
-        public bool CanTransferSolution(
-            EntityUid uid,
-            Solution solution,
-            StomachComponent? stomach = null,
-            SolutionContainerManagerComponent? solutions = null)
-        {
-            return Resolve(uid, ref stomach, ref solutions, logMissing: false)
-                && _solutionContainerSystem.ResolveSolution((uid, solutions), DefaultSolutionName, ref stomach.Solution, out var stomachSolution)
-                // TODO: For now no partial transfers. Potentially change by design
-                && stomachSolution.CanAddSolution(solution);
-        }
-
-        public bool TryTransferSolution(
-            EntityUid uid,
-            Solution solution,
-            StomachComponent? stomach = null,
-            SolutionContainerManagerComponent? solutions = null)
-        {
-            if (!Resolve(uid, ref stomach, ref solutions, logMissing: false)
-                || !_solutionContainerSystem.ResolveSolution((uid, solutions), DefaultSolutionName, ref stomach.Solution)
-                || !CanTransferSolution(uid, solution, stomach, solutions))
-            {
-                return false;
-            }
-
-            _solutionContainerSystem.TryAddSolution(stomach.Solution.Value, solution);
-            // Add each reagent to ReagentDeltas. Used to track how long each reagent has been in the stomach
-            foreach (var reagent in solution.Contents)
-            {
-                stomach.ReagentDeltas.Add(new StomachComponent.ReagentDelta(reagent));
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index edc273b3c1f..e20d8ce1ba4 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.Cargo.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Administration;
-using Content.Shared.Body.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Materials;
@@ -16,6 +15,8 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Server._White.Body.Systems;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Research.Prototypes;
 
 namespace Content.Server.Cargo.Systems;
@@ -97,7 +98,7 @@ private void CalculateMobPrice(EntityUid uid, MobPriceComponent component, ref P
         }
 
         // TODO: Better handling of missing.
-        var partList = _bodySystem.GetBodyChildren(uid, body).ToList();
+        var partList = _bodySystem.GetBodyParts((uid, body)).ToList(); // WD EDIT
         var totalPartsPresent = partList.Sum(_ => 1);
         var totalParts = partList.Count;
 
diff --git a/Content.Server/Chapel/SacrificialAltarSystem.cs b/Content.Server/Chapel/SacrificialAltarSystem.cs
index b0d82847641..fe0ce53fcfa 100644
--- a/Content.Server/Chapel/SacrificialAltarSystem.cs
+++ b/Content.Server/Chapel/SacrificialAltarSystem.cs
@@ -1,8 +1,9 @@
+using Content.Server._White.Gibbing;
 using Content.Server.Bible.Components;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
 using Content.Shared.Database;
 using Content.Shared.Chapel;
 using Content.Shared.DoAfter;
@@ -27,6 +28,7 @@ public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem
     [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     public override void Initialize()
     {
@@ -58,10 +60,10 @@ private void OnDoAfter(Entity<SacrificialAltarComponent> ent, ref SacrificeDoAft
         // TODO GOLEMS: create a soul crystal and transfer mind into it
 
         // finally gib the targets old body
-        if (TryComp<BodyComponent>(target, out var body))
-            _body.GibBody(target, gibOrgans: false, body, launchGibs: true);
-        else
+        // WD EDIT START
+        if (!_gibbing.TryGibBody(target, out _, gibOrgans: false))
             QueueDel(target);
+        // WD EDIT END
     }
 
     protected override void AttemptSacrifice(Entity<SacrificialAltarComponent> ent, EntityUid user, EntityUid target)
diff --git a/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs
index 7c0f29efa6e..91bf38b9ce0 100644
--- a/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs
@@ -1,7 +1,9 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.Abilities.Chitinid;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chat.Managers;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
@@ -249,8 +251,8 @@ private void TryInjectIntoBloodstream(Entity<FillableOneTimeInjectorComponent> i
         EntityUid user)
     {
         // Get transfer amount. May be smaller than _transferAmount if not enough room
-        if (!SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
-                ref target.Comp.ChemicalSolution, out var chemSolution) || injector.Comp.ToggleState != FillableOneTimeInjectorToggleMode.Inject)
+        if (!SolutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName, // WD EDIT
+                ref target.Comp.BloodSolution, out var bloodSolution) || injector.Comp.ToggleState != FillableOneTimeInjectorToggleMode.Inject) // WD EDIT
         {
             Popup.PopupEntity(
                 Loc.GetString("injector-component-cannot-inject-message",
@@ -262,7 +264,7 @@ private void TryInjectIntoBloodstream(Entity<FillableOneTimeInjectorComponent> i
                 out var solution) || solution.Volume == 0)
             return;
 
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, bloodSolution.AvailableVolume); // WD EDIT
         if (realTransferAmount <= 0)
         {
             Popup.PopupEntity(
@@ -272,9 +274,9 @@ private void TryInjectIntoBloodstream(Entity<FillableOneTimeInjectorComponent> i
         }
 
         // Move units from attackSolution to targetSolution
-        var removedSolution = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
+        var removedSolution = SolutionContainers.SplitSolution(target.Comp.BloodSolution.Value, realTransferAmount); // WD EDIT
 
-        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
+        _blood.TryAddToBloodstream((target, target.Comp), removedSolution); // WD EDIT
 
         _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
 
@@ -413,10 +415,10 @@ private void DrawFromBlood(Entity<FillableOneTimeInjectorComponent> injector, En
     {
         var drawAmount = (float) transferAmount;
 
-        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
-                ref target.Comp.ChemicalSolution))
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName, // WD EDIT
+                ref target.Comp.BloodSolution)) // WD EDIT
         {
-            var chemTemp = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, drawAmount * 0.15f);
+            var chemTemp = SolutionContainers.SplitSolution(target.Comp.BloodSolution.Value, drawAmount * 0.15f); // WD EDIT
             SolutionContainers.TryAddSolution(injectorSolution, chemTemp);
             drawAmount -= (float) chemTemp.Volume;
         }
diff --git a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 0f9306818e4..038056c561b 100644
--- a/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -13,13 +13,14 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Timing;
 using Content.Shared.Weapons.Melee.Events;
-using Content.Server.Body.Components;
 using System.Linq;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Server.Audio;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.DoAfter;
-using Content.Shared._Goobstation.Chemistry.Hypospray; // Goobstation
+using Content.Shared._Goobstation.Chemistry.Hypospray;
+using Content.Shared._White.Body.Bloodstream.Components;
+
 
 namespace Content.Server.Chemistry.EntitySystems;
 
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index 15699c1fcd2..4eb21fa3135 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -1,7 +1,9 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.Abilities.Chitinid;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chat.Managers;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chat;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
@@ -236,8 +238,8 @@ private bool TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
         EntityUid user)
     {
         // Get transfer amount. May be smaller than _transferAmount if not enough room
-        if (!SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
-                ref target.Comp.ChemicalSolution, out var chemSolution))
+        if (!SolutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName, // WD EDIT
+                ref target.Comp.BloodSolution, out var bloodSolution)) // WD EDIT
         {
             Popup.PopupEntity(
                 Loc.GetString("injector-component-cannot-inject-message",
@@ -245,7 +247,7 @@ private bool TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
             return false;
         }
 
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, bloodSolution.AvailableVolume); // WD EDIT
         if (realTransferAmount <= 0)
         {
             Popup.PopupEntity(
@@ -255,9 +257,9 @@ private bool TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity
         }
 
         // Move units from attackSolution to targetSolution
-        var removedSolution = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
+        var removedSolution = SolutionContainers.SplitSolution(target.Comp.BloodSolution.Value, realTransferAmount); // WD EDIT
 
-        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
+        _blood.TryAddToBloodstream((target, target.Comp), removedSolution); // WD EDIT
 
         _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
 
@@ -395,10 +397,10 @@ private void DrawFromBlood(Entity<InjectorComponent> injector, Entity<Bloodstrea
     {
         var drawAmount = (float) transferAmount;
 
-        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
-                ref target.Comp.ChemicalSolution))
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName, // WD EDIT
+                ref target.Comp.BloodSolution)) // WD EDIT
         {
-            var chemTemp = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, drawAmount * 0.15f);
+            var chemTemp = SolutionContainers.SplitSolution(target.Comp.BloodSolution.Value, drawAmount * 0.15f); // WD EDIT
             SolutionContainers.TryAddSolution(injectorSolution, chemTemp);
             drawAmount -= (float) chemTemp.Volume;
         }
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
index 86f4a3ebd64..57d2ccb2979 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
@@ -1,8 +1,8 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server._White.Chemistry.Components;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Components;
 using Content.Shared._White.Blocking;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Events;
 using Content.Shared.Inventory;
@@ -159,7 +159,7 @@ private bool TryInjectTargets(Entity<BaseSolutionInjectOnEventComponent> injecto
             // Take our portion of the adjusted solution for this target
             var individualInjection = solutionToInject.SplitSolution(volumePerBloodstream);
             // Inject our portion into the target's bloodstream
-            if (_bloodstream.TryAddToChemicals(targetBloodstream.Owner, individualInjection, targetBloodstream.Comp))
+            if (_bloodstream.TryAddToBloodstream((targetBloodstream.Owner, targetBloodstream.Comp), individualInjection)) // WD EDIT
                 anySuccess = true;
         }
 
diff --git a/Content.Server/Cloning/CloningSystem.Utility.cs b/Content.Server/Cloning/CloningSystem.Utility.cs
index c90ca3e96dc..818e8026388 100644
--- a/Content.Server/Cloning/CloningSystem.Utility.cs
+++ b/Content.Server/Cloning/CloningSystem.Utility.cs
@@ -20,8 +20,8 @@
 using Content.Shared.SSDIndicator;
 using Content.Shared.Damage.ForceSay;
 using Content.Shared.Chat;
-using Content.Server.Body.Components;
 using Content.Server.Language;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Language.Components;
 using Content.Shared.Nutrition.Components;
diff --git a/Content.Server/Damage/Components/DamageOnHitComponent.cs b/Content.Server/Damage/Components/DamageOnHitComponent.cs
index 31b3ea730a3..9ec98d2b414 100644
--- a/Content.Server/Damage/Components/DamageOnHitComponent.cs
+++ b/Content.Server/Damage/Components/DamageOnHitComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Damage;
-using Content.Shared._Shitmed.Targeting;
 
 
 // Damages the entity by a set amount when it hits someone.
@@ -16,13 +15,4 @@ public sealed partial class DamageOnHitComponent : Component
     [DataField("damage", required: true)]
     [ViewVariables(VVAccess.ReadWrite)]
     public DamageSpecifier Damage = default!;
-
-    // <summary>
-    //   The body parts to deal damage to.
-    //   When there is more than one listed element,
-    //   randomly selects between one of the elements.
-    // </summary>
-    [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public List<TargetBodyPart>? TargetParts = null;
 }
diff --git a/Content.Server/Damage/Components/DamageUserOnTriggerComponent.cs b/Content.Server/Damage/Components/DamageUserOnTriggerComponent.cs
index 8fcacd31616..2a30374709b 100644
--- a/Content.Server/Damage/Components/DamageUserOnTriggerComponent.cs
+++ b/Content.Server/Damage/Components/DamageUserOnTriggerComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Damage;
-using Content.Shared._Shitmed.Targeting; // Shitmed
 
 namespace Content.Server.Damage.Components;
 
@@ -10,10 +9,4 @@ public sealed partial class DamageUserOnTriggerComponent : Component
 
     [DataField("damage", required: true)]
     public DamageSpecifier Damage = default!;
-
-    /// <summary>
-    /// Shitmed Change: Lets mousetraps, etc. target the feet.
-    /// </summary>
-    [DataField]
-    public TargetBodyPart? TargetPart = TargetBodyPart.Feet;
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Damage/Systems/DamageOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOnHitSystem.cs
index 3626796dcda..16834c9e74d 100644
--- a/Content.Server/Damage/Systems/DamageOnHitSystem.cs
+++ b/Content.Server/Damage/Systems/DamageOnHitSystem.cs
@@ -21,10 +21,7 @@ public override void Initialize()
     private void DamageSelf(EntityUid uid, DamageOnHitComponent component, MeleeHitEvent args)
     {
         if (args.HitEntities.Any()) {
-            _damageableSystem.TryChangeDamage(uid, component.Damage, component.IgnoreResistances,
-                targetPart: component.TargetParts is not null
-                            ? component.TargetParts[_random.Next(component.TargetParts.Count)]
-                            : null);
+            _damageableSystem.TryChangeDamage(uid, component.Damage, component.IgnoreResistances);
         }
     }
 }
diff --git a/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs b/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs
index 80d8ec64361..5051751be9d 100644
--- a/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs
+++ b/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs
@@ -1,6 +1,8 @@
 using Content.Server.Damage.Components;
 using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Damage;
+using Content.Shared.StepTrigger;
+using Content.Shared.StepTrigger.Systems;
 
 namespace Content.Server.Damage.Systems;
 
@@ -33,7 +35,7 @@ private bool OnDamageTrigger(EntityUid source, EntityUid target, DamageUserOnTri
         var ev = new BeforeDamageUserOnTriggerEvent(damage, target);
         RaiseLocalEvent(source, ev);
 
-        return _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, origin: source, targetPart: component.TargetPart) is not null; // Shitmed Change
+        return _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, origin: source) is not null;
     }
 }
 
@@ -47,4 +49,4 @@ public BeforeDamageUserOnTriggerEvent(DamageSpecifier damage, EntityUid target)
         Damage = damage;
         Tripper = target;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index 754864347ac..668c8802904 100644
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Systems;
 using Content.Server.Construction;
 using Content.Server.Destructible.Thresholds;
 using Content.Server.Destructible.Thresholds.Behaviors;
@@ -20,6 +19,8 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using System.Linq;
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Construction.Completions;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Projectiles;
@@ -48,6 +49,7 @@ public sealed class DestructibleSystem : SharedDestructibleSystem
         [Dependency] public readonly IAdminLogManager AdminLogger = default!;
         [Dependency] private readonly ThrowingSystem _throwing = default!;
         [Dependency] private readonly SharedProjectileSystem _projectile = default!;
+        [Dependency] public readonly GibbingSystem GibbingSystem = default!; // WD EDIT
 
         public override void Initialize()
         {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
index 06012d7f31a..59ad95e8d44 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs
@@ -1,5 +1,4 @@
-using Content.Shared.Body.Part; // Shitmed Change
-using Content.Shared.Inventory;
+using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -25,18 +24,8 @@ public void Execute(EntityUid bodyId, DestructibleSystem system, EntityUid? caus
             }
         }
 
-        // Shitmed Change Start
-        if (system.EntityManager.TryGetComponent<BodyPartComponent>(bodyId, out var bodyPart))
-        {
-            if (bodyPart.CanSever
-                && system.BodySystem.BurnPart(bodyId, bodyPart))
-                sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
-        }
-        else
-        // Shitmed Change End
-        {
-            sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
-            system.EntityManager.QueueDeleteEntity(bodyId);
-        }
+        sharedPopupSystem.PopupCoordinates(Loc.GetString("bodyburn-text-others", ("name", bodyId)), transformSystem.GetMoverCoordinates(bodyId), PopupType.LargeCaution);
+
+        system.EntityManager.QueueDeleteEntity(bodyId);
     }
 }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
index 1fcf6df1011..b41cb1ae19b 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Gibbing.Events; // Shitmed Change
 using JetBrains.Annotations;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
@@ -8,16 +6,11 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
     [DataDefinition]
     public sealed partial class GibBehavior : IThresholdBehavior
     {
-        [DataField] public GibType GibType = GibType.Gib; // Shitmed Change
-        [DataField] public GibContentsOption GibContents = GibContentsOption.Drop; // Shitmed Change
         [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, gib: GibType, contents: GibContents); // Shitmed Change
-            }
+            system.GibbingSystem.GibBody(owner, _recursive); // WD EDIT
         }
     }
 }
diff --git a/Content.Server/Devour/DevourSystem.cs b/Content.Server/Devour/DevourSystem.cs
index d9c50f260a3..77892cdd3df 100644
--- a/Content.Server/Devour/DevourSystem.cs
+++ b/Content.Server/Devour/DevourSystem.cs
@@ -1,5 +1,5 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Devour;
 using Content.Shared.Devour.Components;
@@ -35,7 +35,7 @@ private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfter
             {
                 ContainerSystem.Insert(args.Args.Target.Value, component.Stomach);
             }
-            _bloodstreamSystem.TryAddToChemicals(uid, ichorInjection);
+            _bloodstreamSystem.TryAddToBloodstream(uid, ichorInjection); // WD EDIT
         }
 
         //TODO: Figure out a better way of removing structures via devour that still entails standing still and waiting for a DoAfter. Somehow.
@@ -47,7 +47,7 @@ private void OnDoAfter(EntityUid uid, DevourerComponent component, DevourDoAfter
 
         _audioSystem.PlayPvs(component.SoundDevour, uid);
     }
-    
+
     private void OnGibContents(EntityUid uid, DevourerComponent component, ref BeingGibbedEvent args)
     {
         if (!component.ShouldStoreDevoured)
diff --git a/Content.Server/Disposal/Unit/EntitySystems/BeingDisposedSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/BeingDisposedSystem.cs
index 6fbfb1523a1..5e091129c2b 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/BeingDisposedSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/BeingDisposedSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Respirator.Systems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Disposal.Unit.Components;
 
 namespace Content.Server.Disposal.Unit.EntitySystems;
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
index da58194f68d..119ae2e7fcf 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
@@ -2,7 +2,7 @@
 using Content.Server.Disposal.Tube;
 using Content.Server.Disposal.Tube.Components;
 using Content.Server.Disposal.Unit.Components;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Item;
 using Content.Shared.Throwing;
@@ -268,7 +268,7 @@ private void UpdateComp(EntityUid uid, DisposalHolderComponent holder, float fra
 
                 // Find next tube
                 var nextTube = _disposalTubeSystem.NextTubeFor(currentTube, holder.CurrentDirection);
-                if (!EntityManager.EntityExists(nextTube)) 
+                if (!EntityManager.EntityExists(nextTube))
                 {
                     ExitDisposals(uid, holder);
                     break;
diff --git a/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs b/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs
index 739bad7a5f0..07b6cdc81e2 100644
--- a/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs
+++ b/Content.Server/EntityEffects/EffectConditions/BloodReagentThreshold.cs
@@ -1,4 +1,5 @@
 using Content.Server.Body.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
@@ -36,9 +37,11 @@ public override bool Condition(EntityEffectBaseArgs args)
             // Try to resolve the chemical solution
             if (!args.EntityManager.System<SharedSolutionContainerSystem>().ResolveSolution(
                     args.TargetEntity,
-                    blood.ChemicalSolutionName,
-                    ref blood.ChemicalSolution,
-                    out var chemSolution))
+                    // WD EDIT START
+                    blood.BloodSolutionName,
+                    ref blood.BloodSolution,
+                    out var bloodSolution))
+                    // WD EDIT END
             {
                 // Failed to resolve solution, apply same logic as when reagent isn't found
                 return Min <= 0;
@@ -46,7 +49,7 @@ public override bool Condition(EntityEffectBaseArgs args)
 
             // Solution resolved, check reagent quantity
             var reagentID = new ReagentId(Reagent, null);
-            if (!chemSolution.TryGetReagentQuantity(reagentID, out var quant))
+            if (!bloodSolution.TryGetReagentQuantity(reagentID, out var quant)) // WD EDIT
             {
                 // Reagent not found in solution
                 return Min <= 0;
diff --git a/Content.Server/EntityEffects/EffectConditions/OrganType.cs b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
index fc52608fab2..6d64c1bfada 100644
--- a/Content.Server/EntityEffects/EffectConditions/OrganType.cs
+++ b/Content.Server/EntityEffects/EffectConditions/OrganType.cs
@@ -1,5 +1,5 @@
-using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Prototypes;
 using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -9,7 +9,7 @@ namespace Content.Server.EntityEffects.EffectConditions;
 /// <summary>
 ///     Requires that the metabolizing organ is or is not tagged with a certain MetabolizerType
 /// </summary>
-public sealed partial class OrganType : EntityEffectCondition
+public sealed partial class MetabolizerType : EntityEffectCondition // WD EDIT: OrganType -> MetabolizerType
 {
     [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MetabolizerTypePrototype>))]
     public string Type = default!;
@@ -37,10 +37,9 @@ public override bool Condition(EntityEffectBaseArgs args)
     public bool Condition(Entity<MetabolizerComponent?> metabolizer, IEntityManager entMan)
     {
         metabolizer.Comp ??= entMan.GetComponentOrNull<MetabolizerComponent>(metabolizer.Owner);
-        if (metabolizer.Comp != null
-            && metabolizer.Comp.MetabolizerTypes != null
-            && metabolizer.Comp.MetabolizerTypes.Contains(Type))
+        if (metabolizer.Comp != null && metabolizer.Comp.Types.Contains(Type)) // WD EDIT
             return ShouldHave;
+
         return !ShouldHave;
     }
 
diff --git a/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs b/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs
index e75ad7e66e2..69a723f4e91 100644
--- a/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs
+++ b/Content.Server/EntityEffects/Effects/AddReagentToBlood.cs
@@ -1,9 +1,9 @@
 using System;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Content.Server.Body.Components;
 using Content.Shared.Chemistry.Reagent;
-using Content.Server.Body.Systems;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
@@ -44,7 +44,7 @@ public override void Effect(EntityEffectBaseArgs args)
         var amt = Amount;
         var solution = new Solution();
         solution.AddReagent(Reagent, amt);
-        sys.TryAddToChemicals(args.TargetEntity, solution, blood);
+        sys.TryAddToBloodstream((args.TargetEntity, blood), solution); // WD EDIT
     }
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
diff --git a/Content.Server/EntityEffects/Effects/AdjustReagent.cs b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
index 5437e3e2f86..76e421e1956 100644
--- a/Content.Server/EntityEffects/Effects/AdjustReagent.cs
+++ b/Content.Server/EntityEffects/Effects/AdjustReagent.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
@@ -12,19 +11,12 @@ namespace Content.Server.EntityEffects.Effects
     public sealed partial class AdjustReagent : EntityEffect
     {
         /// <summary>
-        ///     The reagent ID to remove. Only one of this and <see cref="Group"/> should be active.
+        ///     The reagent ID to add or remove.
         /// </summary>
         [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
         public string? Reagent = null;
         // TODO use ReagentId
 
-        /// <summary>
-        ///     The metabolism group to remove, if the reagent satisfies any.
-        ///     Only one of this and <see cref="Reagent"/> should be active.
-        /// </summary>
-        [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<MetabolismGroupPrototype>))]
-        public string? Group = null;
-
         [DataField(required: true)]
         public FixedPoint2 Amount = default!;
 
@@ -45,21 +37,6 @@ public override void Effect(EntityEffectBaseArgs args)
                     if (amount > 0)
                         reagentArgs.Source.AddReagent(Reagent, amount);
                 }
-                else if (Group != null)
-                {
-                    var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
-                    foreach (var quant in reagentArgs.Source.Contents.ToArray())
-                    {
-                        var proto = prototypeMan.Index<ReagentPrototype>(quant.Reagent.Prototype);
-                        if (proto.Metabolisms != null && proto.Metabolisms.ContainsKey(Group))
-                        {
-                            if (amount < 0)
-                                reagentArgs.Source.RemoveReagent(quant.Reagent, FixedPoint2.Abs(amount));
-                            if (amount > 0)
-                                reagentArgs.Source.AddReagent(quant.Reagent, amount);
-                        }
-                    }
-                }
                 return;
             }
 
@@ -77,14 +54,6 @@ public override void Effect(EntityEffectBaseArgs args)
                     ("reagent", reagentProto.LocalizedName),
                     ("amount", MathF.Abs(Amount.Float())));
             }
-            else if (Group is not null && prototype.TryIndex(Group, out MetabolismGroupPrototype? groupProto))
-            {
-                return Loc.GetString("reagent-effect-guidebook-adjust-reagent-group",
-                    ("chance", Probability),
-                    ("deltasign", MathF.Sign(Amount.Float())),
-                    ("group", groupProto.LocalizedName),
-                    ("amount", MathF.Abs(Amount.Float())));
-            }
 
             throw new NotImplementedException();
         }
diff --git a/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
index b7f6f0dc885..1c931eeb46e 100644
--- a/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
+++ b/Content.Server/EntityEffects/Effects/ChemCleanBloodstream.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Shared.EntityEffects;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -19,7 +19,7 @@ public sealed partial class ChemCleanBloodstream : EntityEffect
 
     public override void Effect(EntityEffectBaseArgs args)
     {
-        
+
         var cleanseRate = CleanseRate;
 
         var bloodstreamSys = args.EntityManager.System<BloodstreamSystem>();
@@ -30,11 +30,11 @@ public override void Effect(EntityEffectBaseArgs args)
                 return;
 
             cleanseRate *= reagentArgs.Scale.Float();
-            bloodstreamSys.FlushChemicals(args.TargetEntity, reagentArgs.Reagent.ID, cleanseRate);
+            bloodstreamSys.FlushChemicals(args.TargetEntity, cleanseRate, reagentArgs.Reagent.ID); // WD EDIT
         }
         else
         {
-            bloodstreamSys.FlushChemicals(args.TargetEntity, "", cleanseRate);
+            bloodstreamSys.FlushChemicals(args.TargetEntity, cleanseRate); // WD EDIT
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/HealthChange.cs b/Content.Server/EntityEffects/Effects/HealthChange.cs
index 0d2a236bb45..fd2a658745b 100644
--- a/Content.Server/EntityEffects/Effects/HealthChange.cs
+++ b/Content.Server/EntityEffects/Effects/HealthChange.cs
@@ -3,7 +3,6 @@
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Content.Shared.Localizations;
-using Content.Shared._Shitmed.Targeting; // Shitmed Change
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using System.Linq;
@@ -125,12 +124,7 @@ public override void Effect(EntityEffectBaseArgs args)
                 args.TargetEntity,
                 Damage * scale,
                 IgnoreResistances,
-                interruptsDoAfters: false,
-                // Shitmed Change Start
-                targetPart: TargetBodyPart.All,
-                partMultiplier: 0.5f,
-                canSever: false);
-                // Shitmed Change End
+                interruptsDoAfters: false);
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
index 58bc304f5ea..41e1298887c 100644
--- a/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
+++ b/Content.Server/EntityEffects/Effects/ModifyBleedAmount.cs
@@ -1,5 +1,5 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
@@ -29,7 +29,7 @@ public override void Effect(EntityEffectBaseArgs args)
                 amt *= reagentArgs.Scale.Float();
             }
 
-            sys.TryModifyBleedAmount(args.TargetEntity, amt, blood);
+            sys.TryModifyBleedAmount((args.TargetEntity, blood), amt); // WD EDIT
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
index d8aca7d2842..46d6ed09d82 100644
--- a/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
+++ b/Content.Server/EntityEffects/Effects/ModifyBloodLevel.cs
@@ -1,5 +1,5 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
@@ -31,7 +31,7 @@ public override void Effect(EntityEffectBaseArgs args)
                 amt *= reagentArgs.Scale;
             }
 
-            sys.TryModifyBloodLevel(args.TargetEntity, amt, blood);
+            sys.TryModifyBloodLevel((args.TargetEntity, blood), amt);
         }
     }
 }
diff --git a/Content.Server/EntityEffects/Effects/ModifyLungGas.cs b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
index b752cd93b88..856e0186094 100644
--- a/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
+++ b/Content.Server/EntityEffects/Effects/ModifyLungGas.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Components;
+using Content.Server._White.Body.Organs.Lung;
 using Content.Shared.Atmos;
 using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/EntityEffects/Effects/Oxygenate.cs b/Content.Server/EntityEffects/Effects/Oxygenate.cs
index 60383188c9f..8404c002a8c 100644
--- a/Content.Server/EntityEffects/Effects/Oxygenate.cs
+++ b/Content.Server/EntityEffects/Effects/Oxygenate.cs
@@ -1,5 +1,5 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Respirator.Components;
+using Content.Server._White.Body.Respirator.Systems;
 using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
 
@@ -26,7 +26,7 @@ public override void Effect(EntityEffectBaseArgs args)
         if (args.EntityManager.TryGetComponent<RespiratorComponent>(args.TargetEntity, out var resp))
         {
             var respSys = args.EntityManager.System<RespiratorSystem>();
-            respSys.UpdateSaturation(args.TargetEntity, multiplier * Factor, resp);
+            respSys.ChangeSaturationLevel((args.TargetEntity, resp), multiplier * Factor * 0.01f); // WD EDIT
         }
     }
 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 9662c1bb36e..90b777178d9 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -464,7 +464,7 @@ private void ProcessEntity(
                 }
 
                 // TODO EXPLOSIONS turn explosions into entities, and pass the the entity in as the damage origin.
-                _damageableSystem.TryChangeDamage(entity, damage, ignoreResistances: true, partMultiplier: 0.3f); // Shitmed: Temp change, nerf explosion delimbing
+                _damageableSystem.TryChangeDamage(entity, damage, ignoreResistances: true);
 
             }
         }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index f0717003b5c..d590572c1cc 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -1,3 +1,5 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Systems;
 using Content.Server.Explosion.Components;
@@ -78,6 +80,7 @@ public sealed partial class TriggerSystem : EntitySystem
         [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
+        [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
         public override void Initialize()
         {
@@ -205,7 +208,7 @@ private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, Tr
                     Del(item);
                 }
             }
-            _body.GibBody(xform.ParentUid, true);
+            _gibbing.GibBody(xform.ParentUid, true); // WD EDIT
             args.Handled = true;
         }
 
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index b5a0ab8f68e..893d38f520d 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.EntityEffects.Effects;
 using Content.Server.Spreader;
@@ -21,7 +20,9 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Linq;
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.Nutrition.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Nutrition.Components;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
@@ -267,7 +268,7 @@ private void ReactWithEntity(EntityUid entity, EntityUid smokeUid, Solution solu
         if (!TryComp<BloodstreamComponent>(entity, out var bloodstream))
             return;
 
-        if (!_solutionContainerSystem.ResolveSolution(entity, bloodstream.ChemicalSolutionName, ref bloodstream.ChemicalSolution, out var chemSolution) || chemSolution.AvailableVolume <= 0)
+        if (!_solutionContainerSystem.ResolveSolution(entity, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var chemSolution) || chemSolution.AvailableVolume <= 0) // WD EDIT
             return;
 
         var blockIngestion = _internals.AreInternalsWorking(entity);
@@ -298,7 +299,7 @@ private void ReactWithEntity(EntityUid entity, EntityUid smokeUid, Solution solu
         if (blockIngestion)
             return;
 
-        if (_blood.TryAddToChemicals(entity, transferSolution, bloodstream))
+        if (_blood.TryAddToBloodstream((entity, bloodstream), transferSolution)) // WD EDIT
         {
             // Log solution addition by smoke
             _logger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):target} ingested smoke {SharedSolutionContainerSystem.ToPrettyString(transferSolution)}");
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 8216edbab95..444790bef5c 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.Body.Components;
 using Content.Server.DoAfter;
 using Content.Server.Fluids.EntitySystems;
@@ -36,10 +37,11 @@ public override void Initialize()
         {
             SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
             SubscribeLocalEvent<ScentComponent, DidEquipEvent>(OnEquip);
-            SubscribeLocalEvent<FiberComponent, MapInitEvent>(OnFiberInit);
-            SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit);
-            SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit);
-            SubscribeLocalEvent<ScentComponent, MapInitEvent>(OnScentInit);
+            SubscribeLocalEvent<FiberComponent, MapInitEvent>(OnFiberInit, after: new[] { typeof(BloodstreamSystem) }); // WD EDIT
+            SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit, after: new[] { typeof(BloodstreamSystem) }); // WD EDIT
+            // The solution entities are spawned on MapInit as well, so we have to wait for that to be able to set the DNA in the bloodstream correctly without ResolveSolution failing
+            SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit, after: new[] { typeof(BloodstreamSystem) }); // WD EDIT
+            SubscribeLocalEvent<ScentComponent, MapInitEvent>(OnScentInit, after: new[] { typeof(BloodstreamSystem) }); // WD EDIT
 
             SubscribeLocalEvent<ForensicsComponent, BeingGibbedEvent>(OnBeingGibbed);
             SubscribeLocalEvent<ForensicsComponent, MeleeHitEvent>(OnMeleeHit,
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 83623dae243..709df131745 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Systems;
 using Content.Server.Popups;
 using Content.Shared.Actions;
 using Content.Shared.Audio;
diff --git a/Content.Server/GuideGenerator/ReagentEntry.cs b/Content.Server/GuideGenerator/ReagentEntry.cs
index 8b597ad61bc..bdc13faa070 100644
--- a/Content.Server/GuideGenerator/ReagentEntry.cs
+++ b/Content.Server/GuideGenerator/ReagentEntry.cs
@@ -1,11 +1,8 @@
 using System.Linq;
 using System.Text.Json.Serialization;
-using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.EntityEffects;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.GuideGenerator;
 
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 6aaacb02382..ef8ecac7bec 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -1,14 +1,13 @@
 using System.Numerics;
-using Content.Server._White.Throwing;
+using Content.Server._White.Body.Systems;
 using Content.Server.Inventory;
 using Content.Server.Stack;
 using Content.Server.Stunnable;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems; // Shitmed Change
-using Content.Shared._Shitmed.Body.Events; // Shitmed Change
+using Content.Shared._White.Hands;
 using Content.Shared.CombatMode;
-using Content.Shared.Damage.Systems;
 using Content.Shared.Explosion;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
@@ -27,8 +26,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Robust.Shared.Serialization;
-using Content.Shared._White.Hands;
 
 namespace Content.Server.Hands.Systems
 {
@@ -42,7 +39,8 @@ 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!; // Shitmed Change
+        [Dependency] private readonly BodySystem _body = default!; // WD EDIT
+
         public override void Initialize()
         {
             base.Initialize();
@@ -58,8 +56,6 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, ComponentGetState>(GetComponentState);
 
             SubscribeLocalEvent<HandsComponent, BeforeExplodeEvent>(OnExploded);
-            SubscribeLocalEvent<HandsComponent, BodyPartEnabledEvent>(HandleBodyPartEnabled); // Shitmed Change
-            SubscribeLocalEvent<HandsComponent, BodyPartDisabledEvent>(HandleBodyPartDisabled); // Shitmed Change
 
             CommandBinds.Builder
                 .Bind(ContentKeyFunctions.ThrowItemInHand, new PointerInputCmdHandler(HandleThrowItem))
@@ -136,57 +132,35 @@ private void OnDisarmed(EntityUid uid, HandsComponent component, DisarmedEvent a
             args.Handled = true; // Successful disarm.
         }
 
-        // Shitmed Change Start
-        private void TryAddHand(EntityUid uid, HandsComponent component, Entity<BodyPartComponent> part, string slot)
+        private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
         {
-            if (part.Comp is null
-                || part.Comp.PartType != BodyPartType.Hand)
+            if (!args.Part.Comp.Type.HasFlag(BodyPartType.Hand)) // WD EDIT
                 return;
 
             // If this annoys you, which it should.
             // Ping Smugleaf.
-            var location = part.Comp.Symmetry switch
+            // WD EDIT START
+            var location = args.Part.Comp.Type switch
             {
-                BodyPartSymmetry.None => HandLocation.Middle,
-                BodyPartSymmetry.Left => HandLocation.Left,
-                BodyPartSymmetry.Right => HandLocation.Right,
-                _ => throw new ArgumentOutOfRangeException(nameof(part.Comp.Symmetry))
+                BodyPartType.Hand => HandLocation.Middle,
+                BodyPartType.MiddleHand => HandLocation.Middle,
+                BodyPartType.LeftHand => HandLocation.Left,
+                BodyPartType.RightHand => HandLocation.Right,
+                _ => throw new ArgumentOutOfRangeException(nameof(args.Part.Comp.Type))
             };
+            // WD EDIT END
 
-            if (part.Comp.Enabled
-                && _bodySystem.TryGetParentBodyPart(part, out var _, out var parentPartComp)
-                && parentPartComp.Enabled)
-                AddHand(uid, slot, location);
-        }
-
-        private void HandleBodyPartAdded(EntityUid uid, HandsComponent component, ref BodyPartAddedEvent args)
-        {
-            TryAddHand(uid, component, args.Part, args.Slot);
+            AddHand(uid, _body.GetBodyPartSlotId(args.SlotId), location); // WD EDIT
         }
 
         private void HandleBodyPartRemoved(EntityUid uid, HandsComponent component, ref BodyPartRemovedEvent args)
         {
-            if (args.Part.Comp is null
-                || args.Part.Comp.PartType != BodyPartType.Hand)
+            if (!args.Part.Comp.Type.HasFlag(BodyPartType.Hand)) // WD EDIT
                 return;
-            RemoveHand(uid, args.Slot);
-        }
 
-        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));
+            RemoveHand(uid, _body.GetBodyPartSlotId(args.SlotId)); // WD EDIT
         }
 
-        // Shitmed Change End
-
         #region pulling
 
         private void HandlePullStarted(EntityUid uid, HandsComponent component, PullStartedMessage args)
diff --git a/Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs b/Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs
deleted file mode 100644
index 0fceb8ca6a8..00000000000
--- a/Content.Server/HeightAdjust/BloodstreamAdjustSystem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.CCVar;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Contests;
-using Content.Shared.HeightAdjust;
-using Robust.Shared.Configuration;
-
-namespace Content.Server.HeightAdjust;
-
-public sealed class BloodstreamAdjustSystem : EntitySystem
-{
-    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly ContestsSystem _contests = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<BloodstreamAffectedByMassComponent, MapInitEvent>((uid, comp, _) => TryAdjustBloodstream((uid, comp)));
-        SubscribeLocalEvent<BloodstreamAffectedByMassComponent, HeightAdjustedEvent>((uid, comp, _) => TryAdjustBloodstream((uid, comp)));
-    }
-
-    /// <summary>
-    ///     Adjusts the bloodstream of the specified entity based on the settings provided by the component.
-    /// </summary>
-    public bool TryAdjustBloodstream(Entity<BloodstreamAffectedByMassComponent> ent)
-    {
-        if (!TryComp<BloodstreamComponent>(ent, out var bloodstream)
-            || !_solutionContainer.TryGetSolution(ent.Owner, bloodstream.BloodSolutionName, out var bloodSolutionEnt)
-            || bloodstream.BloodMaxVolume == 0
-            || !_config.GetCVar(CCVars.HeightAdjustModifiesBloodstream))
-            return false;
-
-        var bloodSolution = bloodSolutionEnt.Value.Comp.Solution;
-
-        var factor = Math.Pow(_contests.MassContest(ent, bypassClamp: true, rangeFactor: 4f), ent.Comp.Power);
-        factor = Math.Clamp(factor, ent.Comp.Min, ent.Comp.Max);
-
-        var newVolume = bloodstream.BloodMaxVolume * factor;
-        var newBloodLevel = bloodSolution.FillFraction * newVolume;
-        bloodSolution.MaxVolume = newVolume;
-        bloodSolution.SetContents([new ReagentQuantity(bloodstream.BloodReagent, newBloodLevel, null)], false);
-
-        _bloodstream.SetBloodMaxVolume(ent.Owner, newVolume, bloodstream);
-
-        return true;
-    }
-}
diff --git a/Content.Server/HeightAdjust/BloodstreamAffectedByMassComponent.cs b/Content.Server/HeightAdjust/BloodstreamAffectedByMassComponent.cs
deleted file mode 100644
index f6c3a0e250c..00000000000
--- a/Content.Server/HeightAdjust/BloodstreamAffectedByMassComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.Body.Components;
-
-namespace Content.Server.HeightAdjust;
-
-/// <summary>
-///     When applied to a humanoid or any mob, adjusts their blood level based on the mass contest between them
-///     and an average humanoid.
-///     <br/>
-///     The formula for the resulting bloodstream volume is <code>V = BloodMaxVolume * MassContest^Power</code>
-///     clamped between the specified Min and Max values.
-/// </summary>
-[RegisterComponent]
-public sealed partial class BloodstreamAffectedByMassComponent : Component
-{
-    /// <summary>
-    ///     Minimum and maximum resulting volume factors. A minimum value of 0.5 means that the resulting volume will be at least 50% of the original.
-    /// </summary>
-    [DataField]
-    public float Min = 1 / 3f, Max = 3f;
-
-    /// <summary>
-    ///     The power to which the outcome of the mass contest will be risen.
-    /// </summary>
-    [DataField]
-    public float Power = 1f;
-}
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs
index 1a92ab8fdf7..0840f926ae2 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs
@@ -40,45 +40,12 @@ private void OnVerbsRequest(EntityUid uid, HumanoidAppearanceComponent component
                         component.BodyType, // WD EDIT
                         component.Sex,
                         component.SkinColor,
-                        component.CustomBaseLayers
+                        component.EyeColor // WD EDIT
                     ));
             }
         });
     }
 
-    private void OnBaseLayersSet(EntityUid uid, HumanoidAppearanceComponent component,
-        HumanoidMarkingModifierBaseLayersSetMessage message)
-    {
-        if (!_adminManager.HasAdminFlag(message.Actor, AdminFlags.Fun))
-        {
-            return;
-        }
-
-        if (message.Info == null)
-        {
-            component.CustomBaseLayers.Remove(message.Layer);
-        }
-        else
-        {
-            component.CustomBaseLayers[message.Layer] = message.Info.Value;
-        }
-
-        Dirty(uid, component);
-
-        if (message.ResendState)
-        {
-            _uiSystem.SetUiState(
-                uid,
-                HumanoidMarkingModifierKey.Key,
-                new HumanoidMarkingModifierState(component.MarkingSet, component.Species,
-                    component.BodyType, // WD EDIT
-                        component.Sex,
-                        component.SkinColor,
-                        component.CustomBaseLayers
-                    ));
-        }
-    }
-
     private void OnMarkingsSet(EntityUid uid, HumanoidAppearanceComponent component,
         HumanoidMarkingModifierMarkingSetMessage message)
     {
@@ -99,7 +66,7 @@ private void OnMarkingsSet(EntityUid uid, HumanoidAppearanceComponent component,
                     component.BodyType, // WD EDIT
                         component.Sex,
                         component.SkinColor,
-                        component.CustomBaseLayers
+                        component.EyeColor // WD EDIT
                     ));
         }
 
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index 71877caca39..769892ddabd 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -16,7 +16,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<HumanoidAppearanceComponent, HumanoidMarkingModifierMarkingSetMessage>(OnMarkingsSet);
-        SubscribeLocalEvent<HumanoidAppearanceComponent, HumanoidMarkingModifierBaseLayersSetMessage>(OnBaseLayersSet);
         SubscribeLocalEvent<HumanoidAppearanceComponent, GetVerbsEvent<Verb>>(OnVerbsRequest);
     }
 
@@ -46,7 +45,6 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         targetHumanoid.Height = sourceHumanoid.Height;
         targetHumanoid.Width = sourceHumanoid.Width;
         SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
-        targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
 
         targetHumanoid.Gender = sourceHumanoid.Gender;
@@ -59,27 +57,6 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         Dirty(target, targetHumanoid);
     }
 
-    /// <summary>
-    ///     Removes a marking from a humanoid by ID.
-    /// </summary>
-    /// <param name="uid">Humanoid mob's UID</param>
-    /// <param name="marking">The marking to try and remove.</param>
-    /// <param name="sync">Whether to immediately sync this to the humanoid</param>
-    /// <param name="humanoid">Humanoid component of the entity</param>
-    public void RemoveMarking(EntityUid uid, string marking, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
-    {
-        if (!Resolve(uid, ref humanoid)
-            || !_markingManager.Markings.TryGetValue(marking, out var prototype))
-        {
-            return;
-        }
-
-        humanoid.MarkingSet.Remove(prototype.MarkingCategory, marking);
-
-        if (sync)
-            Dirty(uid, humanoid);
-    }
-
     /// <summary>
     ///     Removes a marking from a humanoid by category and index.
     /// </summary>
diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
index 0d3d69c1bcb..df20bba7ce4 100644
--- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
@@ -1,7 +1,9 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Body.Systems;
 using Content.Server.Polymorph.Components;
 using Content.Server.Popups;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
 using Content.Shared.Popups;
@@ -26,6 +28,7 @@ public sealed class ImmovableRodSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     public override void Update(float frameTime)
     {
@@ -123,7 +126,7 @@ private void OnCollide(EntityUid uid, ImmovableRodComponent component, ref Start
                 return;
             }
 
-            _bodySystem.GibBody(ent, body: body);
+            _gibbing.GibBody((ent, body, null)); // WD EDIT
             return;
         }
 
diff --git a/Content.Server/Kitchen/Components/SharpComponent.cs b/Content.Server/Kitchen/Components/SharpComponent.cs
index 675530a0a40..c67c3b8a4d4 100644
--- a/Content.Server/Kitchen/Components/SharpComponent.cs
+++ b/Content.Server/Kitchen/Components/SharpComponent.cs
@@ -12,17 +12,4 @@ public sealed partial class SharpComponent : Component
 
     [DataField("butcherDelayModifier")]
     public float ButcherDelayModifier = 1.0f;
-
-    
-    /// <summary>
-    ///     Shitmed: Whether this item had <c>ScalpelComponent</c> before sharp was added.
-    /// </summary>
-    [DataField]
-    public bool HadScalpel;
-
-    /// <summary>
-    ///     Shitmed: Whether this item had <c>BoneSawComponent</c> before sharp was added.
-    /// </summary>
-    [DataField]
-    public bool HadBoneSaw;
 }
diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
index 9b70426faa7..6488da644e7 100644
--- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
@@ -1,3 +1,5 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Administration.Logs;
 using Content.Server.Body.Systems;
 using Content.Server.Kitchen.Components;
@@ -33,11 +35,11 @@ public sealed class KitchenSpikeSystem : SharedKitchenSpikeSystem
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly TransformSystem _transform = default!;
-        [Dependency] private readonly BodySystem _bodySystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
         [Dependency] private readonly SharedSuicideSystem _suicide = default!;
+        [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
         public override void Initialize()
         {
@@ -160,10 +162,7 @@ private void Spike(EntityUid uid, EntityUid userUid, EntityUid victimUid,
             _transform.SetCoordinates(victimUid, Transform(uid).Coordinates);
             // THE WHAT?
             // TODO: Need to be able to leave them on the spike to do DoT, see ss13.
-            var gibs = _bodySystem.GibBody(victimUid);
-            foreach (var gib in gibs) {
-                QueueDel(gib);
-            }
+            _gibbing.GibBody(victimUid, true); // WD EDIT
 
             _audio.PlayPvs(component.SpikeSound, uid);
         }
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index e8750fcec59..6ccf608fd5f 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -10,8 +10,6 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Construction.EntitySystems;
@@ -34,10 +32,12 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using System.Linq;
+using Content.Server._White.Body.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Content.Shared.Stacks;
 using Content.Server.Construction.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Chat;
 using Content.Shared.Damage;
 using Robust.Shared.Utility;
@@ -263,11 +263,11 @@ private void OnSuicideByEnvironment(Entity<MicrowaveComponent> ent, ref SuicideB
 
             if (TryComp<BodyComponent>(victim, out var body))
             {
-                var headSlots = _bodySystem.GetBodyChildrenOfType(victim, BodyPartType.Head, body);
+                var headSlots = _bodySystem.GetBodyParts((victim, body), BodyPartType.Head); // WD EDIT
 
                 foreach (var part in headSlots)
                 {
-                    _container.Insert(part.Id, ent.Comp.Storage);
+                    _container.Insert(part.Owner, ent.Comp.Storage); // WD EDIT
                     headCount++;
                 }
             }
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index 99ea516f74d..2cb45ec4503 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -1,7 +1,8 @@
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Kitchen.Components;
 using Content.Server.Nutrition.EntitySystems;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
@@ -32,6 +33,7 @@ public sealed class SharpSystem : EntitySystem
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     public override void Initialize()
     {
@@ -122,7 +124,7 @@ private void OnDoAfter(EntityUid uid, SharpComponent component, DoAfterEvent arg
             popupEnt, args.Args.User, popupType);
 
         if (hasBody)
-            _bodySystem.GibBody(args.Args.Target.Value, body: body);
+            _gibbing.GibBody((args.Args.Target.Value, body, null)); // WD EDIT
 
         _destructibleSystem.DestroyEntity(args.Args.Target.Value);
 
diff --git a/Content.Server/Limbus/Traits/Components/VampirismComponent.cs b/Content.Server/Limbus/Traits/Components/VampirismComponent.cs
index 82ab36f32e7..bf76db72c53 100644
--- a/Content.Server/Limbus/Traits/Components/VampirismComponent.cs
+++ b/Content.Server/Limbus/Traits/Components/VampirismComponent.cs
@@ -1,5 +1,4 @@
-using Content.Server.Body.Components;
-using Content.Shared.Body.Prototypes;
+using Content.Shared._White.Body.Prototypes;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Limbus/Traits/VampirismSystem.cs b/Content.Server/Limbus/Traits/VampirismSystem.cs
index c7b35f04a61..e49562bf3a0 100644
--- a/Content.Server/Limbus/Traits/VampirismSystem.cs
+++ b/Content.Server/Limbus/Traits/VampirismSystem.cs
@@ -1,14 +1,16 @@
-using Content.Server.Body.Components;
+using Content.Server._White.Body.Organs.Stomach;
 using Content.Server.Limbus.Traits.Components;
 using Content.Server.Vampiric;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Systems;
 
 namespace Content.Server.Limbus.Traits;
 
 public sealed class VampirismSystem : EntitySystem
 {
     [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly StomachSystem _stomach = default!;
 
     public override void Initialize()
     {
@@ -19,19 +21,17 @@ private void OnInitVampire(Entity<VampirismComponent> ent, ref MapInitEvent args
     {
         EnsureBloodSucker(ent);
 
-        if (!TryComp<BodyComponent>(ent, out var body)
-		    || !_body.TryGetBodyOrganEntityComps<MetabolizerComponent>((ent, body), out var comps))
+        if (!_body.TryGetOrgans<MetabolizerComponent>(ent.Owner, out var organs, OrganType.Stomach)) // WD EDIT
             return;
 
-        foreach (var entity in comps)
+        foreach (var organ in organs) // WD EDIT
         {
-            if (!TryComp<StomachComponent>(entity.Owner, out var stomach))
+            if (!TryComp<StomachComponent>(organ.Owner, out var stomach)) // WD EDIT
                 continue;
 
-            entity.Comp1.MetabolizerTypes = ent.Comp.MetabolizerPrototypes;
+            organ.Comp2.Types = ent.Comp.MetabolizerPrototypes; // WD EDIT
 
-            if (ent.Comp.SpecialDigestible is {} whitelist)
-                stomach.SpecialDigestible = whitelist;
+            _stomach.SetSpecialDigestible((organ.Owner, stomach), ent.Comp.SpecialDigestible); // WD EDIT
         }
     }
 
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index 8a6bba35fba..8d73607e884 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -6,7 +6,6 @@
 using Content.Server.Repairable;
 using Content.Server.Stack;
 using Content.Server.Wires;
-using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
@@ -25,6 +24,9 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Server._White.Gibbing;
+using Content.Shared._White.Body.Systems;
+
 
 namespace Content.Server.Materials;
 
@@ -43,6 +45,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -125,7 +128,7 @@ private void OnSuicideByEnvironment(Entity<MaterialReclaimerComponent> entity, r
             Filter.PvsExcept(victim, entityManager: EntityManager),
             true);
 
-        _body.GibBody(victim, true);
+        _gibbing.GibBody(victim, true); // WD EDIT
         _appearance.SetData(entity.Owner, RecyclerVisuals.Bloody, true);
         args.Handled = true;
     }
@@ -203,7 +206,7 @@ public override void Reclaim(EntityUid uid,
         {
             _adminLogger.Add(LogType.Gib, LogImpact.Extreme, $"{ToPrettyString(item):victim} was gibbed by {ToPrettyString(uid):entity} ");
             SpawnChemicalsFromComposition(uid, item, completion, false, component, xform);
-            _body.GibBody(item, true);
+            _gibbing.GibBody(item, true); // WD EDIT
             _appearance.SetData(uid, RecyclerVisuals.Bloody, true);
         }
         else
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index 7caf2ae4311..c557388db4d 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Server._White.Body.Respirator.Systems;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Mech.Components;
 using Content.Server.Power.Components;
@@ -16,7 +17,6 @@
 using Content.Shared.Tools.Components;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
-using Content.Server.Body.Systems;
 using Content.Shared.Tools.Systems;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index 1ba5227b362..2e8b4cf2ced 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -1,10 +1,10 @@
 using System.Numerics;
-using Content.Server.Body.Components;
 using Content.Server.Botany.Components;
 using Content.Server.Construction;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Materials;
 using Content.Server.Power.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Audio;
 using Content.Shared.CCVar;
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index cf397984246..34b7af0212d 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -38,12 +38,6 @@ public sealed partial class HealthAnalyzerComponent : Component
     [DataField]
     public EntityUid? ScannedEntity;
 
-    /// <summary>
-    /// Shitmed Change: The body part that is currently being scanned.
-    /// </summary>
-    [DataField]
-    public EntityUid? CurrentBodyPart;
-
     /// <summary>
     /// The maximum range in tiles at which the analyzer can receive continuous updates
     /// </summary>
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 09d8ce49582..df4665996f3 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -1,14 +1,14 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.EntitySystems;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Medical.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Temperature.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.UserInterface;
@@ -112,7 +112,7 @@ public override void Update(float frameTime)
                 }
 
                 var solutionToInject = _solutionContainerSystem.SplitSolution(containerSolution.Value, cryoPod.BeakerTransferAmount);
-                _bloodstreamSystem.TryAddToChemicals(patient.Value, solutionToInject, bloodstream);
+                _bloodstreamSystem.TryAddToBloodstream((patient.Value, bloodstream), solutionToInject); // WD EDIT
                 _reactiveSystem.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
             }
         }
@@ -202,8 +202,7 @@ private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableU
                 : 0,
             null,
             null,
-            null,
-            null // Shitmed Change
+            null
         ));
     }
 
diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs
index 17c7ae89f10..46c9f4cc4ef 100644
--- a/Content.Server/Medical/HealingSystem.cs
+++ b/Content.Server/Medical/HealingSystem.cs
@@ -1,13 +1,14 @@
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Server._White.Body.Wound.Systems;
+using Content.Server._White.TargetDoll;
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Medical.Components;
 using Content.Server.Popups;
 using Content.Server.Stack;
-using Content.Shared._Shitmed.Targeting;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Wounds.Components;
 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;
@@ -23,6 +24,7 @@
 using Content.Shared.Stacks;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Medical;
 
@@ -39,8 +41,10 @@ public sealed class HealingSystem : EntitySystem
     [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly SharedTargetingSystem _targetingSystem = default!; // Shitmed Change
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed Change
+    // WD EDIT START
+    [Dependency] private readonly TargetDollSystem _targetDoll = default!;
+    [Dependency] private readonly WoundSystem _wound = default!;
+    // WD EDIT END
 
     public override void Initialize()
     {
@@ -72,9 +76,9 @@ entity.Comp.DamageContainerID is not null &&
         {
             if (!TryComp<BloodstreamComponent>(entity, out var bloodstream))
                 return;
-            var isBleeding = bloodstream.BleedAmount > 0;
+            var isBleeding = bloodstream.Bleeding > 0;
             _bloodstreamSystem.TryModifyBleedAmount(entity.Owner, healing.BloodlossModifier);
-            if (isBleeding != bloodstream.BleedAmount > 0)
+            if (isBleeding != bloodstream.Bleeding > 0)
             {
                 var popup = (args.User == entity.Owner)
                     ? Loc.GetString("medical-item-stop-bleeding-self")
@@ -87,7 +91,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.User, canSever: false); // Shitmed Change
+        var healed = _damageable.TryChangeDamage(entity.Owner, healing.Damage, true, origin: args.Args.User);
 
         if (healed == null && healing.BloodlossModifier != 0)
             return;
@@ -119,10 +123,10 @@ entity.Comp.DamageContainerID is not null &&
                 $"{EntityManager.ToPrettyString(args.User):user} healed themselves for {total:damage} damage");
         }
 
-        _audio.PlayPvs(healing.HealingEndSound, entity.Owner, AudioHelpers.WithVariation(0.125f, _random).WithVolume(-5f));
+        _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, healing) && !dontRepeat || IsPartDamaged(args.User, entity); // Shitmed Change
+        args.Repeat = (HasDamage(entity, healing) && !dontRepeat);
         if (!args.Repeat && !dontRepeat)
             _popupSystem.PopupEntity(Loc.GetString("medical-item-finished-using", ("item", args.Used)), entity.Owner, args.User);
         args.Handled = true;
@@ -151,7 +155,7 @@ private bool HasDamage(Entity<DamageableComponent> ent, HealingComponent healing
             }
 
             // Is ent bleeding and can we stop it?
-            if (healing.BloodlossModifier < 0 && bloodstream.BleedAmount > 0)
+            if (healing.BloodlossModifier < 0 && bloodstream.Bleeding > 0)
             {
                 return true;
             }
@@ -160,23 +164,6 @@ private bool HasDamage(Entity<DamageableComponent> ent, HealingComponent healing
         return false;
     }
 
-    // Shitmed Change Start
-    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;
-    }
-
-    // Shitmed Change End
-
     private void OnHealingUse(Entity<HealingComponent> entity, ref UseInHandEvent args)
     {
         if (args.Handled)
@@ -213,7 +200,23 @@ targetDamage.DamageContainerID is not null &&
         if (TryComp<StackComponent>(uid, out var stack) && stack.Count < 1)
             return false;
 
-        if (!(HasDamage((target, targetDamage), component) || IsPartDamaged(user, target))) // Shitmed Change
+        // WD EDIT START
+        var bodyPartType = _targetDoll.GetSelectedBodyPart(user);
+        if (TryComp<WoundableComponent>(target, out var woundableBodyComponent)
+            && !_wound.HasWounds((target, woundableBodyComponent), component.Damage, false, bodyPartType))
+        {
+            if (_wound.GetWoundableBodyParts((target, woundableBodyComponent), component.Damage).FirstOrNull() is not { } bodyPart)
+            {
+                _popupSystem.PopupEntity(Loc.GetString("medical-item-cant-use", ("item", uid)), uid, user);
+                return false;
+            }
+
+            _popupSystem.PopupEntity(Loc.GetString("medical-item-cant-use-switch-body-part", ("item", uid), ("body-part", bodyPartType), ("new-body-part", bodyPart.Comp1.Type)), uid, user);
+            bodyPartType = bodyPart.Comp1.Type;
+        }
+        // WD EDIT END
+
+        if (!HasDamage((target, targetDamage), component))
         {
             _popupSystem.PopupEntity(Loc.GetString("medical-item-cant-use", ("item", uid)), uid, user);
             return false;
@@ -235,7 +238,7 @@ targetDamage.DamageContainerID is not null &&
             : component.Delay * GetScaledHealingPenalty(user, component);
 
         var doAfterEventArgs =
-            new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), target, target: target, used: uid)
+            new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(bodyPartType), target, target: target, used: uid) // WD EDIT
             {
                 // Didn't break on damage as they may be trying to prevent it and
                 // not being able to heal your own ticking damage would be frustrating.
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index d01fa3ea33f..7db3f3bcfe1 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,9 +1,8 @@
-using Content.Server.Body.Components;
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
 using Content.Server.Temperature.Components;
-using Content.Server.Traits.Assorted;
-using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Bloodstream.Systems;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
@@ -13,19 +12,12 @@
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
-using Content.Shared.PowerCell;
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Timing;
 
-// Shitmed Change
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
-using Content.Shared._Shitmed.Targeting;
-using System.Linq;
-
 namespace Content.Server.Medical;
 
 public sealed class HealthAnalyzerSystem : EntitySystem
@@ -34,12 +26,11 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [Dependency] private readonly PowerCellSystem _cell = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed Change
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
+    [Dependency] private readonly ItemToggleSystem _toggle = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly ItemToggleSystem _toggle = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!; // WD EDIT
 
     public override void Initialize()
     {
@@ -48,12 +39,6 @@ public override void Initialize()
         SubscribeLocalEvent<HealthAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
         SubscribeLocalEvent<HealthAnalyzerComponent, ItemToggledEvent>(OnToggled);
         SubscribeLocalEvent<HealthAnalyzerComponent, DroppedEvent>(OnDropped);
-        // Shitmed Change Start
-        Subs.BuiEvents<HealthAnalyzerComponent>(HealthAnalyzerUiKey.Key, subs =>
-        {
-            subs.Event<HealthAnalyzerPartMessage>(OnHealthAnalyzerPartSelected);
-        });
-        // Shitmed Change End
     }
 
     public override void Update(float frameTime)
@@ -74,17 +59,6 @@ public override void Update(float frameTime)
                 continue;
             }
 
-            // Shitmed 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;
-            }
-            // Shitmed Change End
-
             component.NextUpdate = _timing.CurTime + component.UpdateInterval;
 
             //Get distance between health analyzer and the scanned entity
@@ -96,7 +70,7 @@ public override void Update(float frameTime)
                 continue;
             }
 
-            UpdateScannedUser(uid, patient, true, component.CurrentBodyPart); // Shitmed Change
+            UpdateScannedUser(uid, patient, true);
         }
     }
 
@@ -176,15 +150,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>
-    /// <param name="part">Shitmed Change: The body part to analyze, if any</param>
-    private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target, EntityUid? part = null)
+    private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target)
     {
         //Link the health analyzer to the scanned entity
         healthAnalyzer.Comp.ScannedEntity = target;
-        healthAnalyzer.Comp.CurrentBodyPart = part; // Shitmed Change
-        _cell.SetDrawEnabled(healthAnalyzer.Owner, true);
 
-        UpdateScannedUser(healthAnalyzer, target, true, part); // Shitmed Change
+        _toggle.TryActivate(healthAnalyzer.Owner);
+
+        UpdateScannedUser(healthAnalyzer, target, true);
     }
 
     /// <summary>
@@ -196,35 +169,11 @@ private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer,
     {
         //Unlink the analyzer
         healthAnalyzer.Comp.ScannedEntity = null;
-        healthAnalyzer.Comp.CurrentBodyPart = null; // Shitmed Change
-        _cell.SetDrawEnabled(healthAnalyzer.Owner, false);
 
-        UpdateScannedUser(healthAnalyzer, target, false);
-    }
+        _toggle.TryDeactivate(healthAnalyzer.Owner);
 
-    // Shitmed Change Start
-    /// <summary>
-    /// Shitmed Change: 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);
-        }
+        UpdateScannedUser(healthAnalyzer, target, false);
     }
-    // Shitmed Change End
 
     /// <summary>
     /// Send an update for the target to the healthAnalyzer
@@ -232,14 +181,14 @@ private void OnHealthAnalyzerPartSelected(Entity<HealthAnalyzerComponent> health
     /// <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>
-    /// <param name="part">Shitmed Change: The body part being scanned, if any</param>
-    public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode, EntityUid? part = null)
+    public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode)
     {
         if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key))
             return;
 
         if (!HasComp<DamageableComponent>(target))
             return;
+
         var bodyTemperature = float.NaN;
 
         if (TryComp<TemperatureComponent>(target, out var temp))
@@ -249,29 +198,19 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
         var bleeding = false;
         var unrevivable = false;
 
-        if (TryComp<BloodstreamComponent>(target, out var bloodstream) &&
-            _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName,
-                ref bloodstream.BloodSolution, out var bloodSolution))
+        if (TryComp<BloodstreamComponent>(target, out var bloodstream)) // WD EDIT
         {
-            bloodAmount = bloodSolution.MaxVolume != 0 ? bloodSolution.FillFraction : 0;
-            bleeding = bloodstream.BleedAmount > 0;
+            bloodAmount = _bloodstream.GetBloodLevel((target, bloodstream)); // WD EDIT
+            bleeding = bloodstream.Bleeding > 0; // WD EDIT
         }
 
-        // Shitmed Change Start
-        Dictionary<TargetBodyPart, TargetIntegrity>? body = null;
-        if (HasComp<TargetingComponent>(target))
-            body = _bodySystem.GetBodyPartStatus(target);
-        // Shitmed Change End
-
         _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(
             GetNetEntity(target),
             bodyTemperature,
             bloodAmount,
             scanMode,
             bleeding,
-            unrevivable,
-            body, // Shitmed Change
-            part != null ? GetNetEntity(part) : null // Shitmed Change
+            unrevivable
         ));
     }
 }
diff --git a/Content.Server/Medical/InsideCryoPodSystem.cs b/Content.Server/Medical/InsideCryoPodSystem.cs
index 21827c105f9..d884bc8662f 100644
--- a/Content.Server/Medical/InsideCryoPodSystem.cs
+++ b/Content.Server/Medical/InsideCryoPodSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Respirator.Systems;
+using Content.Server.Atmos.EntitySystems;
 using Content.Server.Medical.Components;
 using Content.Shared.Medical.Cryogenics;
 
diff --git a/Content.Server/Medical/MedicalScannerSystem.cs b/Content.Server/Medical/MedicalScannerSystem.cs
index 5b459f27fe8..b54e6fdf9d6 100644
--- a/Content.Server/Medical/MedicalScannerSystem.cs
+++ b/Content.Server/Medical/MedicalScannerSystem.cs
@@ -11,7 +11,7 @@
 using Content.Server.DeviceLinking.Systems;
 using Content.Shared.DeviceLinking.Events;
 using Content.Server.Power.EntitySystems;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Climbing.Systems;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
diff --git a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
index b8304c562a4..4c229c7d0a3 100644
--- a/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
+++ b/Content.Server/Medical/Stethoscope/StethoscopeSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Components;
+using Content.Server._White.Body.Respirator.Components;
 using Content.Server.Medical.Components;
 using Content.Server.Medical.Stethoscope.Components;
 using Content.Server.Popups;
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index 57992e3906d..c4be497d288 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -1,9 +1,12 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Server._White.Body.Organs.Stomach;
+using Content.Server._White.Body.Systems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
 using Content.Server.Stunnable;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
@@ -38,7 +41,7 @@ public sealed class VomitSystem : EntitySystem
         public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -40f)
         {
             // Main requirement: You have a stomach
-            var stomachList = _body.GetBodyOrganEntityComps<StomachComponent>(uid);
+            var stomachList = _body.GetOrgans<StomachComponent>(uid, OrganType.Stomach); // WD EDIT
             if (stomachList.Count == 0)
                 return;
 
@@ -61,11 +64,11 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
             // Empty the stomach out into it
             foreach (var stomach in stomachList)
             {
-                if (_solutionContainer.ResolveSolution(stomach.Owner, StomachSystem.DefaultSolutionName, ref stomach.Comp1.Solution, out var sol))
+                if (_solutionContainer.ResolveSolution(stomach.Owner, stomach.Comp2.SolutionName, ref stomach.Comp2.Solution, out var sol)) // WD EDIT
                 {
                     solution.AddSolution(sol, _proto);
                     sol.RemoveAllSolution();
-                    _solutionContainer.UpdateChemicals(stomach.Comp1.Solution.Value);
+                    _solutionContainer.UpdateChemicals(stomach.Comp2.Solution.Value); // WD EDIT
                 }
             }
             // Adds a tiny amount of the chem stream from earlier along with vomit
@@ -76,14 +79,16 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
                 var vomitAmount = solutionSize;
 
                 // Takes 10% of the chemicals removed from the chem stream
-                if (_solutionContainer.ResolveSolution(uid, bloodStream.ChemicalSolutionName, ref bloodStream.ChemicalSolution))
-                {
-                    var vomitChemstreamAmount = _solutionContainer.SplitSolution(bloodStream.ChemicalSolution.Value, vomitAmount);
-                    vomitChemstreamAmount.ScaleSolution(chemMultiplier);
-                    solution.AddSolution(vomitChemstreamAmount, _proto);
+                // WD EDIT START
+                var chemicalSolution = _bloodstream.FlushChemicals((uid, bloodStream), vomitAmount);
 
-                    vomitAmount -= (float)vomitChemstreamAmount.Volume;
+                if (chemicalSolution != null)
+                {
+                    chemicalSolution.ScaleSolution(chemMultiplier);
+                    solution.AddSolution(chemicalSolution, _proto);
+                    vomitAmount -= (float)chemicalSolution.Volume;
                 }
+                // WD EDIT end
 
                 // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream
                 solution.AddReagent(new ReagentId("Vomit", _bloodstream.GetEntityBloodData(uid)), vomitAmount); // TODO: Dehardcode vomit prototype
diff --git a/Content.Server/Mood/MoodSystem.cs b/Content.Server/Mood/MoodSystem.cs
index 980e986213b..f11ecf0a9d5 100644
--- a/Content.Server/Mood/MoodSystem.cs
+++ b/Content.Server/Mood/MoodSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Chat.Managers;
 using Content.Server.Popups;
-using Content.Shared._Shitmed.Medical.Surgery;
 using Content.Shared.Alert;
 using Content.Shared.Chat;
 using Content.Shared.Damage;
@@ -435,9 +434,6 @@ public void UpdateDamageState(EntityUid uid, MoodComponent component)
                 value = threshold.Value;
             }
 
-        if (HasComp<NoScreamComponent>(uid)) // WWDP painkillers
-            protoId = "HealthNoDamage";
-
         var ev = new MoodEffectEvent(protoId);
         RaiseLocalEvent(uid, ev);
     }
diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs
index f2c6a606978..54e080c293e 100644
--- a/Content.Server/Morgue/MorgueSystem.cs
+++ b/Content.Server/Morgue/MorgueSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Storage.Components;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Examine;
 using Content.Shared.Morgue;
 using Content.Shared.Morgue.Components;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/FillLinkedMachineOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/FillLinkedMachineOperator.cs
index b9a9180df8f..24c804c2f71 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/FillLinkedMachineOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/FillLinkedMachineOperator.cs
@@ -1,5 +1,5 @@
 using Content.Server.Disposal.Unit.Components;
-using Content.Shared.Body.Part;
+using Content.Shared._White.Body.Components;
 using Content.Shared.DeviceLinking;
 using Content.Shared.Disposal;
 using Content.Shared.Hands.Components;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyFillableItemOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyFillableItemOperator.cs
index 5b8e7703bae..6f2c3566bc0 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyFillableItemOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyFillableItemOperator.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Content.Server.Disposal.Unit.Components;
 using Content.Server.NPC.Pathfinding;
-using Content.Shared.Body.Part;
+using Content.Shared._White.Body.Components;
 using Content.Shared.DeviceLinking;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs
index 96e22274b5c..8dfeb20a2fa 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/WeldbotWeldOperator.cs
@@ -102,7 +102,7 @@ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTi
             else if (weldableIsStructure)
             {
                 //If a structure explicitly has a tag to allow a Weldbot to fix it, trust that we can just do so no matter what the damage actually is.
-                _damageableSystem.ChangeAllDamage(target, damage, -StructureRepairAmount);
+                _damageableSystem.ChangeAllDamage(target,  damage, -StructureRepairAmount);
             }
             else
             {
diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
index 3303372f66b..5b31f26c568 100644
--- a/Content.Server/Nutrition/Components/FoodComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodComponent.cs
@@ -68,12 +68,6 @@ public sealed partial class FoodComponent : Component
     [DataField]
     public float ForceFeedDelay = 3;
 
-    /// <summary>
-    /// Shitmed Change: Whether to show a popup to everyone in range when attempting to eat this food, and upon successful eating.
-    /// </summary>
-    [DataField]
-    public bool PopupOnEat;
-
     /// <summary>
     /// For mobs that are food, requires killing them before eating.
     /// </summary>
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index fa2eb4f9ed6..7d47c83457d 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -1,3 +1,5 @@
+using Content.Server._White.Body.Organs.Stomach;
+using Content.Server._White.Body.Systems;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.EntityEffects.Effects;
@@ -6,8 +8,8 @@
 using Content.Server.Inventory;
 using Content.Server.Popups;
 using Content.Server.Traits.Assorted.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
@@ -265,37 +267,24 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
         if (transferAmount <= 0)
             return;
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
-        {
-            _popup.PopupEntity(Loc.GetString(forceDrink ? "drink-component-try-use-drink-cannot-drink-other" : "drink-component-try-use-drink-had-enough"), args.Target.Value, args.User);
-
-            if (HasComp<RefillableSolutionComponent>(args.Target.Value))
-            {
-                _puddle.TrySpillAt(args.User, drained, out _);
-                return;
-            }
-
-            _solutionContainer.Refill(args.Target.Value, soln.Value, drained);
+        // WD EDIT START
+        if (!_body.TryGetOrgans<StomachComponent>((args.Target.Value, body), out var stomachs, OrganType.Stomach))
             return;
-        }
 
-        var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Owner, drained, stomach.Comp1));
+        Entity<StomachComponent>? stomachToUse = null;
+        foreach (var stomach in stomachs)
+            stomachToUse = (stomach, stomach.Comp2);
 
-        //All stomachs are full or can't handle whatever solution we have.
-        if (firstStomach == null)
+        if (stomachToUse == null)
         {
             _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"), args.Target.Value, args.Target.Value);
+            if (!forceDrink)
+                return;
 
-            if (forceDrink)
-            {
-                _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"), args.Target.Value, args.User);
-                _puddle.TrySpillAt(args.Target.Value, drained, out _);
-            }
-            else
-                _solutionContainer.TryAddSolution(soln.Value, drained);
-
+            _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"), args.Target.Value, args.User);
             return;
         }
+        // WD EDIT END
 
         var flavors = args.FlavorMessage;
 
@@ -328,7 +317,7 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
         _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f).WithVariation(0.25f));
 
         _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1);
+        _stomach.TryTransferSolution((stomachToUse.Value.Owner, stomachToUse.Value.Comp), drained); // WD EDIT
 
         _forensics.TransferDna(entity, args.Target.Value);
 
@@ -342,7 +331,7 @@ private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<Alter
             !ev.CanInteract ||
             !ev.CanAccess ||
             !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
+            !_body.TryGetOrgans<StomachComponent>((ev.User, body), out var stomachs, OrganType.Stomach)) // WD EDIT
             return;
 
         // Make sure the solution exists
diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 308793c165e..375fae581b1 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -1,14 +1,13 @@
 using System.Linq;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Organs.Stomach;
+using Content.Server._White.Body.Systems;
 using Content.Server.Inventory;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Server.Stack;
 using Content.Server.Traits.Assorted.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Organ;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.EntitySystems;
@@ -129,7 +128,7 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
         if (!_solutionContainer.TryGetSolution(food, foodComp.Solution, out _, out var foodSolution))
             return (false, false);
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((target, body), out var stomachs))
+        if (!_body.TryGetOrgans<StomachComponent>((target, body), out var stomachs, OrganType.Stomach)) // WD EDIT
             return (false, false);
 
         // Check for special digestibles
@@ -182,14 +181,10 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             return (false, true);
         }
 
-        // Shitmed Change
-        EntityUid? userName = null;
-
         var forceFeed = user != target;
         if (forceFeed)
         {
-            // Shitmed Change
-            userName = Identity.Entity(user, EntityManager);
+            var userName = Identity.Entity(user, EntityManager);
             _popup.PopupEntity(
                 Loc.GetString("food-system-force-feed", ("user", userName)),
                 user,
@@ -227,25 +222,7 @@ private void OnFeedFood(Entity<FoodComponent> entity, ref AfterInteractEvent arg
             NeedHand = forceFeed || _hands.IsHolding(user, food),
         };
 
-        // Shitmed Change - track success of doafter to prevent popup on doafter cancel
-        var doAfterSuccess = _doAfter.TryStartDoAfter(doAfterArgs);
-
-        // Shitmed Change
-        if (foodComp.PopupOnEat && doAfterSuccess)
-        {
-            userName ??= Identity.Entity(user, EntityManager);
-            var foodName = Identity.Entity(food, EntityManager);
-            _popup.PopupPredicted(
-                !forceFeed
-                    ? Loc.GetString("food-system-eat-broadcasted", ("user", userName), ("food", foodName))
-                    : Loc.GetString("food-system-force-feed-broadcasted", ("user", userName), ("target", Identity.Entity(target, EntityManager)), ("food", foodName)),
-                user, target, PopupType.SmallCaution);
-
-            if (!forceFeed)
-                _popup.PopupEntity(Loc.GetString("food-system-eat-broadcasted-self", ("user", userName), ("food", foodName)),
-                    user, target, PopupType.SmallCaution);
-        }
-
+        _doAfter.TryStartDoAfter(doAfterArgs);
         return (true, true);
     }
 
@@ -257,7 +234,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         if (!TryComp<BodyComponent>(args.Target.Value, out var body))
             return;
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
+        if (!_body.TryGetOrgans<StomachComponent>((args.Target.Value, body), out var stomachs, OrganType.Stomach)) // WD EDIT
             return;
 
         if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution))
@@ -287,16 +264,18 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         foreach (var ent in stomachs)
         {
             var owner = ent.Owner;
-            if (!_stomach.CanTransferSolution(owner, split, ent.Comp1))
+            if (!_solutionContainer.ResolveSolution(owner, ent.Comp2.SolutionName, ref ent.Comp2.Solution, out var stomachSol)) // WD EDIT
                 continue;
 
-            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol))
+            if (stomachSol.AvailableVolume <= highestAvailable)
                 continue;
 
-            if (stomachSol.AvailableVolume <= highestAvailable)
+            // WD EDIT START
+            if (!IsDigestibleBy(ent, entity, entity))
                 continue;
+            // WD EDIT END
 
-            stomachToUse = ent;
+            stomachToUse = (ent, ent.Comp2); // WD EDIT
             highestAvailable = stomachSol.AvailableVolume;
         }
 
@@ -309,7 +288,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         }
 
         _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(stomachToUse!.Value.Owner, split, stomachToUse);
+        _stomach.TryTransferSolution((stomachToUse.Value.Owner, stomachToUse.Value.Comp), split); // WD EDIT
 
         var flavors = args.FlavorMessage;
 
@@ -321,12 +300,6 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
 
             _popup.PopupEntity(Loc.GetString("food-system-force-feed-success-user", ("target", targetName)), args.User, args.User);
 
-            // Shitmed change
-            if (entity.Comp.PopupOnEat)
-                _popup.PopupEntity(Loc.GetString("food-system-force-feed-broadcasted-success", ("user", userName), ("target", targetName), ("food", Identity.Entity(entity.Owner, EntityManager))),
-                    args.User, Filter.Pvs(args.User, entityManager: EntityManager).RemovePlayersByAttachedEntity([args.User, args.Target.Value]),
-                    true, PopupType.MediumCaution);
-
             // log successful force feed
             _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity.Owner):food}");
         }
@@ -334,11 +307,6 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
         {
             _popup.PopupEntity(Loc.GetString(entity.Comp.EatMessage, ("food", entity.Owner), ("flavors", flavors)), args.User, args.User);
 
-            // Shitmed change
-            if (entity.Comp.PopupOnEat)
-                _popup.PopupPredicted(Loc.GetString("food-system-eat-broadcasted-success", ("user", Identity.Entity(args.User, EntityManager)), ("food", Identity.Entity(entity.Owner, EntityManager))),
-                    args.User, args.User, PopupType.MediumCaution);
-
             foreach (var mood in entity.Comp.MoodletsOnEat)
                 RaiseLocalEvent(args.User, new MoodEffectEvent(mood));
 
@@ -422,7 +390,7 @@ private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<Alternat
             !ev.CanInteract ||
             !ev.CanAccess ||
             !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
+            !_body.TryGetOrgans<StomachComponent>((ev.User, body), out var stomachs, OrganType.Stomach)) // WD EDIT
             return;
 
         // have to kill mouse before eating it
@@ -456,7 +424,7 @@ public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodCom
         if (!Resolve(food, ref foodComp, false))
             return false;
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(uid, out var stomachs))
+        if (!_body.TryGetOrgans<StomachComponent>(uid, out var stomachs, OrganType.Stomach)) // WD EDIT
             return false;
 
         return IsDigestibleBy(food, foodComp, stomachs);
@@ -466,7 +434,7 @@ public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodCom
     ///     Returns true if <paramref name="stomachs"/> has a <see cref="StomachComponent.SpecialDigestible"/> that whitelists
     ///     this <paramref name="food"/> (or if they even have enough stomachs in the first place).
     /// </summary>
-    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<Entity<StomachComponent, OrganComponent>> stomachs)
+    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<Entity<OrganComponent, StomachComponent>> stomachs) // WD EDIT
     {
         var digestible = true;
 
@@ -478,10 +446,10 @@ private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<Entity
         foreach (var ent in stomachs)
         {
             // Find a stomach with a SpecialDigestible
-            if (ent.Comp1.SpecialDigestible == null)
+            if (ent.Comp2.SpecialDigestible == null) // WD EDIT
                 continue;
             // Check if the food is in the whitelist
-            if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
+            if (_whitelistSystem.IsWhitelistPass(ent.Comp2.SpecialDigestible, food)) // WD EDIT
                 return true;
 
             // They can only eat whitelist food and the food isn't in the whitelist. It's not edible.
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
index 046f1c8d2e1..be76eeb3c92 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
@@ -1,6 +1,5 @@
 using Content.Server.Atmos;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
 using Content.Server.DoAfter;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Nutrition.Components;
@@ -13,6 +12,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition;
 using System.Threading;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Atmos;
 
 /// <summary>
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
index 0d637139d82..3f7b8745dd8 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs
@@ -1,6 +1,4 @@
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Forensics;
 using Content.Shared.Chemistry;
@@ -17,6 +15,9 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using System.Linq;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Bloodstream.Components;
+
 
 namespace Content.Server.Nutrition.EntitySystems
 {
@@ -150,7 +151,7 @@ public override void Update(float frameTime)
                 }
 
                 _reactiveSystem.DoEntityReaction(containerManager.Owner, inhaledSolution, ReactionMethod.Ingestion);
-                _bloodstreamSystem.TryAddToChemicals(containerManager.Owner, inhaledSolution, bloodstream);
+                _bloodstreamSystem.TryAddToBloodstream((containerManager.Owner, bloodstream), inhaledSolution); // WD EDIT
             }
 
             _timer -= UpdateTimer;
diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
index 25ad750095a..35f9e4ae911 100644
--- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
@@ -9,10 +9,10 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
-using Content.Server.Body.Components;
 using Content.Server.Medical;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
@@ -167,9 +167,9 @@ private void SpawnHairball(EntityUid uid, FelinidComponent component)
         var hairball = EntityManager.SpawnEntity(component.HairballPrototype, Transform(uid).Coordinates);
         var hairballComp = Comp<HairballComponent>(hairball);
 
-        if (TryComp<BloodstreamComponent>(uid, out var bloodstream) && bloodstream.ChemicalSolution.HasValue)
+        if (TryComp<BloodstreamComponent>(uid, out var bloodstream) && bloodstream.BloodSolution.HasValue) // WD EDIT
         {
-            var temp = _solutionSystem.SplitSolution(bloodstream.ChemicalSolution.Value, 20);
+            var temp = _solutionSystem.SplitSolutionWithout(bloodstream.BloodSolution.Value, 20, bloodstream.BloodReagent); // WD EDIT
 
             if (_solutionSystem.TryGetSolution(hairball, hairballComp.SolutionName, out var hairballSolution))
             {
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs
index 875a341596c..a28acc53e10 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Results.cs
@@ -1,10 +1,12 @@
 using System.Text;
+using Content.Server._White.Body.Respirator.Components;
 using Content.Server.Atmos.Components;
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Kitchen.Components;
 using Content.Server.Nutrition.Components;
 using Content.Server.Nyanotrasen.Kitchen.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Atmos.Rotting;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Chemistry.Components;
@@ -65,7 +67,7 @@ public bool TryMakeMobIntoFood(EntityUid mob, MobStateComponent mobStateComponen
             if (alreadyHadFood)
                 _solutionContainerSystem.RemoveAllSolution(mobFoodSolution.Value);
 
-            if (TryComp<BloodstreamComponent>(mob, out var bloodstreamComponent) && bloodstreamComponent.ChemicalSolution != null)
+            if (TryComp<BloodstreamComponent>(mob, out var bloodstreamComponent) && bloodstreamComponent.BloodSolution != null) // WD EDIT
             {
                 // Fry off any blood into protein.
                 var bloodSolution = bloodstreamComponent.BloodSolution;
@@ -83,9 +85,9 @@ public bool TryMakeMobIntoFood(EntityUid mob, MobStateComponent mobStateComponen
 
                 // Bring in whatever chemicals they had in them too.
                 mobFoodSolution.Value.Comp.Solution.MaxVolume +=
-                    bloodstreamComponent.ChemicalSolution.Value.Comp.Solution.Volume;
+                    bloodstreamComponent.BloodSolution.Value.Comp.Solution.Volume; // WD EDIT
                 _solutionContainerSystem.AddSolution(mobFoodSolution.Value,
-                    bloodstreamComponent.ChemicalSolution.Value.Comp.Solution);
+                    bloodstreamComponent.BloodSolution.Value.Comp.Solution); // WD EDIT
             }
 
             return true;
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index b31c6ffe94a..d698425ab23 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -54,7 +54,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
             return;
         }
 
-        var ev = new ProjectileHitEvent(component.Damage, target, component.Shooter);
+        var ev = new ProjectileHitEvent(component.Damage, target, component.Shooter, component.BodyPartType); // WD EDIT
         RaiseLocalEvent(uid, ref ev);
 
         var otherName = ToPrettyString(target);
@@ -64,7 +64,7 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
             damageRequired -= damageableComponent.TotalDamage;
             damageRequired = FixedPoint2.Max(damageRequired, FixedPoint2.Zero);
         }
-        var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, damageable: damageableComponent, origin: component.Shooter);
+        var modifiedDamage = _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, damageable: damageableComponent, origin: component.Shooter, bodyPartType: component.BodyPartType); // WD EDIT
         var deleted = Deleted(target);
 
         if (modifiedDamage is not null && EntityManager.EntityExists(component.Shooter))
diff --git a/Content.Server/Shadowkin/ShadowkinSystem.cs b/Content.Server/Shadowkin/ShadowkinSystem.cs
index fabae303a8d..d210f70b2e1 100644
--- a/Content.Server/Shadowkin/ShadowkinSystem.cs
+++ b/Content.Server/Shadowkin/ShadowkinSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Actions;
 using Robust.Shared.Prototypes;
 using Content.Server.Abilities.Psionics;
+using Content.Server.Humanoid;
 
 namespace Content.Server.Shadowkin;
 
@@ -22,6 +23,7 @@ public sealed class ShadowkinSystem : EntitySystem
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!; // WD EDIT
 
     public const string ShadowkinSleepActionId = "ShadowkinActionSleep";
     public override void Initialize()
@@ -56,8 +58,7 @@ private void OnMindbreak(EntityUid uid, ShadowkinComponent component, ref OnMind
         if (TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
         {
             component.OldEyeColor = humanoid.EyeColor;
-            humanoid.EyeColor = component.BlackEyeColor;
-            Dirty(uid, humanoid);
+            _humanoidAppearance.SetEyeColor(uid, component.BlackEyeColor, humanoid: humanoid); // WD EDIT
         }
 
         if (TryComp<StaminaComponent>(uid, out var stamina))
@@ -71,11 +72,7 @@ private void OnRejuvenate(EntityUid uid, ShadowkinComponent component, Rejuvenat
 
         RemComp<MindbrokenComponent>(uid);
 
-        if (TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
-        {
-            humanoid.EyeColor = component.OldEyeColor;
-            Dirty(uid, humanoid);
-        }
+        _humanoidAppearance.SetEyeColor(uid, component.OldEyeColor); // WD EDIT
 
         EnsureComp<PsionicComponent>(uid, out _);
         if (_prototypeManager.TryIndex<PsionicPowerPrototype>("ShadowkinPowers", out var shadowkinPowers))
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index 1fc0f09b07d..2a92543b613 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -5,7 +5,7 @@
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Events;
 using Content.Shared._Lavaland.Shuttles;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Ghost;
@@ -1012,7 +1012,7 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
                 {
                     _logger.Add(LogType.Gib, LogImpact.Extreme, $"{ToPrettyString(ent):player} got gibbed by the shuttle" +
                                                                 $" {ToPrettyString(uid)} arriving from FTL at {xform.Coordinates:coordinates}");
-                    var gibs = _bobby.GibBody(ent, body: mob);
+                    var gibs = _gibbing.GibBody(ent); // WD EDIT
                     _immuneEnts.UnionWith(gibs);
                     continue;
                 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index a64690c1bae..3dd8c01ae6b 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -1,5 +1,6 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Systems;
 using Content.Server.Buckle.Systems;
 using Content.Server.Parallax;
 using Content.Server.Procedural;
@@ -64,6 +65,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     private EntityQuery<BuckleComponent> _buckleQuery;
     private EntityQuery<MapGridComponent> _gridQuery;
diff --git a/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs b/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs
index 4318c824b94..865f25906a6 100644
--- a/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs
+++ b/Content.Server/Silicon/WeldingHealable/WeldingHealableSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Silicon.WeldingHealing;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Silicon.WeldingHealing;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -7,8 +8,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Tools;
-using Content.Shared._Shitmed.Targeting;
-using Content.Shared.Body.Systems;
 using Content.Shared.Tools.Components;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
@@ -104,17 +103,6 @@ private bool HasDamage(Entity<DamageableComponent> damageable, WeldingHealingCom
             if (damageable.Comp.Damage.DamageDict[type.Key].Value > 0)
                 return true;
 
-        // In case the healer is a humanoid entity with targeting, we run the check on the targeted parts.
-        if (!TryComp(user, out TargetingComponent? targeting))
-            return false;
-
-        var (targetType, targetSymmetry) = _bodySystem.ConvertTargetBodyPart(targeting.Target);
-        foreach (var part in _bodySystem.GetBodyChildrenOfType(damageable, targetType, symmetry: targetSymmetry))
-            if (TryComp<DamageableComponent>(part.Id, out var damageablePart))
-                foreach (var type in healable.Damage.DamageDict)
-                    if (damageablePart.Damage.DamageDict[type.Key].Value > 0)
-                        return true;
-
         return false;
     }
 }
diff --git a/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs
index e796a7822d0..056875e766d 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs
@@ -1,8 +1,6 @@
 using System.Threading;
 using Content.Server.Spawners.Components;
 using Robust.Shared.Random;
-using Content.Shared.Friends.Components; // Shitmed Change
-using Content.Shared._Shitmed.Spawners.EntitySystems; // Shitmed Change
 
 namespace Content.Server.Spawners.EntitySystems;
 
@@ -35,11 +33,6 @@ private void OnTimerFired(EntityUid uid, TimedSpawnerComponent component)
         for (var i = 0; i < number; i++)
         {
             var entity = _random.Pick(component.Prototypes);
-            // Shitmed Change Start
-            var spawnedEnt = SpawnAtPosition(entity, coordinates);
-            var ev = new SpawnerSpawnedEvent(spawnedEnt, HasComp<PettableFriendComponent>(spawnedEnt));
-            RaiseLocalEvent(uid, ev);
-            // Shitmed Change End
         }
     }
 
diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs
index d491b957bfb..93dae7ee459 100644
--- a/Content.Server/Species/Systems/NymphSystem.cs
+++ b/Content.Server/Species/Systems/NymphSystem.cs
@@ -1,8 +1,8 @@
 using Content.Server.Mind;
 using Content.Shared.Species.Components;
-using Content.Shared.Body.Events;
 using Content.Shared.Zombies;
 using Content.Server.Zombies;
+using Content.Shared._White.Body.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
@@ -19,15 +19,15 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<NymphComponent, OrganRemovedFromBodyEvent>(OnRemovedFromPart);
+        SubscribeLocalEvent<NymphComponent, OrganRemovedEvent>(OnRemovedFromPart); // WD EDIT
     }
 
-    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemovedFromBodyEvent args)
+    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemovedEvent args) // WD EDIT
     {
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
+        if (!args.Body.HasValue || TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.Body)) // WD EDIT
             return;
 
         if (!_protoManager.TryIndex<EntityPrototype>(comp.EntityPrototype, out var entityProto))
@@ -37,11 +37,11 @@ private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemo
         var coords = Transform(uid).Coordinates;
         var nymph = EntityManager.SpawnAtPosition(entityProto.ID, coords);
 
-        if (HasComp<ZombieComponent>(args.OldBody)) // Zombify the new nymph if old one is a zombie
+        if (HasComp<ZombieComponent>(args.Body)) // Zombify the new nymph if old one is a zombie // WD EDIT
             _zombie.ZombifyEntity(nymph);
 
         // Move the mind if there is one and it's supposed to be transferred
-        if (comp.TransferMind == true && _mindSystem.TryGetMind(args.OldBody, out var mindId, out var mind))
+        if (comp.TransferMind == true && _mindSystem.TryGetMind(args.Body.Value, out var mindId, out var mind)) // WD EDIT
             _mindSystem.TransferTo(mindId, nymph, mind: mind);
 
         // Delete the old organ
diff --git a/Content.Server/Standing/LayingDownSystem.cs b/Content.Server/Standing/LayingDownSystem.cs
index 83e76f5b7bb..1f5c22b5b8a 100644
--- a/Content.Server/Standing/LayingDownSystem.cs
+++ b/Content.Server/Standing/LayingDownSystem.cs
@@ -1,13 +1,6 @@
 using Content.Shared.Standing;
-using Content.Shared.Body.Components; // Goobstation
-using Content.Shared.Body.Part; // Goobstation
 using Content.Shared.CCVar;
-using Content.Shared.Input;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Popups;
 using Robust.Shared.Configuration;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Player;
 
 namespace Content.Server.Standing;
 
@@ -30,36 +23,6 @@ private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs arg
         if (!TryComp(uid, out LayingDownComponent? layingDown))
             return;
 
-        // Goobstation start
-        bool fullyParalyzed = false;
-
-        if (_entMan.TryGetComponent<BodyComponent>(uid, out var body))
-        {
-            foreach (var legEntity in body.LegEntities)
-            {
-                if (_entMan.TryGetComponent<BodyPartComponent>(legEntity, out var partCmp))
-                {
-                    if (partCmp.Enabled != true)
-                    {
-                        fullyParalyzed = true;
-                        continue;
-                    } else if (partCmp.Enabled == true)
-                    {
-                        fullyParalyzed = false;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (fullyParalyzed)
-        {
-            layingDown.AutoGetUp = false;
-            Dirty(uid, layingDown);
-            return;
-        }
-        // Goobstation end
-
         layingDown.AutoGetUp = _cfg.GetClientCVar(args.SenderSession.Channel, CCVars.AutoGetUp);
         Dirty(uid, layingDown);
     }
diff --git a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
index 8b31f598d0d..63ca686d1cd 100644
--- a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
+++ b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Server._White.Body.Respirator.Systems;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Systems;
 using Content.Server.Construction;
 using Content.Server.Construction.Components;
 using Content.Server.Storage.Components;
diff --git a/Content.Server/Tools/Innate/InnateToolSystem.cs b/Content.Server/Tools/Innate/InnateToolSystem.cs
index e7e5be38c44..b79ff3deee1 100644
--- a/Content.Server/Tools/Innate/InnateToolSystem.cs
+++ b/Content.Server/Tools/Innate/InnateToolSystem.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Shared.Body.Part;
 using Content.Shared.Destructible;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
diff --git a/Content.Server/Traits/Assorted/LightweightDrunkSystem.cs b/Content.Server/Traits/Assorted/LightweightDrunkSystem.cs
index f974fe75607..8fecf9721a8 100644
--- a/Content.Server/Traits/Assorted/LightweightDrunkSystem.cs
+++ b/Content.Server/Traits/Assorted/LightweightDrunkSystem.cs
@@ -1,6 +1,4 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chemistry.Reagent;
+using Content.Server._White.Body.Organs.Metabolizer;
 using Content.Shared.Traits.Assorted.Components;
 
 namespace Content.Shared.Traits.Assorted.Systems;
@@ -20,4 +18,4 @@ private void OnTryMetabolizeReagent(EntityUid uid, LightweightDrunkComponent com
         args.Scale *= comp.BoozeStrengthMultiplier;
         args.QuantityMultiplier *= comp.BoozeStrengthMultiplier;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Traits/Assorted/LiquorLifelineSystem.cs b/Content.Server/Traits/Assorted/LiquorLifelineSystem.cs
index 857ddb6d76b..9239d88fe22 100644
--- a/Content.Server/Traits/Assorted/LiquorLifelineSystem.cs
+++ b/Content.Server/Traits/Assorted/LiquorLifelineSystem.cs
@@ -1,6 +1,7 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Body.Components;
+using Content.Server._White.Body.Systems;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
+
 
 namespace Content.Server.Traits.Assorted;
 
@@ -19,20 +20,16 @@ private void OnSpawn(Entity<LiquorLifelineComponent> entity, ref ComponentInit a
         if (!TryComp<BodyComponent>(entity, out var body))
             return;
 
-        if (!_bodySystem.TryGetBodyOrganEntityComps<MetabolizerComponent>((entity, body), out var metabolizers))
+        if (!_bodySystem.TryGetOrgans<MetabolizerComponent>((entity, body), out var metabolizers, OrganType.Liver)) // WD EDIT
             return;
 
         foreach (var metabolizer in metabolizers)
         {
-            if (metabolizer.Comp1.MetabolizerTypes is null
-                || metabolizer.Comp1.MetabolismGroups is null)
-                continue;
-
-            foreach (var metabolismGroup in metabolizer.Comp1.MetabolismGroups)
+            foreach (var metabolismGroup in metabolizer.Comp2.Stages) // WD EDIT
             {
                 // Add the LiquorLifeline metabolizer type to the liver and equivalent organs.
-                if (metabolismGroup.Id == "Alcohol")
-                    metabolizer.Comp1.MetabolizerTypes.Add("LiquorLifeline");
+                if (metabolismGroup.Key == "Absorption") // WD EDIT
+                    metabolizer.Comp2.Types.Add("LiquorLifeline"); // WD EDIT
             }
         }
     }
diff --git a/Content.Server/Traits/BloodDeficiencySystem.cs b/Content.Server/Traits/BloodDeficiencySystem.cs
index 8928bc57a1c..1c4f1d2dde7 100644
--- a/Content.Server/Traits/BloodDeficiencySystem.cs
+++ b/Content.Server/Traits/BloodDeficiencySystem.cs
@@ -1,6 +1,6 @@
-using Content.Server.Body.Components;
 using Content.Server.Body.Events;
 using Content.Server.Traits.Assorted;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.FixedPoint;
 
 namespace Content.Server.Traits;
@@ -19,6 +19,6 @@ private void OnBloodRegen(Entity<BloodDeficiencyComponent> ent, ref NaturalBlood
             return;
 
         args.Amount = FixedPoint2.Min(args.Amount, 0) // If the blood regen amount already was negative, we keep it.
-                      - bloodstream.BloodMaxVolume * ent.Comp.BloodLossPercentage;
+                      - bloodstream.CurrentBloodMaxVolume * ent.Comp.BloodLossPercentage; // WD EDIT
     }
 }
diff --git a/Content.Server/Traits/HemophiliaComponent.cs b/Content.Server/Traits/HemophiliaComponent.cs
index e8f1f57c6e5..28c63b057a9 100644
--- a/Content.Server/Traits/HemophiliaComponent.cs
+++ b/Content.Server/Traits/HemophiliaComponent.cs
@@ -7,15 +7,17 @@ namespace Content.Server.Traits.Assorted;
 [RegisterComponent]
 public sealed partial class HemophiliaComponent : Component
 {
-    // <summary>
-    //   What the BleedReductionAmount should be multiplied by.
-    // </summary>
-    [DataField(required: true)]
-    public float BleedReductionModifier = 1f;
+    // WD EDIT START
+    /// <summary>
+    /// Multiplier to use for the amount of bloodloss reduction during a bleed tick.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float BleedReductionMultiplier = 0.33f;
 
     /// <summary>
-    ///   The damage increase from this trait.
+    /// Multiplier to use for the amount of blood lost during a bleed tick.
     /// </summary>
-    [DataField(required: true)]
-    public DamageModifierSet DamageModifiers = default!;
+    [DataField, AutoNetworkedField]
+    public float BleedAmountMultiplier = 1f;
+    // WD EDIT END
 }
diff --git a/Content.Server/Traits/HemophiliaSystem.cs b/Content.Server/Traits/HemophiliaSystem.cs
index c70c7de37c0..74ea0daec38 100644
--- a/Content.Server/Traits/HemophiliaSystem.cs
+++ b/Content.Server/Traits/HemophiliaSystem.cs
@@ -1,28 +1,20 @@
-using Content.Server.Body.Systems;
-using Content.Server.Body.Components;
-using Content.Shared.Damage;
+using Content.Shared._White.Body.Bloodstream.Systems;
 
 namespace Content.Server.Traits.Assorted;
 
 public sealed class HemophiliaSystem : EntitySystem
 {
+    // WD EDIT START
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<HemophiliaComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<HemophiliaComponent, DamageModifyEvent>(OnDamageModify);
+        SubscribeLocalEvent<HemophiliaComponent, BleedModifierEvent>(OnBleedModifier);
     }
 
-    private void OnStartup(EntityUid uid, HemophiliaComponent component, ComponentStartup args)
+    private void OnBleedModifier(Entity<HemophiliaComponent> ent, ref BleedModifierEvent args)
     {
-        if (!TryComp<BloodstreamComponent>(uid, out var bloodstream))
-            return;
-
-        bloodstream.BleedReductionAmount *= component.BleedReductionModifier;
-    }
-
-    private void OnDamageModify(EntityUid uid, HemophiliaComponent component, DamageModifyEvent args)
-    {
-        args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, component.DamageModifiers);
+        args.BleedReductionAmount *= ent.Comp.BleedReductionMultiplier;
+        args.Bleeding *= ent.Comp.BleedAmountMultiplier;
     }
+    // WD EDIT END
 }
diff --git a/Content.Server/Traits/TraitSystem.Functions.cs b/Content.Server/Traits/TraitSystem.Functions.cs
index 664edf40336..1050be61c6e 100644
--- a/Content.Server/Traits/TraitSystem.Functions.cs
+++ b/Content.Server/Traits/TraitSystem.Functions.cs
@@ -22,12 +22,12 @@
 using Content.Shared.Weapons.Melee;
 using Robust.Shared.Audio;
 using Content.Shared.Tag;
-using Content.Shared.Body.Part;
 using Content.Server.Body.Systems;
-using Content.Shared.Body.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
 using System.Linq;
+using Content.Server._White.Body.Systems;
+using Content.Shared._White.Body.Components;
 using Robust.Shared.Utility;
 using Robust.Shared.GameStates;
 using Content.Shared.Humanoid;
@@ -813,6 +813,7 @@ public override void OnPlayerSpawn(EntityUid uid,
     }
 }
 
+/* TODO
 // <summary>
 //      Replaces a body part with a cybernetic. This is only for limbs such as arms and legs, don't use this for organs(old or new).
 // </summary>
@@ -822,9 +823,6 @@ public sealed partial class TraitCyberneticLimbReplacement : TraitFunction
     [DataField, AlwaysPushInheritance]
     public BodyPartType RemoveBodyPart { get; private set; } = BodyPartType.Arm;
 
-    [DataField, AlwaysPushInheritance]
-    public BodyPartSymmetry PartSymmetry { get; private set; } = BodyPartSymmetry.Left;
-
     [DataField, AlwaysPushInheritance]
     public EntProtoId? ProtoId { get; private set; }
 
@@ -866,7 +864,7 @@ public override void OnPlayerSpawn(EntityUid uid,
                 bodySystem.AttachPart(root.Value.Entity, SlotId, newLimb, root.Value.BodyPart, limbComp);
         }
     }
-}
+}*/
 
 // This may seem self referential, but it's a convenient shorthand for systems other than Traits that also use these functions.
 // By Hullrot's request for the sanity of their contributors.
diff --git a/Content.Server/Vampire/BloodSuckerSystem.cs b/Content.Server/Vampire/BloodSuckerSystem.cs
index 5e4e542c2a4..c9c60d68965 100644
--- a/Content.Server/Vampire/BloodSuckerSystem.cs
+++ b/Content.Server/Vampire/BloodSuckerSystem.cs
@@ -1,3 +1,6 @@
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Server._White.Body.Organs.Stomach;
+using Content.Server._White.Body.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
@@ -8,11 +11,11 @@
 using Content.Shared.Vampiric;
 using Content.Shared.Cocoon;
 using Content.Server.Atmos.Components;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.DoAfter;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.HealthExaminable;
 using Content.Shared.Nutrition.Components;
 using Robust.Shared.Prototypes;
@@ -153,15 +156,15 @@ public bool TrySucc(EntityUid bloodsucker, EntityUid victim, BloodSuckerComponen
                 return false;
 
             // No blood left, yikes.
-            if (_bloodstreamSystem.GetBloodLevelPercentage(victim, bloodstream) == 0.0f)
+            if (_bloodstreamSystem.GetBloodLevel((victim, bloodstream)) == 0.0f) // WD EDIT
                 return false;
 
             // Does bloodsucker have a stomach?
-            var stomachList = _bodySystem.GetBodyOrganEntityComps<StomachComponent>(bloodsucker);
+            var stomachList = _bodySystem.GetOrgans<StomachComponent>(bloodsucker, OrganType.Stomach); // WD EDIT
             if (stomachList.Count == 0)
                 return false;
 
-            if (!_solutionSystem.TryGetSolution(stomachList[0].Owner, StomachSystem.DefaultSolutionName, out var stomachSolution))
+            if (!_solutionSystem.TryGetSolution(stomachList[0].Owner, stomachList[0].Comp2.SolutionName, out var stomachSolution)) // WD EDIT
                 return false;
 
             // Are we too full?
@@ -185,7 +188,7 @@ public bool TrySucc(EntityUid bloodsucker, EntityUid victim, BloodSuckerComponen
                 return false;
 
             var temp = _solutionSystem.SplitSolution(bloodstream.BloodSolution.Value, bloodsuckerComp.UnitsToSucc);
-            _stomachSystem.TryTransferSolution(stomachList[0].Owner, temp, stomachList[0].Comp1);
+            _stomachSystem.TryTransferSolution((stomachList[0].Owner, stomachList[0].Comp2), temp); // WD EDIT
 
             // Add a little pierce
             DamageSpecifier damage = new();
diff --git a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs
index 915d344216c..d65c9c6fbeb 100644
--- a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs
+++ b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Damage;
 using Robust.Shared.Audio;
 
@@ -33,11 +32,12 @@ internal sealed partial class WeaponRandomComponent : Component
     [DataField]
     public bool ApplyBonusOnThrow;
 
-    /// <summary>
+    // TODO
+    /*/// <summary>
     /// Forces all successful throws to target this specific body part.
     /// </summary>
     [DataField]
-    public TargetBodyPart? ForcedThrowTargetPart;
+    public TargetBodyPart? ForcedThrowTargetPart;*/
 
     /// <summary>
     /// Temporary flag indicating that a critical throw is in progress
diff --git a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs
index cb8bb6e201e..a831c3c992d 100644
--- a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs
+++ b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs
@@ -46,13 +46,11 @@ private void OnMeleeHit(EntityUid uid, WeaponRandomComponent component, MeleeHit
     private void OnThrowDoHit(EntityUid uid, WeaponRandomComponent component, ref ThrowDoHitEvent args)
     {
         if (!component.ApplyBonusOnThrow
-            || component.ForcedThrowTargetPart == null
             || !_random.Prob(component.RandomDamageChance))
             return;
 
         component.IsCriticalThrow = true;
         _audio.PlayPvs(component.DamageSound, args.Target);
-        args.TargetPart = component.ForcedThrowTargetPart.Value;
     }
 
     private void OnThrowDamageBonusCheck(EntityUid uid, WeaponRandomComponent component, ref GetThrowingDamageEvent args)
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index e0bb7a703e9..d5ce81b8ad5 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Server._White.TargetDoll;
 using Content.Server.Cargo.Systems;
 using Content.Shared.Contests;
 using Content.Server.Power.EntitySystems;
@@ -42,6 +43,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly ContestsSystem _contests = default!;
     [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!;
+    [Dependency] private readonly TargetDollSystem _targetDoll = default!; // WD EDIT
 
     private const float DamagePitchVariation = 0.05f;
 
@@ -233,7 +235,7 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
 
                         var hitName = ToPrettyString(hitEntity);
                         if (dmg != null)
-                            dmg = Damageable.TryChangeDamage(hitEntity, dmg, origin: user);
+                            dmg = Damageable.TryChangeDamage(hitEntity, dmg, origin: user, bodyPartType: _targetDoll.GetSelectedBodyPart(lastUser)); // WD EDIT
 
                         // check null again, as TryChangeDamage returns modified damage values
                         if (dmg != null)
diff --git a/Content.Server/Wires/WiresComponent.cs b/Content.Server/Wires/WiresComponent.cs
index c47627f1ace..ee8964b7621 100644
--- a/Content.Server/Wires/WiresComponent.cs
+++ b/Content.Server/Wires/WiresComponent.cs
@@ -1,6 +1,5 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Content.Shared.Tag; // Shitmed Change - Starlight Abductors
 
 namespace Content.Server.Wires;
 
@@ -68,12 +67,4 @@ public sealed partial class WiresComponent : Component
 
     [DataField]
     public SoundSpecifier PulseSound = new SoundPathSpecifier("/Audio/Effects/multitool_pulse.ogg");
-
-    // Shitmed Change - Starlight Abductors
-    [ViewVariables]
-    public bool ViewWires = false;
-
-    [DataField]
-    public ProtoId<TagPrototype> ShowWiresTag = "ShowWires";
-    // Shitmed Change End
 }
diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs
index 1aa8b300e08..44348dc5de8 100644
--- a/Content.Server/Wires/WiresSystem.cs
+++ b/Content.Server/Wires/WiresSystem.cs
@@ -10,7 +10,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Power;
-using Content.Shared.Tag; // Shitmed Change
 using Content.Shared.Tools.Components;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
@@ -29,7 +28,6 @@ public sealed class WiresSystem : SharedWiresSystem
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ConstructionSystem _construction = default!;
-    [Dependency] private readonly TagSystem _tags = default!; // Shitmed Change
 
     // This is where all the wire layouts are stored.
     [ViewVariables] private readonly Dictionary<string, WireLayout> _layouts = new();
@@ -456,15 +454,6 @@ private void OnInteractUsing(EntityUid uid, WiresComponent component, InteractUs
         {
             if (TryComp(args.User, out ActorComponent? actor))
             {
-                // Shitmed Change Start
-                if (_tags.HasTag(args.Used, component.ShowWiresTag))
-                    component.ViewWires = true;
-                else
-                    component.ViewWires = false;
-
-                UpdateUserInterface(uid);
-                // Shitmed Change End
-
                 _uiSystem.OpenUi(uid, WiresUiKey.Key, actor.PlayerSession);
                 args.Handled = true;
             }
@@ -559,26 +548,8 @@ private void UpdateUserInterface(EntityUid uid, WiresComponent? wires = null, Us
         var statuses = new List<(int position, object key, object value)>();
         foreach (var (key, value) in wires.Statuses)
         {
-            // Shitmed Change Start
-            var tempValue = value;
-            var lightData = (((int, StatusLightData?)) tempValue);
-            if (lightData.Item2 != null && lightData.Item2 is StatusLightData data)
-            {
-                if (wires.ViewWires)
-                {
-                    var foundWires = wires.WiresList
-                        .Where(wire => wire.OriginalPosition == lightData.Item1)
-                        .ToList();
-                    if (foundWires.Any())
-                    {
-                        var wireLetters = string.Join(", ", foundWires.Select(wire => wire.Letter.ToString()));
-                        data.Text = $"{data.Text}({wireLetters})";
-                    }
-                }
-
-                statuses.Add((lightData.Item1, key, data));
-            }
-            // Shitmed Change End
+            var valueCast = ((int position, StatusLightData? value)) value;
+            statuses.Add((valueCast.position, key, valueCast.value!));
         }
 
         statuses.Sort((a, b) => a.position.CompareTo(b.position));
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index f841ea910e7..6b451316fca 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -1,3 +1,5 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Body.Systems;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
@@ -5,7 +7,7 @@
 using Content.Server.Stack;
 using Content.Server.Storage.Components;
 using Content.Server.Xenoarchaeology.XenoArtifacts;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Power;
 using Content.Shared.Verbs;
@@ -28,6 +30,7 @@ public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -106,10 +109,9 @@ public void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageCompone
                 _artifact.ForceActivateArtifact(contained);
             }
 
-            if (!TryComp<BodyComponent>(contained, out var body))
+            if (!_gibbing.TryGibBody(contained, out var gibs, true)) // WD EDIT
                 Del(contained);
 
-            var gibs = _body.GibBody(contained, body: body, gibOrgans: true);
             foreach (var gib in gibs)
             {
                 ContainerSystem.Insert((gib, null, null, null), crusher.OutputContainer);
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index c8962840d21..1307a6944ee 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -1,3 +1,4 @@
+using Content.Server._White.Body.Respirator.Components;
 using Content.Server.Abilities.Psionics;
 using Content.Server.Atmos.Components;
 using Content.Server.Body.Components;
@@ -14,6 +15,7 @@
 using Content.Server.NPC.Systems;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.CombatMode;
 using Content.Shared.CombatMode.Pacification;
@@ -157,20 +159,13 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
             //store some values before changing them in case the humanoid get cloned later
             zombiecomp.BeforeZombifiedSkinColor = huApComp.SkinColor;
             zombiecomp.BeforeZombifiedEyeColor = huApComp.EyeColor;
-            zombiecomp.BeforeZombifiedCustomBaseLayers = new(huApComp.CustomBaseLayers);
             if (TryComp<BloodstreamComponent>(target, out var stream))
                 zombiecomp.BeforeZombifiedBloodReagent = stream.BloodReagent;
 
             _humanoidAppearance.SetSkinColor(target, zombiecomp.SkinColor, verify: false, humanoid: huApComp);
 
             // Messing with the eye layer made it vanish upon cloning, and also it didn't even appear right
-            huApComp.EyeColor = zombiecomp.EyeColor;
-
-            // this might not resync on clone?
-            _humanoidAppearance.SetBaseLayerId(target, HumanoidVisualLayers.Tail, zombiecomp.BaseLayerExternal, humanoid: huApComp);
-            _humanoidAppearance.SetBaseLayerId(target, HumanoidVisualLayers.HeadSide, zombiecomp.BaseLayerExternal, humanoid: huApComp);
-            _humanoidAppearance.SetBaseLayerId(target, HumanoidVisualLayers.HeadTop, zombiecomp.BaseLayerExternal, humanoid: huApComp);
-            _humanoidAppearance.SetBaseLayerId(target, HumanoidVisualLayers.Snout, zombiecomp.BaseLayerExternal, humanoid: huApComp);
+            _humanoidAppearance.SetEyeColor(target, zombiecomp.EyeColor, humanoid: huApComp); // WD EDIT
 
             //This is done here because non-humanoids shouldn't get baller damage
             //lord forgive me for the hardcoded damage
@@ -199,9 +194,6 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
         //The zombie gets the assigned damage weaknesses and strengths
         _damageable.SetDamageModifierSetId(target, "Zombie");
 
-        //This makes it so the zombie doesn't take bloodloss damage.
-        //NOTE: they are supposed to bleed, just not take damage
-        _bloodstream.SetBloodLossThreshold(target, 0f);
         //Give them zombie blood
         _bloodstream.ChangeBloodReagent(target, zombiecomp.NewBloodReagent);
 
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index 3296220c28a..d504e71b1c9 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -1,6 +1,6 @@
 using System.Linq;
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.Actions;
-using Content.Server.Body.Systems;
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
 using Content.Server.Emoting.Systems;
@@ -285,14 +285,9 @@ public bool UnZombify(EntityUid source, EntityUid target, ZombieComponent? zombi
             if (!Resolve(source, ref zombiecomp))
                 return false;
 
-            foreach (var (layer, info) in zombiecomp.BeforeZombifiedCustomBaseLayers)
-            {
-                _humanoidAppearance.SetBaseLayerColor(target, layer, info.Color);
-                _humanoidAppearance.SetBaseLayerId(target, layer, info.Id);
-            }
             if (TryComp<HumanoidAppearanceComponent>(target, out var appcomp))
             {
-                appcomp.EyeColor = zombiecomp.BeforeZombifiedEyeColor;
+                _humanoidAppearance.SetEyeColor(target, zombiecomp.BeforeZombifiedEyeColor, false, appcomp); // WD EDIT
             }
             _humanoidAppearance.SetSkinColor(target, zombiecomp.BeforeZombifiedSkinColor, false);
             _bloodstream.ChangeBloodReagent(target, zombiecomp.BeforeZombifiedBloodReagent);
diff --git a/Content.Server/_EE/DeleteOnMapInit/DeleteOnMapInitSystem.cs b/Content.Server/_EE/DeleteOnMapInit/DeleteOnMapInitSystem.cs
index d239da3622f..ec77a5b3fbc 100644
--- a/Content.Server/_EE/DeleteOnMapInit/DeleteOnMapInitSystem.cs
+++ b/Content.Server/_EE/DeleteOnMapInit/DeleteOnMapInitSystem.cs
@@ -1,5 +1,3 @@
-using Content.Shared._Shitmed.Body.Events;
-
 namespace Content.Server._EE.DeleteOnMapInit
 {
     public sealed partial class DeleteOnMapInitSystem : EntitySystem
@@ -13,8 +11,6 @@ public override void Initialize()
 
         private void OnMapInit(EntityUid uid, DeleteOnMapInitComponent comp, MapInitEvent args)
         {
-            ///var ev = new AmputateAttemptEvent(uid);
-            ///RaiseLocalEvent(uid, ref ev);
             EntityManager.QueueDeleteEntity(uid);
         }
     }
diff --git a/Content.Server/_EE/EntityEffects/HealShadowling.cs b/Content.Server/_EE/EntityEffects/HealShadowling.cs
index 8787020c490..216f821e98d 100644
--- a/Content.Server/_EE/EntityEffects/HealShadowling.cs
+++ b/Content.Server/_EE/EntityEffects/HealShadowling.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Damage;
 using Content.Shared.EntityEffects;
 using Content.Shared.FixedPoint;
-using Content.Shared._Shitmed.Targeting;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 
@@ -48,9 +47,6 @@ public override void Effect(EntityEffectBaseArgs args)
                 args.TargetEntity,
                 Damage * scale,
                 IgnoreResistances,
-                interruptsDoAfters: false,
-                targetPart: TargetBodyPart.All,
-                partMultiplier: 0.5f,
-                canSever: false);
+                interruptsDoAfters: false);
     }
 }
diff --git a/Content.Server/_EE/Shadowling/Systems/Abilities/Ascension/ShadowlingAnnihilateSystem.cs b/Content.Server/_EE/Shadowling/Systems/Abilities/Ascension/ShadowlingAnnihilateSystem.cs
index fbac1ac45f8..8234fe04f5f 100644
--- a/Content.Server/_EE/Shadowling/Systems/Abilities/Ascension/ShadowlingAnnihilateSystem.cs
+++ b/Content.Server/_EE/Shadowling/Systems/Abilities/Ascension/ShadowlingAnnihilateSystem.cs
@@ -1,7 +1,7 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Actions;
 using Content.Shared._EE.Shadowling;
-using Content.Shared.Gibbing.Events;
-using Content.Server.Body.Systems;
 
 
 namespace Content.Server._EE.Shadowling;
@@ -15,6 +15,7 @@ public sealed class ShadowlingAnnihilateSystem : EntitySystem
 {
     [Dependency] private readonly BodySystem _body = default!;
     [Dependency] private readonly ActionsSystem _actions = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -29,8 +30,8 @@ private void OnAnnihilate(EntityUid uid, ShadowlingAnnihilateComponent component
         var target = args.Target;
         if (HasComp<ShadowlingComponent>(target))
             return;
-        
-        _body.GibBody(target, contents: GibContentsOption.Gib);
+
+        _gibbing.GibBody(target); // WD EDIT
 
         _actions.StartUseDelay(args.Action);
     }
diff --git a/Content.Server/_EE/Xelthia/XelthiaSystem.cs b/Content.Server/_EE/Xelthia/XelthiaSystem.cs
index d338b20ce59..949a73208ef 100644
--- a/Content.Server/_EE/Xelthia/XelthiaSystem.cs
+++ b/Content.Server/_EE/Xelthia/XelthiaSystem.cs
@@ -1,6 +1,8 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Server._White.Body.Systems;
 using Content.Shared._EE.Xelthia;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Abilities.Psionics;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -16,8 +18,6 @@
 using Robust.Shared.Prototypes;
 using Content.Shared.Examine;
 using Content.Shared.Actions.Events;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Placement;
@@ -43,7 +43,7 @@ public sealed class XelthiaSystem : EntitySystem
     [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
 
     //public const string XelthiaRegenerateActionId = "XelthiaRegenerateAction";
-    public override void Initialize()
+     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<XelthiaComponent, ComponentStartup>(OnInit);
@@ -69,31 +69,28 @@ private void OnRegrowthAction(EntityUid uid, XelthiaComponent component, ArmRegr
         if (!_entityManager.TryGetComponent(uid, out BodyComponent? body)
             || !_entityManager.TryGetComponent(uid, out TransformComponent? xform))
             return;
-        var root = bodySystem.GetRootPartOrNull(uid, body);
-        if (root is null)
+        if (bodySystem.TryGetRootBodyPart((uid, body), out var root) || !root.HasValue) // WD EDIT
             return;
-        var parts = bodySystem.GetBodyChildrenOfType(uid, BodyPartType.Arm, body); // Deletes Arms and hands
+        var parts = bodySystem.GetBodyParts((uid, body), BodyPartType.Arm); // Deletes Arms and hands // WD EDIT
         foreach (var part in parts)
         {
-            foreach (var child in bodySystem.GetBodyPartChildren(part.Id, part.Component))
-                _entityManager.QueueDeleteEntity(child.Id);
-            transformSystem.AttachToGridOrMap(part.Id);
-            _entityManager.QueueDeleteEntity(part.Id);
+            transformSystem.AttachToGridOrMap(part); // WD EDIT
+            _entityManager.QueueDeleteEntity(part); // WD EDIT
             _entityManager.SpawnAtPosition("FoodMeatXelthiaTentacle", xform.Coordinates); // Should drop arms equal to the number attached
         }
         // Right Side
         var newLimb = _entityManager.SpawnAtPosition("RightArmXelthia", xform.Coordinates); // Copy-Pasted Code for arm spawning
         if (_entityManager.TryGetComponent(newLimb, out BodyPartComponent? limbComp))
-            bodySystem.AttachPart(root.Value.Entity, "right arm", newLimb, root.Value.BodyPart, limbComp);
+            bodySystem.TryAttachBodyPart(root.Value, (newLimb, limbComp), "right_arm"); // WD EDIT
         var newerLimb = _entityManager.SpawnAtPosition("RightHandXelthia", xform.Coordinates); // Spawns the hand
         Enum.TryParse<BodyPartType>("Hand", out var partType);
-        bodySystem.TryCreatePartSlotAndAttach(newLimb, "right hand", newerLimb, partType);
+        bodySystem.TryCreateBodyPartSlotAndAttachBodyPart(newLimb, newerLimb, "right_hand", partType); // WD EDIT
         // Left Side
         newLimb = _entityManager.SpawnAtPosition("LeftArmXelthia", xform.Coordinates); // Copy-Pasted Code for arm spawning
         if (_entityManager.TryGetComponent(newLimb, out BodyPartComponent? limbComp2))
-            bodySystem.AttachPart(root.Value.Entity, "left arm", newLimb, root.Value.BodyPart, limbComp2);
+            bodySystem.TryAttachBodyPart(root.Value, (newLimb, limbComp2), "left_arm"); // WD EDIT
         newerLimb = _entityManager.SpawnAtPosition("LeftHandXelthia", xform.Coordinates); // Spawns the hand
-        bodySystem.TryCreatePartSlotAndAttach(newLimb, "left hand", newerLimb, partType);
+        bodySystem.TryCreateBodyPartSlotAndAttachBodyPart(newLimb, newerLimb, "left_hand", partType); // WD EDIT
         _entityManager.EntitySysManager.GetEntitySystem<SharedAudioSystem>()
             .PlayPvs("/Audio/_EE/Voice/Xelthia/regrow.ogg", uid, null);
 
@@ -101,6 +98,6 @@ private void OnRegrowthAction(EntityUid uid, XelthiaComponent component, ArmRegr
 
         TryComp<BloodstreamComponent>(uid, out var stream);
         solution.AddReagent("XelthiaArmJuice", 3.5);
-        _bloodstreamSystem.TryAddToChemicals(uid, solution, stream);
+        _bloodstreamSystem.TryAddToBloodstream((uid, stream), solution); // WD EDIT
     }
 }
diff --git a/Content.Server/_Goobstation/Blob/BlobCarrierSystem.cs b/Content.Server/_Goobstation/Blob/BlobCarrierSystem.cs
index 69213123527..2b8f554a347 100644
--- a/Content.Server/_Goobstation/Blob/BlobCarrierSystem.cs
+++ b/Content.Server/_Goobstation/Blob/BlobCarrierSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Actions;
 using Content.Server.Language;
-using Content.Server.Body.Systems;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind;
@@ -14,6 +13,7 @@
 using Robust.Shared.Prototypes;
 using Content.Shared.Language.Events;
 using Content.Server._Goobstation.Blob.Systems;
+using Content.Server._White.Gibbing;
 
 namespace Content.Server._Goobstation.Blob;
 
@@ -22,9 +22,9 @@ public sealed class BlobCarrierSystem : SharedBlobCarrierSystem
     [Dependency] private readonly BlobCoreSystem _blobCoreSystem = default!;
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly GhostRoleSystem _ghost = default!;
-    [Dependency] private readonly BodySystem _bodySystem = default!;
     [Dependency] private readonly ActionsSystem _action = default!;
     [Dependency] private readonly LanguageSystem _language = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     public override void Initialize()
     {
@@ -115,6 +115,6 @@ protected override void TransformToBlob(Entity<BlobCarrierComponent> ent)
             Spawn(ent.Comp.CoreBlobPrototype, xform.Coordinates);
         }
 
-        _bodySystem.GibBody(ent);
+        _gibbing.GibBody(ent.Owner); // WD EDIT
     }
 }
diff --git a/Content.Server/_Goobstation/Blob/Systems/BlobMobSystem.cs b/Content.Server/_Goobstation/Blob/Systems/BlobMobSystem.cs
index 616359ca3e6..a27e255e958 100644
--- a/Content.Server/_Goobstation/Blob/Systems/BlobMobSystem.cs
+++ b/Content.Server/_Goobstation/Blob/Systems/BlobMobSystem.cs
@@ -12,7 +12,6 @@
 using Robust.Shared.Player;
 using Content.Shared.Language.Events;
 using Content.Shared.Language.Components;
-using Content.Shared._Shitmed.Targeting;
 
 namespace Content.Server._Goobstation.Blob.Systems;
 
@@ -112,5 +111,5 @@ private void OnSpokeAdd(Entity<BlobSpeakComponent> ent, ref ComponentStartup arg
     }
 
     private void OnPulsed(EntityUid uid, BlobMobComponent component, BlobMobGetPulseEvent args) =>
-        _damageableSystem.TryChangeDamage(uid, component.HealthOfPulse, targetPart: TargetBodyPart.All);
+        _damageableSystem.TryChangeDamage(uid, component.HealthOfPulse);
 }
diff --git a/Content.Server/_Goobstation/Blob/Systems/ZombieBlobSystem.cs b/Content.Server/_Goobstation/Blob/Systems/ZombieBlobSystem.cs
index 5e5df32cfe4..edb2d46e41a 100644
--- a/Content.Server/_Goobstation/Blob/Systems/ZombieBlobSystem.cs
+++ b/Content.Server/_Goobstation/Blob/Systems/ZombieBlobSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.Atmos.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Respirator.Systems;
+using Content.Server.Atmos.Components;
 using Content.Server.Chat.Managers;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Mind;
diff --git a/Content.Server/_Goobstation/Changeling/ChangelingEggSystem.cs b/Content.Server/_Goobstation/Changeling/ChangelingEggSystem.cs
index b46b5667502..7d51b330384 100644
--- a/Content.Server/_Goobstation/Changeling/ChangelingEggSystem.cs
+++ b/Content.Server/_Goobstation/Changeling/ChangelingEggSystem.cs
@@ -1,7 +1,7 @@
+using Content.Server._White.Gibbing;
 using Robust.Shared.Timing;
 using Content.Shared.Changeling;
 using Content.Shared.Mind;
-using Content.Server.Body.Systems;
 using Content.Shared.Mind.Components;
 
 namespace Content.Server.Changeling;
@@ -9,9 +9,9 @@ namespace Content.Server.Changeling;
 public sealed class ChangelingEggSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly BodySystem _bodySystem = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
     [Dependency] private readonly ChangelingSystem _changeling = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     public override void Update(float frameTime)
     {
@@ -39,7 +39,7 @@ public void Cycle(EntityUid uid, ChangelingEggComponent comp)
 
         if (TerminatingOrDeleted(comp.LingMind))
         {
-            _bodySystem.GibBody(uid);
+            _gibbing.GibBody(uid); // WD EDIT
             return;
         }
 
@@ -55,6 +55,6 @@ public void Cycle(EntityUid uid, ChangelingEggComponent comp)
         if (comp.AugmentedEyesightPurchased)
             _changeling.InitializeAugmentedEyesight(newUid);
 
-        _bodySystem.GibBody(uid);
+        _gibbing.GibBody(uid); // WD EDIT
     }
 }
diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
index 27e7a300ab4..f194946bd61 100644
--- a/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
+++ b/Content.Server/_Goobstation/Changeling/ChangelingSystem.Abilities.cs
@@ -782,7 +782,7 @@ public void OnLayEgg(EntityUid uid, ChangelingComponent comp, ref StingLayEggsEv
 
         PlayMeatySound(uid, comp);
 
-        _bodySystem.GibBody(uid);
+        _gibbing.GibBody(uid); // WD EDIT
     }
 
     #endregion
diff --git a/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs b/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs
index d3c0be5bfac..d3d21e66219 100644
--- a/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs
+++ b/Content.Server/_Goobstation/Changeling/ChangelingSystem.cs
@@ -22,7 +22,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Damage;
 using Robust.Shared.Prototypes;
-using Content.Server.Body.Systems;
 using Content.Shared.Actions;
 using Content.Shared.Polymorph;
 using Robust.Shared.Serialization.Manager;
@@ -56,6 +55,9 @@
 using Content.Shared.Jittering;
 using Content.Server.Explosion.EntitySystems;
 using System.Linq;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Flash.Components;
 using Content.Server.Radio.Components;
 // using Content.Shared.Heretic;
@@ -117,6 +119,7 @@ public sealed partial class ChangelingSystem : SharedChangelingSystem
     [Dependency] private readonly SelectableAmmoSystem _selectableAmmo = default!;
     [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
     [Dependency] private readonly SharedSuicideSystem _suicide = default!; // WD EDIT
+    [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
     public EntProtoId ArmbladePrototype = "ArmBladeChangeling";
     public EntProtoId FakeArmbladePrototype = "FakeArmBladeChangeling";
@@ -689,13 +692,6 @@ private void OnStartup(EntityUid uid, ChangelingComponent comp, ref ComponentSta
         radio.Channels = new() { "Hivemind" };
         transmitter.Channels = new() { "Hivemind" };
         //WD edit end
-
-        // Shitmed: Prevent changelings from getting their body parts severed
-        foreach (var (id, part) in _bodySystem.GetBodyChildren(uid))
-        {
-            part.CanSever = false;
-            Dirty(id, part);
-        }
     }
 
     private void OnMobStateChange(EntityUid uid, ChangelingComponent comp, ref MobStateChangedEvent args)
diff --git a/Content.Server/_Goobstation/Devil/CheatDeath/CheatDeathSystem.cs b/Content.Server/_Goobstation/Devil/CheatDeath/CheatDeathSystem.cs
index e76adfecfde..b343e1e2aad 100644
--- a/Content.Server/_Goobstation/Devil/CheatDeath/CheatDeathSystem.cs
+++ b/Content.Server/_Goobstation/Devil/CheatDeath/CheatDeathSystem.cs
@@ -6,7 +6,6 @@
 
 using Content.Shared._Goobstation.DelayedDeath;
 using Content.Shared._Goobstation.CheatDeath;
-using Content.Server._Shitmed.DelayedDeath;
 using Content.Server.Actions;
 using Content.Server.Administration.Systems;
 using Content.Server.Jittering;
diff --git a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.ContractEvents.cs b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.ContractEvents.cs
index 0edd0094b43..dcc9bc5e3bb 100644
--- a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.ContractEvents.cs
+++ b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.ContractEvents.cs
@@ -9,9 +9,8 @@
 using System.Linq;
 using Content.Shared._Goobstation.Devil;
 using Content.Server.Body.Components;
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
+using Content.Shared._White.Body.Components;
+using Content.Shared.Random.Helpers;
 using Robust.Shared.Random;
 
 namespace Content.Server._Goobstation.Devil.Contract;
@@ -58,9 +57,9 @@ private void OnLoseHand(DevilContractLoseHandEvent args)
         // QueueDel(pick.Id);
 
         var baseXform = Transform(args.Target);
-        foreach (var part in _bodySystem.GetBodyChildrenOfType(args.Target, BodyPartType.Hand, body))
+        foreach (var part in _bodySystem.GetBodyParts((args.Target, body), BodyPartType.Hand)) // WD EDIT
         {
-            _transform.AttachToGridOrMap(part.Id);
+            _transform.AttachToGridOrMap(part.Owner); // WD EDIT
             break;
         }
     }
@@ -87,28 +86,31 @@ private void OnLoseLeg(DevilContractLoseLegEvent args)
         // _sawmill.Debug($"Removed part {ToPrettyString(pick.Id)} from {ToPrettyString(args.Target)}");
         // QueueDel(pick.Id);
         var baseXform = Transform(args.Target);
-        foreach (var part in _bodySystem.GetBodyChildrenOfType(args.Target, BodyPartType.Leg, body))
+        foreach (var part in _bodySystem.GetBodyParts((args.Target, body), BodyPartType.Leg)) // WD EDIT
         {
-            _transform.AttachToGridOrMap(part.Id);
+            _transform.AttachToGridOrMap(part.Owner);
             break;
         }
     }
 
     private void OnLoseOrgan(DevilContractLoseOrganEvent args)
     {
+        // WD EDIT START
+        if (!TryComp<BodyComponent>(args.Target, out var body))
+            return;
+
         // don't remove the brain, as funny as that is.
-        var eligibleOrgans = _bodySystem.GetBodyOrgans(args.Target)
-            .Where(o => !HasComp<BrainComponent>(o.Id))
+        var eligibleOrgans = _bodySystem.GetOrgans((args.Target, body))
+            .Where(o => !HasComp<BrainComponent>(o.Owner))
             .ToList();
+        // WD EDIT END
 
         if (eligibleOrgans.Count <= 0)
             return;
 
         var pick = _random.Pick(eligibleOrgans);
 
-        _bodySystem.RemoveOrgan(pick.Id, pick.Component);
-        _sawmill.Debug($"Removed part {ToPrettyString(pick.Id)} from {ToPrettyString(args.Target)}");
-        QueueDel(pick.Id);
+        QueueDel(pick.Owner); // WD EDIT
     }
 
     // LETS GO GAMBLING!!!!!
diff --git a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs
index cedc7c209eb..8f0ff0ec36a 100644
--- a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs
+++ b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs
@@ -15,7 +15,7 @@
 using Content.Shared._Goobstation.Devil.Condemned;
 using Content.Shared._Goobstation.Devil.Contract;
 using Content.Server._Imp.Drone;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Systems;
 using Content.Server.Hands.Systems;
 using Content.Server.Implants;
 using Content.Server.Paper;
diff --git a/Content.Server/_Goobstation/Devil/DevilSystem.cs b/Content.Server/_Goobstation/Devil/DevilSystem.cs
index 03a5f9b6cdf..51f6592833d 100644
--- a/Content.Server/_Goobstation/Devil/DevilSystem.cs
+++ b/Content.Server/_Goobstation/Devil/DevilSystem.cs
@@ -9,6 +9,7 @@
 using Content.Server._Goobstation.Devil.Contract;
 using Content.Server._Goobstation.Devil.Objectives.Components;
 using Content.Server._Goobstation.Possession;
+using Content.Server._White.Body.Systems;
 using Content.Shared._Goobstation.Bible;
 using Content.Shared._Goobstation.CheatDeath;
 using Content.Shared._Goobstation.CrematorImmune;
@@ -20,7 +21,6 @@
 using Content.Server.Administration.Systems;
 using Content.Server.Atmos.Components;
 using Content.Server.Bible.Components;
-using Content.Server.Body.Systems;
 using Content.Server.Chat.Systems;
 using Content.Server.Destructible;
 using Content.Server.Hands.Systems;
@@ -34,7 +34,6 @@
 using Content.Server.Temperature.Components;
 using Content.Server.Zombies;
 using Content.Shared.Silicon.Components;
-using Content.Shared._Shitmed.Body.Components;
 using Content.Shared.Actions;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage;
@@ -113,7 +112,6 @@ private void OnStartup(Entity<DevilComponent> devil, ref MapInitEvent args)
 
         // Adjust stats
         EnsureComp<ZombieImmuneComponent>(devil);
-        EnsureComp<BreathingImmunityComponent>(devil);
         EnsureComp<PressureImmunityComponent>(devil);
         EnsureComp<ActiveListenerComponent>(devil);
         EnsureComp<WeakToHolyComponent>(devil).AlwaysTakeHoly = true;
diff --git a/Content.Server/_Goobstation/EntityEffects/EffectConditions/UniqueBloodstreamChemThreshold.cs b/Content.Server/_Goobstation/EntityEffects/EffectConditions/UniqueBloodstreamChemThreshold.cs
index 6a173a23980..6df80b9424c 100644
--- a/Content.Server/_Goobstation/EntityEffects/EffectConditions/UniqueBloodstreamChemThreshold.cs
+++ b/Content.Server/_Goobstation/EntityEffects/EffectConditions/UniqueBloodstreamChemThreshold.cs
@@ -1,4 +1,5 @@
-using Content.Server.Body.Components;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.EntityEffects;
 using Robust.Shared.Prototypes;
@@ -17,9 +18,10 @@ public override bool Condition(EntityEffectBaseArgs args)
     {
         if (args.EntityManager.TryGetComponent<BloodstreamComponent>(args.TargetEntity, out var blood))
         {
-            if (args.EntityManager.System<SharedSolutionContainerSystem>().ResolveSolution(args.TargetEntity, blood.ChemicalSolutionName, ref blood.ChemicalSolution, out var chemSolution))
-                return chemSolution.Contents.Count > Min && chemSolution.Contents.Count < Max;
-            return false;
+            // WD EDIT START
+            var reagents = args.EntityManager.System<BloodstreamSystem>().GetChemicals((args.TargetEntity, blood));
+            return reagents.Count > Min && reagents.Count < Max;
+            // WD EDIT END
         }
         throw new NotImplementedException();
     }
diff --git a/Content.Server/_Imp/Drone/DroneSystem.cs b/Content.Server/_Imp/Drone/DroneSystem.cs
index 7de19cff141..ad8c638df3e 100644
--- a/Content.Server/_Imp/Drone/DroneSystem.cs
+++ b/Content.Server/_Imp/Drone/DroneSystem.cs
@@ -1,9 +1,8 @@
-using Content.Server.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Popups;
 using Content.Server.Tools.Innate;
 using Content.Shared.UserInterface;
-using Content.Shared.Body.Components;
 using Content.Shared._Imp.Drone;
 using Content.Shared.Emoting;
 using Content.Shared.Examine;
@@ -24,7 +23,6 @@ namespace Content.Server._Imp.Drone
 {
     public sealed class DroneSystem : SharedDroneSystem
     {
-        [Dependency] private readonly BodySystem _bodySystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
         [Dependency] private readonly EntityLookupSystem _lookup = default!;
@@ -33,6 +31,7 @@ public sealed class DroneSystem : SharedDroneSystem
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+        [Dependency] private readonly GibbingSystem _gibbing = default!; // WD EDIT
 
         public override void Initialize()
         {
@@ -110,8 +109,7 @@ private void OnMobStateChanged(EntityUid uid, DroneComponent drone, MobStateChan
                 if (TryComp<InnateToolComponent>(uid, out var innate))
                     _innateToolSystem.Cleanup(uid, innate);
 
-                if (TryComp<BodyComponent>(uid, out var body))
-                    _bodySystem.GibBody(uid, body: body);
+                _gibbing.GibBody(uid); // WD EDIT
                 QueueDel(uid);
             }
         }
diff --git a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Actions.cs b/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Actions.cs
deleted file mode 100644
index 584a66d98fc..00000000000
--- a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Actions.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared.Actions;
-using Content.Shared.DoAfter;
-using Content.Shared.Effects;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Spawners;
-using Robust.Shared.Audio.Systems;
-using Content.Shared.Movement.Pulling.Systems;
-using Content.Shared.Movement.Pulling.Components;
-
-namespace Content.Server._Shitmed.Antags.Abductor;
-
-public sealed partial class AbductorSystem : SharedAbductorSystem
-{
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] private readonly PullingSystem _pullingSystem = default!;
-    private static readonly ISawmill _sawmill = Logger.GetSawmill("abductor");
-
-    private static readonly EntProtoId<InstantActionComponent> SendYourself = "ActionSendYourself";
-    private static readonly EntProtoId<InstantActionComponent> ExitAction = "ActionExitConsole";
-    private static readonly EntProtoId TeleportationEffect = "EffectTeleportation";
-    private static readonly EntProtoId TeleportationEffectEntity = "EffectTeleportationEntity";
-
-    public void InitializeActions()
-    {
-        SubscribeLocalEvent<AbductorScientistComponent, ComponentStartup>(AbductorScientistComponentStartup);
-
-        SubscribeLocalEvent<ExitConsoleEvent>(OnExit);
-
-        SubscribeLocalEvent<AbductorReturnToShipEvent>(OnReturn);
-        SubscribeLocalEvent<AbductorScientistComponent, AbductorReturnDoAfterEvent>(OnDoAfterAbductorReturn);
-
-        SubscribeLocalEvent<SendYourselfEvent>(OnSendYourself);
-        SubscribeLocalEvent<AbductorScientistComponent, AbductorSendYourselfDoAfterEvent>(OnDoAfterSendYourself);
-    }
-
-    private void AbductorScientistComponentStartup(Entity<AbductorScientistComponent> ent, ref ComponentStartup args)
-        => ent.Comp.SpawnPosition = EnsureComp<TransformComponent>(ent).Coordinates;
-
-    private void OnReturn(AbductorReturnToShipEvent ev)
-    {
-        EnsureComp<AbductorScientistComponent>(ev.Performer, out var abductorScientistComponent);
-        AddTeleportationEffect(ev.Performer, 3.0f, TeleportationEffectEntity, out var effectEnt, true, true);
-
-        if (abductorScientistComponent.SpawnPosition.HasValue)
-        {
-            var effect = _entityManager.SpawnEntity(TeleportationEffect, abductorScientistComponent.SpawnPosition.Value);
-            EnsureComp<TimedDespawnComponent>(effect, out var despawnComp);
-            despawnComp.Lifetime = 3.0f;
-            _audioSystem.PlayPvs("/Audio/_Shitmed/Misc/alien_teleport.ogg", effect);
-        }
-
-        var doAfter = new DoAfterArgs(EntityManager, ev.Performer, TimeSpan.FromSeconds(3), new AbductorReturnDoAfterEvent(), ev.Performer)
-        {
-            MultiplyDelay = false,
-        };
-        _doAfter.TryStartDoAfter(doAfter);
-        ev.Handled = true;
-    }
-    private void OnDoAfterAbductorReturn(Entity<AbductorScientistComponent> ent, ref AbductorReturnDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled)
-            return;
-
-        _color.RaiseEffect(Color.FromHex("#BA0099"), new List<EntityUid>(1) { ent }, Filter.Pvs(ent, entityManager: EntityManager));
-        StopPulls(ent);
-        if (ent.Comp.SpawnPosition is not null)
-            _xformSys.SetCoordinates(ent, ent.Comp.SpawnPosition.Value);
-        OnCameraExit(ent);
-    }
-
-    private void OnSendYourself(SendYourselfEvent ev)
-    {
-        _sawmill.Debug($"{ToPrettyString(ev.Performer)}");
-        AddTeleportationEffect(ev.Performer, 5.0f, TeleportationEffectEntity, out var effectEnt, true, false);
-        var effect = _entityManager.SpawnEntity(TeleportationEffect, ev.Target);
-        EnsureComp<TimedDespawnComponent>(effect, out var _);
-
-        var @event = new AbductorSendYourselfDoAfterEvent(GetNetCoordinates(ev.Target));
-        var doAfter = new DoAfterArgs(EntityManager, ev.Performer, TimeSpan.FromSeconds(5), @event, ev.Performer);
-        _doAfter.TryStartDoAfter(doAfter);
-        ev.Handled = true;
-    }
-    private void OnDoAfterSendYourself(Entity<AbductorScientistComponent> ent, ref AbductorSendYourselfDoAfterEvent args)
-    {
-        _color.RaiseEffect(Color.FromHex("#BA0099"), new List<EntityUid>(1) { ent }, Filter.Pvs(ent, entityManager: EntityManager));
-        StopPulls(ent);
-        _xformSys.SetCoordinates(ent, GetCoordinates(args.TargetCoordinates));
-        OnCameraExit(ent);
-    }
-
-    private void OnExit(ExitConsoleEvent ev) => OnCameraExit(ev.Performer);
-
-    private void AddActions(AbductorBeaconChosenBuiMsg args)
-    {
-        EnsureComp<AbductorsAbilitiesComponent>(args.Actor, out var comp);
-        comp.HiddenActions = _actions.HideActions(args.Actor);
-        _actions.AddAction(args.Actor, ref comp.ExitConsole, ExitAction);
-        _actions.AddAction(args.Actor, ref comp.SendYourself, SendYourself);
-    }
-    private void RemoveActions(EntityUid actor)
-    {
-        EnsureComp<AbductorsAbilitiesComponent>(actor, out var comp);
-        _actions.RemoveAction(actor, comp.ExitConsole);
-        _actions.RemoveAction(actor, comp.SendYourself);
-        _actions.UnHideActions(actor, comp.HiddenActions);
-    }
-
-    private void StopPulls(EntityUid ent)
-    {
-        if (_pullingSystem.IsPulling(ent))
-        {
-            if (!TryComp<PullerComponent>(ent, out var pullerComp)
-                || pullerComp.Pulling == null
-                || !TryComp<PullableComponent>(pullerComp.Pulling.Value, out var pullableComp)
-                || !_pullingSystem.TryStopPull(pullerComp.Pulling.Value, pullableComp)) return;
-        }
-
-        if (_pullingSystem.IsPulled(ent))
-        {
-            if (!TryComp<PullableComponent>(ent, out var pullableComp)
-                || !_pullingSystem.TryStopPull(ent, pullableComp)) return;
-        }
-    }
-
-    private void AddTeleportationEffect(EntityUid performer,
-        float lifetime,
-        EntProtoId effectEntity,
-        out EntityUid effectEnt,
-        bool applyColor = true,
-        bool playAudio = true)
-    {
-        if (applyColor)
-            _color.RaiseEffect(Color.FromHex("#BA0099"), new List<EntityUid>(1) { performer }, Filter.Pvs(performer, entityManager: EntityManager));
-
-        EnsureComp<TransformComponent>(performer, out var xform);
-        effectEnt = SpawnAttachedTo(effectEntity, xform.Coordinates);
-        _xformSys.SetParent(effectEnt, performer);
-        EnsureComp<TimedDespawnComponent>(effectEnt, out var despawnComp);
-        despawnComp.Lifetime = lifetime;
-
-        if (playAudio)
-            _audioSystem.PlayPvs("/Audio/_Shitmed/Misc/alien_teleport.ogg", effectEnt);
-    }
-}
diff --git a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Console.cs b/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Console.cs
deleted file mode 100644
index 616b493817d..00000000000
--- a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Console.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared._Shitmed.ItemSwitch;
-using Content.Shared._Shitmed.ItemSwitch.Components;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared.DoAfter;
-using Content.Shared.Interaction.Components;
-using Content.Shared.Mind.Components;
-using Content.Shared.Mind;
-using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.Objectives.Components;
-using Content.Server.Objectives.Systems;
-using Content.Shared.UserInterface;
-using Robust.Shared.Spawners;
-using System.Linq;
-
-namespace Content.Server._Shitmed.Antags.Abductor;
-
-public sealed partial class AbductorSystem : SharedAbductorSystem
-{
-    [Dependency] private readonly NumberObjectiveSystem _number = default!;
-    [Dependency] private readonly SharedItemSwitchSystem _itemSwitch = default!;
-    public void InitializeConsole()
-    {
-        SubscribeLocalEvent<AbductorConsoleComponent, BeforeActivatableUIOpenEvent>(OnBeforeActivatableUIOpen);
-        SubscribeLocalEvent<AbductConditionComponent, ObjectiveGetProgressEvent>(OnAbductGetProgress);
-
-        Subs.BuiEvents<AbductorConsoleComponent>(AbductorConsoleUIKey.Key, subs => subs.Event<AbductorAttractBuiMsg>(OnAttractBuiMsg));
-        Subs.BuiEvents<AbductorConsoleComponent>(AbductorConsoleUIKey.Key, subs => subs.Event<AbductorCompleteExperimentBuiMsg>(OnCompleteExperimentBuiMsg));
-        Subs.BuiEvents<AbductorConsoleComponent>(AbductorConsoleUIKey.Key, subs => subs.Event<AbductorVestModeChangeBuiMsg>(OnVestModeChangeBuiMsg));
-        Subs.BuiEvents<AbductorConsoleComponent>(AbductorConsoleUIKey.Key, subs => subs.Event<AbductorLockBuiMsg>(OnVestLockBuiMsg));
-        SubscribeLocalEvent<AbductorComponent, AbductorAttractDoAfterEvent>(OnDoAfterAttract);
-    }
-    private void OnAbductGetProgress(Entity<AbductConditionComponent> ent, ref ObjectiveGetProgressEvent args)
-        => args.Progress = AbductProgress(ent.Comp, _number.GetTarget(ent.Owner));
-
-    private float AbductProgress(AbductConditionComponent comp, int target)
-        => target == 0 ? 1f : MathF.Min(comp.Abducted / (float) target, 1f);
-
-    private void OnVestModeChangeBuiMsg(EntityUid uid, AbductorConsoleComponent component, AbductorVestModeChangeBuiMsg args)
-    {
-        if (component.Armor != null)
-            _itemSwitch.Switch(GetEntity(component.Armor.Value), args.Mode.ToString());
-    }
-
-    private void OnVestLockBuiMsg(Entity<AbductorConsoleComponent> ent, ref AbductorLockBuiMsg args)
-    {
-        if (ent.Comp.Armor != null && GetEntity(ent.Comp.Armor.Value) is EntityUid armor)
-            if (TryComp<UnremoveableComponent>(armor, out var unremoveable))
-                RemComp(armor, unremoveable);
-            else
-                AddComp<UnremoveableComponent>(armor);
-    }
-
-    private void OnCompleteExperimentBuiMsg(EntityUid uid, AbductorConsoleComponent component, AbductorCompleteExperimentBuiMsg args)
-    {
-        if (component.Experimentator != null
-            && GetEntity(component.Experimentator) is EntityUid experimentatorId
-            && TryComp<AbductorExperimentatorComponent>(experimentatorId, out var experimentatorComp))
-        {
-            var container = _container.GetContainer(experimentatorId, experimentatorComp.ContainerId);
-            var victim = container.ContainedEntities.FirstOrDefault(HasComp<AbductorVictimComponent>);
-            if (victim != default && TryComp(victim, out AbductorVictimComponent? victimComp))
-            {
-                if (victimComp.Implanted
-                    && TryComp<MindContainerComponent>(args.Actor, out var mindContainer)
-                    && mindContainer.Mind.HasValue
-                    && TryComp<MindComponent>(mindContainer.Mind.Value, out var mind)
-                    && mind.Objectives.FirstOrDefault(HasComp<AbductConditionComponent>) is EntityUid objId
-                    && TryComp<AbductConditionComponent>(objId, out var condition)
-                    && !condition.AbductedHashs.Contains(GetNetEntity(victim)))
-                {
-                    condition.AbductedHashs.Add(GetNetEntity(victim));
-                    condition.Abducted++;
-                }
-                _audioSystem.PlayPvs("/Audio/Voice/Human/wilhelm_scream.ogg", experimentatorId);
-
-                if (victimComp.Position is not null)
-                    _xformSys.SetCoordinates(victim, victimComp.Position.Value);
-            }
-        }
-    }
-
-    private void OnAttractBuiMsg(Entity<AbductorConsoleComponent> ent, ref AbductorAttractBuiMsg args)
-    {
-        if (ent.Comp.Target == null || ent.Comp.AlienPod == null) return;
-        var target = GetEntity(ent.Comp.Target.Value);
-        EnsureComp<TransformComponent>(target, out var xform);
-        var effectEnt = SpawnAttachedTo(TeleportationEffectEntity, xform.Coordinates);
-        _xformSys.SetParent(effectEnt, target);
-        EnsureComp<TimedDespawnComponent>(effectEnt, out var despawnEffectEntComp);
-        despawnEffectEntComp.Lifetime = 3.0f;
-        _audioSystem.PlayPvs("/Audio/_Shitmed/Misc/alien_teleport.ogg", effectEnt);
-
-        var telepad = GetEntity(ent.Comp.AlienPod.Value);
-        var telepadXform = EnsureComp<TransformComponent>(telepad);
-        var effect = _entityManager.SpawnEntity(TeleportationEffect, telepadXform.Coordinates);
-        EnsureComp<TimedDespawnComponent>(effect, out var despawnComp);
-        despawnComp.Lifetime = 3.0f;
-        _audioSystem.PlayPvs("/Audio/_Shitmed/Misc/alien_teleport.ogg", effect);
-
-        var @event = new AbductorAttractDoAfterEvent(GetNetCoordinates(telepadXform.Coordinates), GetNetEntity(target));
-        ent.Comp.Target = null;
-        var doAfter = new DoAfterArgs(EntityManager, args.Actor, TimeSpan.FromSeconds(3), @event, args.Actor)
-        {
-            BreakOnDamage = false,
-            BreakOnDropItem = false,
-            BreakOnHandChange = false,
-            BreakOnMove = false,
-            BreakOnWeightlessMove = false,
-        };
-        _doAfter.TryStartDoAfter(doAfter);
-    }
-    private void OnDoAfterAttract(Entity<AbductorComponent> ent, ref AbductorAttractDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled)
-            return;
-
-        var victim = GetEntity(args.Victim);
-        if (_pullingSystem.IsPulling(victim))
-        {
-            if (!TryComp<PullerComponent>(victim, out var pullerComp)
-                || pullerComp.Pulling == null
-                || !TryComp<PullableComponent>(pullerComp.Pulling.Value, out var pullableComp)
-                || !_pullingSystem.TryStopPull(pullerComp.Pulling.Value, pullableComp)) return;
-        }
-        if (_pullingSystem.IsPulled(victim))
-        {
-            if (!TryComp<PullableComponent>(victim, out var pullableComp)
-                || !_pullingSystem.TryStopPull(victim, pullableComp)) return;
-        }
-        _xformSys.SetCoordinates(victim, GetCoordinates(args.TargetCoordinates));
-    }
-    private void OnBeforeActivatableUIOpen(Entity<AbductorConsoleComponent> ent, ref BeforeActivatableUIOpenEvent args) => UpdateGui(ent.Comp.Target, ent);
-
-    protected override void UpdateGui(NetEntity? target, Entity<AbductorConsoleComponent> computer)
-    {
-        string? targetName = null;
-        string? victimName = null;
-        if (target.HasValue && TryComp(GetEntity(target.Value), out MetaDataComponent? metadata))
-            targetName = metadata?.EntityName;
-
-        var armorLock = false;
-        var armorMode = AbductorArmorModeType.Stealth;
-
-        if (computer.Comp.Armor != null)
-        {
-            if (HasComp<UnremoveableComponent>(GetEntity(computer.Comp.Armor.Value)))
-                armorLock = true;
-            if (TryComp<ItemSwitchComponent>(GetEntity(computer.Comp.Armor.Value), out var switchVest) && Enum.TryParse<AbductorArmorModeType>(switchVest.State, ignoreCase: true, out var State))
-                armorMode = State;
-        }
-
-        if (computer.Comp.AlienPod == null)
-        {
-            var xform = EnsureComp<TransformComponent>(computer.Owner);
-            var alienpad = _entityLookup.GetEntitiesInRange<AbductorAlienPadComponent>(xform.Coordinates, 4, LookupFlags.Approximate | LookupFlags.Dynamic)
-                .FirstOrDefault().Owner;
-            if (alienpad != default)
-                computer.Comp.AlienPod = GetNetEntity(alienpad);
-        }
-
-        if (computer.Comp.Experimentator == null)
-        {
-            var xform = EnsureComp<TransformComponent>(computer.Owner);
-            var experimentator = _entityLookup.GetEntitiesInRange<AbductorExperimentatorComponent>(xform.Coordinates, 4, LookupFlags.Approximate | LookupFlags.Dynamic)
-                .FirstOrDefault().Owner;
-            if (experimentator != default)
-                computer.Comp.Experimentator = GetNetEntity(experimentator);
-        }
-
-        if (computer.Comp.Experimentator != null
-            && GetEntity(computer.Comp.Experimentator) is EntityUid experimentatorId
-            && TryComp<AbductorExperimentatorComponent>(experimentatorId, out var experimentatorComp))
-        {
-            var container = _container.GetContainer(experimentatorId, experimentatorComp.ContainerId);
-            var victim = container.ContainedEntities.FirstOrDefault(e => HasComp<AbductorVictimComponent>(e));
-            if (victim != default && TryComp(victim, out MetaDataComponent? victimMetadata))
-                victimName = victimMetadata?.EntityName;
-        }
-
-        _uiSystem.SetUiState(computer.Owner, AbductorConsoleUIKey.Key, new AbductorConsoleBuiState()
-        {
-            Target = target,
-            TargetName = targetName,
-            VictimName = victimName,
-            AlienPadFound = computer.Comp.AlienPod != default,
-            ExperimentatorFound = computer.Comp.Experimentator != default,
-            ArmorFound = computer.Comp.Armor != default,
-            ArmorLocked = armorLock,
-            CurrentArmorMode = armorMode
-        });
-    }
-}
diff --git a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Gizmo.cs b/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Gizmo.cs
deleted file mode 100644
index f53bcbb9697..00000000000
--- a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Gizmo.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared.ActionBlocker;
-using Content.Shared.DoAfter;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
-using Content.Shared.Tag;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Server._Shitmed.Antags.Abductor;
-
-public sealed partial class AbductorSystem : SharedAbductorSystem
-{
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-    [Dependency] private readonly IGameTiming _time = default!;
-    private static readonly ProtoId<TagPrototype> Abductor = "Abductor";
-    public void InitializeGizmo()
-    {
-        SubscribeLocalEvent<AbductorGizmoComponent, AfterInteractEvent>(OnGizmoInteract);
-        SubscribeLocalEvent<AbductorGizmoComponent, MeleeHitEvent>(OnGizmoHitInteract);
-
-        SubscribeLocalEvent<AbductorGizmoComponent, AbductorGizmoMarkDoAfterEvent>(OnGizmoDoAfter);
-    }
-
-    private void OnGizmoHitInteract(Entity<AbductorGizmoComponent> ent, ref MeleeHitEvent args)
-    {
-        if (args.HitEntities.Count != 1) return;
-        var target = args.HitEntities[0];
-        if (!HasComp<SurgeryTargetComponent>(target)) return;
-        GizmoUse(ent, target, args.User);
-    }
-
-    private void OnGizmoInteract(Entity<AbductorGizmoComponent> ent, ref AfterInteractEvent args)
-    {
-        if (!_actionBlockerSystem.CanInstrumentInteract(args.User, args.Used, args.Target)) return;
-        if (!args.Target.HasValue) return;
-
-        if (TryComp<AbductorConsoleComponent>(args.Target, out var console))
-        {
-            console.Target = ent.Comp.Target;
-            _popup.PopupEntity(Loc.GetString("abductors-ui-gizmo-transferred"), args.User);
-            _color.RaiseEffect(Color.FromHex("#00BA00"), new List<EntityUid>(2) { ent.Owner, args.Target.Value }, Filter.Pvs(args.User, entityManager: EntityManager));
-            UpdateGui(console.Target, (args.Target.Value, console));
-            return;
-        }
-
-        if (HasComp<SurgeryTargetComponent>(args.Target))
-            GizmoUse(ent, args.Target.Value, args.User);
-    }
-
-    private void GizmoUse(Entity<AbductorGizmoComponent> ent, EntityUid target, EntityUid user)
-    {
-        if (HasComp<AbductorComponent>(target))
-            return;
-
-        var time = TimeSpan.FromSeconds(6);
-        if (_tags.HasTag(target, Abductor))
-            time = TimeSpan.FromSeconds(0.5);
-
-        var doAfter = new DoAfterArgs(EntityManager, user, time, new AbductorGizmoMarkDoAfterEvent(), ent, target, ent.Owner)
-        {
-            BreakOnMove = true,
-            BreakOnDamage = true,
-            DistanceThreshold = 1f
-        };
-        _doAfter.TryStartDoAfter(doAfter);
-    }
-
-    private void OnGizmoDoAfter(Entity<AbductorGizmoComponent> ent, ref AbductorGizmoMarkDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || args.Target is null)
-            return;
-
-        ent.Comp.Target = GetNetEntity(args.Target);
-        EnsureComp<AbductorVictimComponent>(args.Target.Value, out var victimComponent);
-        victimComponent.LastActivation = _time.CurTime + TimeSpan.FromMinutes(5);
-        victimComponent.Position ??= EnsureComp<TransformComponent>(args.Target.Value).Coordinates;
-
-        args.Handled = true;
-    }
-}
diff --git a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Vest.cs b/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Vest.cs
deleted file mode 100644
index 60673874f47..00000000000
--- a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Vest.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared._Shitmed.ItemSwitch.Components;
-using Content.Shared.Clothing.Components;
-using Content.Shared.Clothing.EntitySystems;
-using Content.Shared.Interaction;
-using Content.Shared.Inventory.Events;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Stealth.Components;
-
-namespace Content.Server._Shitmed.Antags.Abductor;
-
-public sealed partial class AbductorSystem : SharedAbductorSystem
-{
-    [Dependency] private readonly ClothingSystem _clothing = default!;
-    public void InitializeVest()
-    {
-        SubscribeLocalEvent<AbductorVestComponent, AfterInteractEvent>(OnVestInteract);
-        SubscribeLocalEvent<AbductorVestComponent, ItemSwitchedEvent>(OnItemSwitch);
-        SubscribeLocalEvent<AbductorVestComponent, GotUnequippedEvent>(OnUnequipped);
-        SubscribeLocalEvent<AbductorVestComponent, GotEquippedEvent>(OnEquipped);
-    }
-
-    private void OnEquipped(Entity<AbductorVestComponent> ent, ref GotEquippedEvent args)
-    {
-        if (args.Equipee != null && !HasComp<StealthComponent>(args.Equipee) && ent.Comp.CurrentState != AbductorArmorModeType.Combat)
-        {
-            AddComp<StealthComponent>(args.Equipee);
-            AddComp<StealthOnMoveComponent>(args.Equipee);
-        }
-    }
-
-    private void OnUnequipped(Entity<AbductorVestComponent> ent, ref GotUnequippedEvent args)
-    {
-        if (args.Equipee != null && HasComp<StealthComponent>(args.Equipee))
-        {
-            RemComp<StealthComponent>(args.Equipee);
-            RemComp<StealthOnMoveComponent>(args.Equipee);
-        }
-    }
-
-    private void OnItemSwitch(EntityUid uid, AbductorVestComponent component, ref ItemSwitchedEvent args)
-    {
-
-        if (Enum.TryParse<AbductorArmorModeType>(args.State, ignoreCase: true, out var State))
-            component.CurrentState = State;
-
-        var user = Transform(uid).ParentUid;
-
-        if (State == AbductorArmorModeType.Combat)
-        {
-            if (TryComp<ClothingComponent>(uid, out var clothingComponent))
-                _clothing.SetEquippedPrefix(uid, "combat", clothingComponent);
-
-            if (HasComp<MobStateComponent>(user) && HasComp<StealthComponent>(user))
-            {
-                RemComp<StealthComponent>(user);
-                RemComp<StealthOnMoveComponent>(user);
-            }
-        }
-        else
-        {
-            if (TryComp<ClothingComponent>(uid, out var clothingComponent))
-                _clothing.SetEquippedPrefix(uid, null, clothingComponent);
-
-            if (HasComp<MobStateComponent>(user) && !HasComp<StealthComponent>(user))
-            {
-                AddComp<StealthComponent>(user);
-                AddComp<StealthOnMoveComponent>(user);
-            }
-        }
-    }
-
-    private void OnVestInteract(Entity<AbductorVestComponent> ent, ref AfterInteractEvent args)
-    {
-        if (!_actionBlockerSystem.CanInstrumentInteract(args.User, args.Used, args.Target)) return;
-        if (!args.Target.HasValue) return;
-
-        if (TryComp<AbductorConsoleComponent>(args.Target, out var console))
-        {
-            console.Armor = GetNetEntity(ent);
-            _popup.PopupEntity(Loc.GetString("abductors-ui-vest-linked"), args.User);
-            return;
-        }
-    }
-}
diff --git a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Victim.cs b/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Victim.cs
deleted file mode 100644
index 80f0ce42a4c..00000000000
--- a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.Victim.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Content.Server._Shitmed.GameTicking.Rules.Components;
-using Content.Server.Administration.Logs;
-using Content.Server.Antag;
-using Content.Server.Mind;
-using Content.Server.Roles;
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared._Shitmed.Medical.Surgery.Steps;
-using Content.Shared.Database;
-using Content.Shared.Humanoid;
-using Robust.Shared.Player;
-namespace Content.Server._Shitmed.Antags.Abductor;
-
-public sealed partial class AbductorSystem : SharedAbductorSystem
-{
-    [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
-    [Dependency] private readonly MindSystem _mind = default!;
-    [Dependency] private readonly RoleSystem _role = default!;
-    [Dependency] private readonly AntagSelectionSystem _antag = default!;
-
-    private static readonly string DefaultAbductorVictimRule = "AbductorVictim";
-    public void InitializeVictim()
-    {
-        SubscribeLocalEvent<AbductorComponent, SurgeryStepEvent>(OnSurgeryStepComplete);
-    }
-    private void OnSurgeryStepComplete(EntityUid uid, AbductorComponent comp, ref SurgeryStepEvent args)
-    {
-        if (!HasComp<SurgeryAddOrganStepComponent>(args.Step)
-            || !args.Complete
-            || HasComp<AbductorComponent>(args.Body)
-            || !TryComp<AbductorVictimComponent>(args.Body, out var victimComp)
-            || victimComp.Implanted
-            || !HasComp<HumanoidAppearanceComponent>(args.Body)
-            || !_mind.TryGetMind(args.Body, out var mindId, out var mind)
-            || !TryComp<ActorComponent>(args.Body, out var actor))
-            return;
-
-        if (mindId == default
-            || !_role.MindHasRole<AbductorVictimRoleComponent>(mindId, out var role))
-        {
-            _role.MindAddRole(mindId, "MindRoleAbductorVictim");
-            victimComp.Implanted = true;
-            _antag.ForceMakeAntag<AbductorVictimRuleComponent>(actor.PlayerSession, DefaultAbductorVictimRule);
-
-            _adminLogManager.Add(LogType.Mind,
-                LogImpact.Medium,
-                $"{ToPrettyString(args.User)} has given {ToPrettyString(args.Body)} an abductee objective.");
-
-        }
-
-    }
-}
diff --git a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.cs b/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.cs
deleted file mode 100644
index a18f90d3149..00000000000
--- a/Content.Server/_Shitmed/Antags/Abductor/AbductorSystem.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-using Content.Server.Actions;
-using Content.Server.DoAfter;
-using Content.Server.Station.Components;
-using Content.Server.Station.Systems;
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared.Eye;
-using Content.Shared.Movement.Components;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Pinpointer;
-using Content.Shared.Inventory.VirtualItem;
-using Content.Shared.Interaction.Components;
-using Content.Shared.Silicons.StationAi;
-using Content.Shared.UserInterface;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-using Robust.Server.GameObjects;
-using Content.Shared.Tag;
-using Robust.Server.Containers;
-
-namespace Content.Server._Shitmed.Antags.Abductor;
-
-public sealed partial class AbductorSystem : SharedAbductorSystem
-{
-    [Dependency] private readonly StationSystem _stationSystem = default!;
-    [Dependency] private readonly EntityManager _entityManager = default!;
-    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-    [Dependency] private readonly SharedEyeSystem _eye = default!;
-    [Dependency] private readonly SharedMoverController _mover = default!;
-    [Dependency] private readonly ActionsSystem _actions = default!;
-    [Dependency] private readonly DoAfterSystem _doAfter = default!;
-    [Dependency] private readonly TransformSystem _xformSys = default!;
-    [Dependency] private readonly TagSystem _tags = default!;
-    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-    [Dependency] private readonly ContainerSystem _container = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedVirtualItemSystem _virtualItem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<AbductorHumanObservationConsoleComponent, BeforeActivatableUIOpenEvent>(OnBeforeActivatableUIOpen);
-        SubscribeLocalEvent<AbductorHumanObservationConsoleComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
-        Subs.BuiEvents<AbductorHumanObservationConsoleComponent>(AbductorCameraConsoleUIKey.Key, subs => subs.Event<AbductorBeaconChosenBuiMsg>(OnAbductorBeaconChosenBuiMsg));
-        InitializeActions();
-        InitializeGizmo();
-        InitializeConsole();
-        InitializeVest();
-        InitializeVictim();
-        base.Initialize();
-    }
-
-    private void OnAbductorBeaconChosenBuiMsg(Entity<AbductorHumanObservationConsoleComponent> ent, ref AbductorBeaconChosenBuiMsg args)
-    {
-        OnCameraExit(args.Actor);
-        if (ent.Comp.RemoteEntityProto != null)
-        {
-            var beacon = _entityManager.GetEntity(args.Beacon.NetEnt);
-            var eye = SpawnAtPosition(ent.Comp.RemoteEntityProto, Transform(beacon).Coordinates);
-            ent.Comp.RemoteEntity = GetNetEntity(eye);
-
-            if (TryComp<HandsComponent>(args.Actor, out var handsComponent))
-            {
-                foreach (var hand in _hands.EnumerateHands(args.Actor, handsComponent))
-                {
-                    if (hand.HeldEntity == null)
-                        continue;
-
-                    if (HasComp<UnremoveableComponent>(hand.HeldEntity))
-                        continue;
-
-                    _hands.DoDrop(args.Actor, hand, true, handsComponent);
-                }
-
-                if (_virtualItem.TrySpawnVirtualItemInHand(ent.Owner, args.Actor, out var virtItem1))
-                {
-                    EnsureComp<UnremoveableComponent>(virtItem1.Value);
-                }
-
-                if (_virtualItem.TrySpawnVirtualItemInHand(ent.Owner, args.Actor, out var virtItem2))
-                {
-                    EnsureComp<UnremoveableComponent>(virtItem2.Value);
-                }
-            }
-
-            var visibility = EnsureComp<VisibilityComponent>(eye);
-
-            Dirty(ent);
-
-            if (TryComp(args.Actor, out EyeComponent? eyeComp))
-            {
-                _eye.SetVisibilityMask(args.Actor, eyeComp.VisibilityMask | (int) VisibilityFlags.Abductor, eyeComp);
-                _eye.SetTarget(args.Actor, eye, eyeComp);
-                _eye.SetDrawFov(args.Actor, false);
-                _eye.SetRotation(args.Actor, Angle.Zero, eyeComp);
-                if (!HasComp<StationAiOverlayComponent>(args.Actor))
-                    AddComp(args.Actor, new StationAiOverlayComponent { AllowCrossGrid = true });
-                if (!TryComp(eye, out RemoteEyeSourceContainerComponent? remoteEyeSourceContainerComponent))
-                {
-                    remoteEyeSourceContainerComponent = new RemoteEyeSourceContainerComponent { Actor = args.Actor };
-                    AddComp(eye, remoteEyeSourceContainerComponent);
-                }
-                else
-                    remoteEyeSourceContainerComponent.Actor = args.Actor;
-                Dirty(eye, remoteEyeSourceContainerComponent);
-                Dirty(args.Actor, eyeComp);
-            }
-
-            AddActions(args);
-
-            _mover.SetRelay(args.Actor, eye);
-        }
-    }
-
-    private void OnCameraExit(EntityUid actor)
-    {
-        if (TryComp<RelayInputMoverComponent>(actor, out var comp)
-            && TryComp<AbductorScientistComponent>(actor, out var abductorComp))
-        {
-            var relay = comp.RelayEntity;
-            RemComp(actor, comp);
-
-            if (abductorComp.Console != null)
-                _virtualItem.DeleteInHandsMatching(actor, abductorComp.Console.Value);
-
-            if (TryComp(actor, out EyeComponent? eyeComp))
-            {
-                if (HasComp<StationAiOverlayComponent>(actor))
-                    RemComp<StationAiOverlayComponent>(actor);
-
-                _eye.SetVisibilityMask(actor, eyeComp.VisibilityMask ^ (int) VisibilityFlags.Abductor, eyeComp);
-                _eye.SetDrawFov(actor, true);
-                _eye.SetTarget(actor, null, eyeComp);
-            }
-            RemoveActions(actor);
-            QueueDel(relay);
-        }
-    }
-
-    private void OnBeforeActivatableUIOpen(Entity<AbductorHumanObservationConsoleComponent> ent, ref BeforeActivatableUIOpenEvent args)
-    {
-        if (!TryComp<AbductorScientistComponent>(args.User, out var abductorComp))
-            return;
-
-
-        abductorComp.Console = ent.Owner;
-        var stations = _stationSystem.GetStations();
-        var result = new Dictionary<int, StationBeacons>();
-
-        foreach (var station in stations)
-        {
-            if (_stationSystem.GetLargestGrid(Comp<StationDataComponent>(station)) is not { } grid
-                || !TryComp(station, out MetaDataComponent? stationMetaData))
-                return;
-
-            var mapId = Transform(grid).MapID;
-
-            if (!_entityManager.TryGetComponent<NavMapComponent>(grid, out var navMap))
-                return;
-
-            result.Add(station.Id, new StationBeacons
-            {
-                Name = stationMetaData.EntityName,
-                StationId = station.Id,
-                Beacons = [.. navMap.Beacons.Values],
-            });
-        }
-
-        _uiSystem.SetUiState(ent.Owner, AbductorCameraConsoleUIKey.Key, new AbductorCameraConsoleBuiState() { Stations = result });
-    }
-
-    private void OnActivatableUIOpenAttempt(Entity<AbductorHumanObservationConsoleComponent> ent, ref ActivatableUIOpenAttemptEvent args)
-    {
-        if (!HasComp<AbductorScientistComponent>(args.User))
-            args.Cancel();
-    }
-
-}
diff --git a/Content.Server/_Shitmed/Autodoc/AutodocSafetyWireAction.cs b/Content.Server/_Shitmed/Autodoc/AutodocSafetyWireAction.cs
deleted file mode 100644
index 064d4de9d65..00000000000
--- a/Content.Server/_Shitmed/Autodoc/AutodocSafetyWireAction.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Server.Wires;
-using Content.Shared._Shitmed.Autodoc.Components;
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Content.Shared.Wires;
-
-namespace Content.Server._Shitmed.Autodoc;
-
-public sealed partial class AutodocSafetyWireAction : ComponentWireAction<AutodocComponent>
-{
-    public override Color Color { get; set; } = Color.Red;
-    public override string Name { get; set; } = "wire-name-autodoc-safety";
-
-    public override StatusLightState? GetLightState(Wire wire, AutodocComponent comp)
-        => comp.RequireSleeping ? StatusLightState.On : StatusLightState.Off;
-
-    public override object StatusKey { get; } = AutodocWireStatus.SafetyIndicator;
-
-    public override bool Cut(EntityUid user, Wire wire, AutodocComponent comp)
-    {
-        var uid = wire.Owner;
-        EntityManager.System<SharedAutodocSystem>().SetSafety((uid, comp), false);
-        return true;
-    }
-
-    public override bool Mend(EntityUid user, Wire wire, AutodocComponent comp)
-    {
-        var uid = wire.Owner;
-        EntityManager.System<SharedAutodocSystem>().SetSafety((uid, comp), true);
-        return true;
-    }
-
-    public override void Pulse(EntityUid user, Wire wire, AutodocComponent comp)
-    {
-        var uid = wire.Owner;
-        EntityManager.System<SharedAutodocSystem>().SetSafety((uid, comp), !comp.RequireSleeping);
-    }
-}
diff --git a/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs b/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs
deleted file mode 100644
index b0330016ad3..00000000000
--- a/Content.Server/_Shitmed/Autodoc/Systems/AutodocSystem.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared.Chat;
-using Content.Server.Chat.Systems;
-using Content.Shared.DoAfter;
-using Content.Server.Power.EntitySystems;
-using Content.Shared._Shitmed.Autodoc.Components;
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Content.Shared.Bed.Sleep;
-
-
-namespace Content.Server._Shitmed.Autodoc.Systems;
-
-public sealed class AutodocSystem : SharedAutodocSystem
-{
-    [Dependency] private readonly InternalsSystem _internals = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly PowerReceiverSystem _power = default!;
-    [Dependency] private readonly SleepingSystem _sleepingSystem = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<ActiveAutodocComponent, AutodocComponent>();
-        var now = Timing.CurTime;
-        while (query.MoveNext(out var uid, out var active, out var comp))
-        {
-            if (now < active.NextUpdate)
-                continue;
-
-            active.NextUpdate = now + comp.UpdateDelay;
-            if (HasComp<ActiveDoAfterComponent>(uid) || !_power.IsPowered(uid))
-                continue;
-
-            if (Proceed((uid, comp, active)))
-                RemCompDeferred<ActiveAutodocComponent>(uid);
-        }
-    }
-
-    protected override void WakePatient(EntityUid patient)
-    {
-        // incase they are using nitrous, disconnect it so they can get woken up later on
-        if (TryComp<InternalsComponent>(patient, out var internals) && _internals.AreInternalsWorking(patient, internals))
-            _internals.DisconnectTank((patient, internals));
-
-        _sleepingSystem.TryWaking(patient);
-    }
-
-    public override void Say(EntityUid uid, string msg)
-    {
-        _chat.TrySendInGameICMessage(uid, msg, InGameICChatType.Speak, hideChat: false, hideLog: true, checkRadioPrefix: false);
-    }
-}
diff --git a/Content.Server/_Shitmed/Body/BodyEffects/Subsystems/RandomStatusActivationSystem.cs b/Content.Server/_Shitmed/Body/BodyEffects/Subsystems/RandomStatusActivationSystem.cs
deleted file mode 100644
index 5ff6018e14b..00000000000
--- a/Content.Server/_Shitmed/Body/BodyEffects/Subsystems/RandomStatusActivationSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Shared._Shitmed.BodyEffects.Subsystems;
-using Content.Shared.Body.Organ;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Timing;
-using Robust.Shared.Random;
-
-namespace Content.Server._Shitmed.BodyEffects.Subsystems;
-
-public sealed class RandomStatusActivationSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly StatusEffectsSystem _effects = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<RandomStatusActivationComponent, ComponentInit>(OnInit);
-    }
-
-    private void OnInit(EntityUid uid, RandomStatusActivationComponent component, ComponentInit args) => GetRandomTime(component);
-    private void GetRandomTime(RandomStatusActivationComponent component)
-    {
-        var minTime = component.MinActivationTime;
-        var maxTime = component.MaxActivationTime;
-        var randomSeconds = _random.NextDouble() * (maxTime - minTime).TotalSeconds;
-        var randomSpan = TimeSpan.FromSeconds(randomSeconds);
-        component.NextUpdate = _timing.CurTime + minTime + randomSpan;
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<RandomStatusActivationComponent>();
-        var now = _timing.CurTime;
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (now < comp.NextUpdate)
-                continue;
-
-            if (!TryComp<StatusEffectsComponent>(uid, out var effects))
-                continue;
-
-            foreach (var (key, component) in comp.StatusEffects)
-                _effects.TryAddStatusEffect(uid, key, comp.Duration ?? TimeSpan.FromSeconds(1), refresh: true, component, effects);
-
-            GetRandomTime(comp);
-        }
-    }
-}
diff --git a/Content.Server/_Shitmed/Body/Organ/HeartSystem.cs b/Content.Server/_Shitmed/Body/Organ/HeartSystem.cs
deleted file mode 100644
index 6a76fee77b3..00000000000
--- a/Content.Server/_Shitmed/Body/Organ/HeartSystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Body.Events;
-using Content.Server.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Server._Shitmed.DelayedDeath;
-
-namespace Content.Server._Shitmed.Body.Organ;
-
-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/_Shitmed/Body/Organ/StatusEffectOrganComponent.cs b/Content.Server/_Shitmed/Body/Organ/StatusEffectOrganComponent.cs
deleted file mode 100644
index 640f61d5e8e..00000000000
--- a/Content.Server/_Shitmed/Body/Organ/StatusEffectOrganComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Shared.StatusEffect;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server._Shitmed.Body.Organ;
-
-[RegisterComponent, Access(typeof(StatusEffectOrganSystem))]
-[AutoGenerateComponentPause]
-public sealed partial class StatusEffectOrganComponent : Component
-{
-    /// <summary>
-    /// List of status effects and components to refresh while the organ is installed.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<ProtoId<StatusEffectPrototype>, string> Refresh = new();
-
-    /// <summary>
-    /// How long to wait between each refresh.
-    /// Effects can only last at most this long once the organ is removed.
-    /// </summary>
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(5);
-
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextUpdate = TimeSpan.Zero;
-}
diff --git a/Content.Server/_Shitmed/Body/Organ/StatusEffectOrganSystem.cs b/Content.Server/_Shitmed/Body/Organ/StatusEffectOrganSystem.cs
deleted file mode 100644
index b3394b7dd91..00000000000
--- a/Content.Server/_Shitmed/Body/Organ/StatusEffectOrganSystem.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Shared.Body.Organ;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Timing;
-
-namespace Content.Server._Shitmed.Body.Organ;
-
-public sealed class StatusEffectOrganSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly StatusEffectsSystem _effects = default!;
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<StatusEffectOrganComponent, OrganComponent>();
-        var now = _timing.CurTime;
-        while (query.MoveNext(out var uid, out var comp, out var organ))
-        {
-            if (now < comp.NextUpdate || organ.Body is not {} body)
-                continue;
-
-            comp.NextUpdate = now + comp.Delay;
-            if (!TryComp<StatusEffectsComponent>(body, out var effects))
-                continue;
-
-            foreach (var (key, component) in comp.Refresh)
-            {
-                _effects.TryAddStatusEffect(body, key, comp.Delay, refresh: true, component, effects);
-            }
-        }
-    }
-}
diff --git a/Content.Server/_Shitmed/Body/Systems/DebrainedSystem.cs b/Content.Server/_Shitmed/Body/Systems/DebrainedSystem.cs
deleted file mode 100644
index 8b3ccba079f..00000000000
--- a/Content.Server/_Shitmed/Body/Systems/DebrainedSystem.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Content.Server._Shitmed.DelayedDeath;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.Body.Systems;
-using Content.Shared.Mind;
-using Content.Server.Popups;
-using Content.Shared.Speech;
-using Content.Shared.Standing;
-using Content.Shared.Stunnable;
-
-namespace Content.Server._Shitmed.Body.Systems;
-
-/// <summary>
-///     This system handles behavior on entities when they lose their head or their brains are removed.
-///     MindComponent fuckery should still be mainly handled on BrainSystem as usual.
-/// </summary>
-public sealed class DebrainedSystem : EntitySystem
-{
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly StandingStateSystem _standingSystem = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DebrainedComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<DebrainedComponent, ComponentRemove>(OnComponentRemove);
-        SubscribeLocalEvent<DebrainedComponent, SpeakAttemptEvent>(OnSpeakAttempt);
-        SubscribeLocalEvent<DebrainedComponent, StandAttemptEvent>(OnStandAttempt);
-    }
-
-    private void OnComponentInit(EntityUid uid, DebrainedComponent _, ComponentInit args)
-    {
-        if (TerminatingOrDeleted(uid))
-            return;
-
-        EnsureComp<DelayedDeathComponent>(uid);
-        EnsureComp<StunnedComponent>(uid);
-        _standingSystem.Down(uid);
-    }
-
-    private void OnComponentRemove(EntityUid uid, DebrainedComponent _, ComponentRemove args)
-    {
-        if (TerminatingOrDeleted(uid))
-            return;
-
-        RemComp<DelayedDeathComponent>(uid);
-        RemComp<StunnedComponent>(uid);
-        if (_bodySystem.TryGetBodyOrganEntityComps<HeartComponent>(uid, out var _))
-            RemComp<DelayedDeathComponent>(uid);
-    }
-
-    private void OnSpeakAttempt(EntityUid uid, DebrainedComponent _, SpeakAttemptEvent args)
-    {
-        _popupSystem.PopupEntity(Loc.GetString("speech-muted"), uid, uid);
-        args.Cancel();
-    }
-
-    private void OnStandAttempt(EntityUid uid, DebrainedComponent _, StandAttemptEvent args)
-    {
-        args.Cancel();
-    }
-}
diff --git a/Content.Server/_Shitmed/Body/Systems/EyesSystem.cs b/Content.Server/_Shitmed/Body/Systems/EyesSystem.cs
deleted file mode 100644
index 551b9a147a7..00000000000
--- a/Content.Server/_Shitmed/Body/Systems/EyesSystem.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Events;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.Eye.Blinding.Components;
-using Content.Shared.Eye.Blinding.Systems;
-
-namespace Content.Server.Body.Systems
-{
-    public sealed class EyesSystem : EntitySystem
-    {
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-        [Dependency] private readonly BlindableSystem _blindableSystem = default!;
-        [Dependency] private readonly BodySystem _bodySystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<EyesComponent, OrganEnabledEvent>(OnOrganEnabled);
-            SubscribeLocalEvent<EyesComponent, OrganDisabledEvent>(OnOrganDisabled);
-        }
-
-        private void HandleSight(EntityUid newEntity, EntityUid oldEntity)
-        {
-            if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
-                return;
-
-            BlindableComponent? newSight;
-            BlindableComponent? oldSight;
-            //transfer existing component to organ
-            if (!TryComp(newEntity, out newSight))
-                newSight = EnsureComp<BlindableComponent>(newEntity);
-
-            if (!TryComp(oldEntity, out oldSight))
-                oldSight = EnsureComp<BlindableComponent>(oldEntity);
-
-            //give new sight all values of old sight
-            _blindableSystem.TransferBlindness(newSight, oldSight, newEntity);
-
-            var hasOtherEyes = false;
-            //check for other eye components on owning body and owning body organs (if old entity has a body)
-            if (TryComp<BodyComponent>(oldEntity, out var body))
-            {
-                if (TryComp<EyesComponent>(oldEntity, out var bodyEyes)) //some bodies see through their skin!!! (slimes)
-                    hasOtherEyes = true;
-                else
-                {
-                    foreach (var (organ, _) in _bodySystem.GetBodyOrgans(oldEntity, body))
-                    {
-                        if (TryComp<EyesComponent>(organ, out var eyes))
-                        {
-                            hasOtherEyes = true;
-                            break;
-                        }
-                    }
-                    //TODO (MS14): Should we do this for body parts too? might be a little overpowered but could be funny/interesting
-                }
-            }
-
-            //if there are no existing eye components for the old entity - set old sight to be blind otherwise leave it as is
-            if (!hasOtherEyes && !TryComp<EyesComponent>(oldEntity, out var self))
-                _blindableSystem.AdjustEyeDamage((oldEntity, oldSight), oldSight.MaxDamage);
-
-        }
-
-        private void OnOrganEnabled(EntityUid uid, EyesComponent component, OrganEnabledEvent args)
-        {
-            if (TerminatingOrDeleted(uid)
-            || args.Organ.Comp.Body is not { Valid: true } body)
-                return;
-
-            RemComp<TemporaryBlindnessComponent>(body);
-            HandleSight(uid, body);
-            if (TryComp<BlindableComponent>(body, out var incurable) && incurable.Incurable)
-                _blindableSystem.SetMinDamage(body, 8);
-            // hack fix, please remove if you fix eye damage transferring to eyes
-        }
-
-        private void OnOrganDisabled(EntityUid uid, EyesComponent component, OrganDisabledEvent args)
-        {
-            if (TerminatingOrDeleted(uid)
-            || args.Organ.Comp.Body is not { Valid: true } body)
-                return;
-
-            EnsureComp<TemporaryBlindnessComponent>(body);
-            HandleSight(body, uid);
-        }
-    }
-}
diff --git a/Content.Server/_Shitmed/Cybernetics/CyberneticsSystem.cs b/Content.Server/_Shitmed/Cybernetics/CyberneticsSystem.cs
deleted file mode 100644
index 386bfc9de8c..00000000000
--- a/Content.Server/_Shitmed/Cybernetics/CyberneticsSystem.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Content.Server.Emp;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Organ;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared._Shitmed.Cybernetics;
-
-namespace Content.Server._Shitmed.Cybernetics;
-
-internal sealed class CyberneticsSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<CyberneticsComponent, EmpPulseEvent>(OnEmpPulse);
-        SubscribeLocalEvent<CyberneticsComponent, EmpDisabledRemoved>(OnEmpDisabledRemoved);
-    }
-    private void OnEmpPulse(Entity<CyberneticsComponent> cyberEnt, ref EmpPulseEvent ev)
-    {
-        if (!cyberEnt.Comp.Disabled)
-        {
-            ev.Affected = true;
-            ev.Disabled = true;
-            cyberEnt.Comp.Disabled = true;
-
-            if (HasComp<OrganComponent>(cyberEnt))
-            {
-                var disableEvent = new OrganEnableChangedEvent(false);
-                RaiseLocalEvent(cyberEnt, ref disableEvent);
-            }
-            else if (HasComp<BodyPartComponent>(cyberEnt))
-            {
-                var disableEvent = new BodyPartEnableChangedEvent(false);
-                RaiseLocalEvent(cyberEnt, ref disableEvent);
-            }
-        }
-    }
-
-    private void OnEmpDisabledRemoved(Entity<CyberneticsComponent> cyberEnt, ref EmpDisabledRemoved ev)
-    {
-        if (cyberEnt.Comp.Disabled)
-        {
-            cyberEnt.Comp.Disabled = false;
-            if (HasComp<OrganComponent>(cyberEnt))
-            {
-                var enableEvent = new OrganEnableChangedEvent(true);
-                RaiseLocalEvent(cyberEnt, ref enableEvent);
-            }
-            else if (HasComp<BodyPartComponent>(cyberEnt))
-            {
-                var enableEvent = new BodyPartEnableChangedEvent(true);
-                RaiseLocalEvent(cyberEnt, ref enableEvent);
-            }
-        }
-    }
-}
diff --git a/Content.Server/_Shitmed/DelayedDeath/DelayedDeathComponent.cs b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathComponent.cs
deleted file mode 100644
index 413385f3db7..00000000000
--- a/Content.Server/_Shitmed/DelayedDeath/DelayedDeathComponent.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: 2024 gluesniffler <159397573+gluesniffler@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
-// SPDX-FileCopyrightText: 2025 Solstice <solsticeofthewinter@gmail.com>
-// SPDX-FileCopyrightText: 2025 SolsticeOfTheWinter <solsticeofthewinter@gmail.com>
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-namespace Content.Server._Shitmed.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;
-
-    /// <summary>
-    /// What message is displayed when the time runs out - Goobstation
-    /// </summary>
-    [DataField]
-    public LocId DeathMessageId;
-
-    /// <summary>
-    /// What the defib displays when attempting to revive this entity. - Goobstation
-    /// </summary>
-    [DataField]
-    public LocId DefibFailMessageId = "defibrillator-missing-organs";
-}
diff --git a/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs
deleted file mode 100644
index bc9d0bff759..00000000000
--- a/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2025 Aiden <aiden@djkraz.com>
-// SPDX-FileCopyrightText: 2025 GoobBot <uristmchands@proton.me>
-// SPDX-FileCopyrightText: 2025 Solstice <solsticeofthewinter@gmail.com>
-// SPDX-FileCopyrightText: 2025 SolsticeOfTheWinter <solsticeofthewinter@gmail.com>
-// SPDX-FileCopyrightText: 2025 deltanedas <39013340+deltanedas@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2025 deltanedas <@deltanedas:kde.org>
-// SPDX-FileCopyrightText: 2025 gluesniffler <159397573+gluesniffler@users.noreply.github.com>
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-using Content.Shared._Goobstation.DelayedDeath;
-using Content.Server.Chat.Systems;
-using Content.Shared.Chat;
-using Content.Shared.Medical;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-
-namespace Content.Server._Shitmed.DelayedDeath;
-
-public partial class DelayedDeathSystem : EntitySystem
-{
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!; // Goobstation
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DelayedDeathComponent, TargetBeforeDefibrillatorZapsEvent>(OnDefibZap);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        using var query = EntityQueryEnumerator<DelayedDeathComponent, MobStateComponent>();
-        while (query.MoveNext(out var ent, out var comp, out var mob))
-        {
-            comp.DeathTimer += frameTime;
-
-            if (comp.DeathTimer >= comp.DeathTime && !_mobState.IsDead(ent, mob))
-            {
-                // go crit then dead so deathgasp can happen
-                _mobState.ChangeMobState(ent, MobState.Critical, mob);
-                _mobState.ChangeMobState(ent, MobState.Dead, mob);
-
-                // goob code
-                var ev = new DelayedDeathEvent(ent);
-                RaiseLocalEvent(ent, ref ev);
-
-                if (ev.Cancelled)
-                {
-                    RemCompDeferred<DelayedDeathComponent>(ent);
-                    continue;
-                }
-
-                if (!string.IsNullOrWhiteSpace(comp.DeathMessageId)) // Goobstation
-                    _popupSystem.PopupEntity(Loc.GetString(comp.DeathMessageId), ent, PopupType.LargeCaution);
-            }
-        }
-    }
-
-    private void OnDefibZap(Entity<DelayedDeathComponent> ent, ref TargetBeforeDefibrillatorZapsEvent args)
-    {
-        // can't defib someone without a heart or brain pal
-        args.Cancel();
-
-        var failPopup = Loc.GetString(ent.Comp.DeathMessageId); // Goobstation
-        _chat.TrySendInGameICMessage(args.Defib, failPopup, InGameICChatType.Speak, true);
-    }
-}
diff --git a/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs b/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
deleted file mode 100644
index abbbd0928ad..00000000000
--- a/Content.Server/_Shitmed/Destructible/Thresholds/Behaviors/GibPartBehavior.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using JetBrains.Annotations;
-
-// Leaving this one in the default namespace because I am afraid to test it 
-// in the Shitmed namespace lmao.
-namespace Content.Server.Destructible.Thresholds.Behaviors;
-
-[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);
-    }
-}
-
diff --git a/Content.Server/_Shitmed/GameTicking/Rules/Components/AbductorVictimRuleComponent.cs b/Content.Server/_Shitmed/GameTicking/Rules/Components/AbductorVictimRuleComponent.cs
deleted file mode 100644
index f9d7c0406e2..00000000000
--- a/Content.Server/_Shitmed/GameTicking/Rules/Components/AbductorVictimRuleComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Random;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._Shitmed.GameTicking.Rules.Components;
-
-[RegisterComponent]
-public sealed partial class AbductorVictimRuleComponent : Component;
diff --git a/Content.Server/_Shitmed/ItemSwitch/ItemSwitchSystem.cs b/Content.Server/_Shitmed/ItemSwitch/ItemSwitchSystem.cs
deleted file mode 100644
index fe1f1a6888b..00000000000
--- a/Content.Server/_Shitmed/ItemSwitch/ItemSwitchSystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared._Shitmed.ItemSwitch;
-
-namespace Content.Server._Shitmed.ItemSwitch;
-
-public sealed class ItemSwitchSystem : SharedItemSwitchSystem
-{
-}
diff --git a/Content.Server/_Shitmed/Medical/Surgery/GhettoSurgerySystem.cs b/Content.Server/_Shitmed/Medical/Surgery/GhettoSurgerySystem.cs
deleted file mode 100644
index cacf90817a0..00000000000
--- a/Content.Server/_Shitmed/Medical/Surgery/GhettoSurgerySystem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Server.Kitchen.Components;
-using Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-namespace Content.Server._Shitmed.Medical.Surgery;
-
-/// <summary>
-/// Makes all sharp things usable for incisions and sawing through bones, though worse than any other kind of ghetto analogue.
-/// </summary>
-public sealed partial class GhettoSurgerySystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SharpComponent, MapInitEvent>(OnSharpInit);
-        SubscribeLocalEvent<SharpComponent, ComponentShutdown>(OnSharpShutdown);
-    }
-
-    private void OnSharpInit(Entity<SharpComponent> ent, ref MapInitEvent args)
-    {
-        if (EnsureComp<ScalpelComponent>(ent, out var scalpel))
-        {
-            ent.Comp.HadScalpel = true;
-        }
-        else
-        {
-            scalpel.Speed = 0.3f;
-            Dirty(ent.Owner, scalpel);
-        }
-
-        if (EnsureComp<BoneSawComponent>(ent, out var saw))
-        {
-            ent.Comp.HadBoneSaw = true;
-        }
-        else
-        {
-            saw.Speed = 0.2f;
-            Dirty(ent.Owner, saw);
-        }
-    }
-
-    private void OnSharpShutdown(Entity<SharpComponent> ent, ref ComponentShutdown args)
-    {
-        if (ent.Comp.HadScalpel)
-            RemComp<ScalpelComponent>(ent);
-
-        if (ent.Comp.HadBoneSaw)
-            RemComp<BoneSawComponent>(ent);
-    }
-}
diff --git a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
deleted file mode 100644
index 78efb216bb5..00000000000
--- a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-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.Bed.Sleep;
-using Content.Shared.CCVar;
-using Content.Shared.Damage;
-using Content.Shared.Eye.Blinding.Components;
-using Content.Shared.Eye.Blinding.Systems;
-using Content.Shared.Interaction;
-using Content.Shared.Inventory;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared._Shitmed.Medical.Surgery.Conditions;
-using Content.Shared._Shitmed.Medical.Surgery.Effects.Step;
-using Content.Shared._Shitmed.Medical.Surgery.Steps;
-using Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-using Content.Shared._Shitmed.Medical.Surgery.Tools;
-using Robust.Server.GameObjects;
-using Robust.Shared.Configuration;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-using System.Linq;
-using Content.Shared.Verbs;
-
-namespace Content.Server._Shitmed.Medical.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!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SurgeryToolComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
-        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);
-    }
-
-    protected override void RefreshUI(EntityUid body)
-    {
-        var surgeries = new Dictionary<NetEntity, List<EntProtoId>>();
-        foreach (var surgery in AllSurgeries)
-        {
-            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);
-            }
-
-        }
-        _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 AttemptStartSurgery(Entity<SurgeryToolComponent> ent, EntityUid user, EntityUid target)
-    {
-        if (!IsLyingDown(target, user))
-            return;
-
-        if (user == target && !_config.GetCVar(CCVars.CanOperateOnSelf))
-        {
-            _popup.PopupEntity(Loc.GetString("surgery-error-self-surgery"), user, user);
-            return;
-        }
-
-        _ui.OpenUi(target, SurgeryUIKey.Key, user);
-        RefreshUI(target);
-    }
-
-    private void OnUtilityVerb(Entity<SurgeryToolComponent> ent, ref GetVerbsEvent<UtilityVerb> args)
-    {
-        if (!args.CanInteract
-            || !args.CanAccess
-            || !HasComp<SurgeryTargetComponent>(args.Target))
-            return;
-
-        var user = args.User;
-        var target = args.Target;
-
-        var verb = new UtilityVerb()
-        {
-            Act = () => AttemptStartSurgery(ent, user, target),
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/"), "scalpel"),
-            Text = Loc.GetString("surgery-verb-text"),
-            Message = Loc.GetString("surgery-verb-message"),
-            DoContactInteraction = true
-        };
-
-        args.Verbs.Add(verb);
-    }
-
-    private void OnSurgeryStepDamage(Entity<SurgeryTargetComponent> ent, ref SurgeryStepDamageEvent args) =>
-        SetDamage(args.Body, args.Damage, args.PartMultiplier, args.User, args.Part);
-
-    private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> ent, ref 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 OnSurgerySpecialDamageChange(Entity<SurgerySpecialDamageChangeEffectComponent> ent, ref SurgeryStepDamageChangeEvent args)
-    {
-        // Im killing this shit soon too, inshallah.
-        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 OnStepScreamComplete(Entity<SurgeryStepEmoteEffectComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (HasComp<ForcedSleepingComponent>(args.Body) || HasComp<NoScreamComponent>(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);
-}
diff --git a/Content.Server/_Shitmed/Objectives/Components/ForceHereticObjectiveComponent.cs b/Content.Server/_Shitmed/Objectives/Components/ForceHereticObjectiveComponent.cs
deleted file mode 100644
index 763fad401cc..00000000000
--- a/Content.Server/_Shitmed/Objectives/Components/ForceHereticObjectiveComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Server.Objectives.Systems;
-
-namespace Content.Server._Shitmed.Objectives.Components;
-
-/// <summary>
-///     I had a really bad idea and im shitcoding this!
-/// </summary>
-[RegisterComponent]
-public sealed partial class ForceHereticObjectiveComponent : Component;
diff --git a/Content.Server/_Shitmed/Objectives/Components/RoleplayObjectiveComponent.cs b/Content.Server/_Shitmed/Objectives/Components/RoleplayObjectiveComponent.cs
deleted file mode 100644
index 8f9dbbc20b9..00000000000
--- a/Content.Server/_Shitmed/Objectives/Components/RoleplayObjectiveComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Server.Objectives.Systems;
-
-namespace Content.Server._Shitmed.Objectives.Components;
-
-/// <summary>
-///     Objective doesn't have a completion objective. Purely exists as a fancier roleplay prompt. Greentext by default.
-/// </summary>
-[RegisterComponent]
-public sealed partial class RoleplayObjectiveComponent : Component;
diff --git a/Content.Server/_Shitmed/Objectives/Systems/ForceHereticObjectiveSystem.cs b/Content.Server/_Shitmed/Objectives/Systems/ForceHereticObjectiveSystem.cs
deleted file mode 100644
index 37fb6c69236..00000000000
--- a/Content.Server/_Shitmed/Objectives/Systems/ForceHereticObjectiveSystem.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Server._Shitmed.Objectives.Components;
-using Content.Server.Administration.Logs;
-using Content.Server.Antag;
-using Content.Server.GameTicking.Rules.Components;
-using Content.Shared.Database;
-using Content.Shared.Mind;
-using Robust.Shared.Player;
-namespace Content.Server._Shitmed.Objectives.Systems;
-// heretic is not real...
-// public sealed class ForceHereticObjectiveSystem : EntitySystem
-//{
-//    [Dependency] private readonly SharedMindSystem _mind = default!;
-//    [Dependency] private readonly AntagSelectionSystem _antag = default!;
-//    [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
-
-//    public override void Initialize()
-//    {
-//        base.Initialize();
-//
-//        SubscribeLocalEvent<MindComponent, ObjectiveAddedEvent>(OnObjectiveAdded);
-//    }
-
-//    private void OnObjectiveAdded(EntityUid uid, MindComponent comp, ref ObjectiveAddedEvent args)
-//    {
-//        if (!TryComp<ActorComponent>(comp.CurrentEntity, out var actor))
-//            return;
-//
-//        if (HasComp<ForceHereticObjectiveComponent>(args.Objective))
-//        {
-//            _antag.ForceMakeAntag<HereticRuleComponent>(actor.PlayerSession, "Heretic");
-//
-//            _adminLogManager.Add(LogType.Mind,
-//                LogImpact.Medium,
-//                $"{ToPrettyString(uid)} has been given heretic status by an antag objective.");
-//        }
-//    }
-//}
diff --git a/Content.Server/_Shitmed/Objectives/Systems/RoleplayObjectiveSystem.cs b/Content.Server/_Shitmed/Objectives/Systems/RoleplayObjectiveSystem.cs
deleted file mode 100644
index f80eb55eebc..00000000000
--- a/Content.Server/_Shitmed/Objectives/Systems/RoleplayObjectiveSystem.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Content.Server._Shitmed.Objectives.Components;
-using Content.Shared.Mind;
-using Content.Shared.Objectives.Components;
-
-namespace Content.Server._Shitmed.Objectives.Systems;
-
-public sealed class RoleplayObjectiveSystem : EntitySystem
-{
-    [Dependency] private readonly SharedMindSystem _mind = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RoleplayObjectiveComponent, ObjectiveGetProgressEvent>(OnRoleplayGetProgress);
-    }
-
-    private void OnRoleplayGetProgress(EntityUid uid, RoleplayObjectiveComponent comp, ref ObjectiveGetProgressEvent args)
-    {
-        args.Progress = 1f;
-    }
-}
diff --git a/Content.Server/_Shitmed/OnHit/OnHitSystem.cs b/Content.Server/_Shitmed/OnHit/OnHitSystem.cs
deleted file mode 100644
index 58850ceb8d4..00000000000
--- a/Content.Server/_Shitmed/OnHit/OnHitSystem.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared._Shitmed.OnHit;
-using Content.Shared.Actions;
-using Content.Shared.DoAfter;
-using Robust.Shared.Prototypes;
-using Content.Shared.Cuffs.Components;
-using Content.Shared.Damage.Components;
-using Content.Shared.Weapons.Melee.Events;
-
-namespace Content.Server._Shitmed.OnHit;
-
-public sealed partial class OnHitSystem : SharedOnHitSystem
-{
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<CuffsOnHitComponent, CuffsOnHitDoAfter>(OnCuffsOnHitDoAfter);
-        base.Initialize();
-    }
-    private void OnCuffsOnHitDoAfter(Entity<CuffsOnHitComponent> ent, ref CuffsOnHitDoAfter args)
-    {
-        if (!args.Args.Target.HasValue || args.Handled || args.Cancelled) return;
-
-        var user = args.Args.User;
-        var target = args.Args.Target.Value;
-
-        if (!TryComp<CuffableComponent>(target, out var cuffable) || cuffable.Container.Count != 0)
-            return;
-
-        args.Handled = true;
-
-        var handcuffs = SpawnNextToOrDrop(ent.Comp.HandcuffPrototype, args.User);
-
-        if (!_cuffs.TryAddNewCuffs(target, user, handcuffs, cuffable))
-            QueueDel(handcuffs);
-    }
-}
diff --git a/Content.Server/_Shitmed/Roles/AbductorVictimRoleComponent.cs b/Content.Server/_Shitmed/Roles/AbductorVictimRoleComponent.cs
deleted file mode 100644
index b13e6bda46e..00000000000
--- a/Content.Server/_Shitmed/Roles/AbductorVictimRoleComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Roles;
-
-namespace Content.Server.Roles;
-
-/// <summary>
-///     Added to mind role entities to tag that they are an Abductor Victim.
-/// </summary>
-[RegisterComponent]
-public sealed partial class AbductorVictimRoleComponent : BaseMindRoleComponent;
diff --git a/Content.Server/_Shitmed/StatusEffects/ActivateArtifactEffectSystem.cs b/Content.Server/_Shitmed/StatusEffects/ActivateArtifactEffectSystem.cs
deleted file mode 100644
index 1d024c194d5..00000000000
--- a/Content.Server/_Shitmed/StatusEffects/ActivateArtifactEffectSystem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared._Shitmed.StatusEffects;
-using Content.Server.Xenoarchaeology.XenoArtifacts;
-
-namespace Content.Server._Shitmed.StatusEffects;
-
-public sealed class ActivateArtifactEffectSystem : EntitySystem
-{
-    [Dependency] private readonly ArtifactSystem _artifact = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<ActivateArtifactEffectComponent, ComponentInit>(OnInit);
-    }
-    private void OnInit(EntityUid uid, ActivateArtifactEffectComponent component, ComponentInit args)
-    {
-        if (!TryComp<ArtifactComponent>(uid, out var artifact))
-            return;
-
-        _artifact.TryActivateArtifact(uid);
-    }
-
-
-}
-
diff --git a/Content.Server/_Shitmed/StatusEffects/ExpelGasSystem.cs b/Content.Server/_Shitmed/StatusEffects/ExpelGasSystem.cs
deleted file mode 100644
index deae1f35c04..00000000000
--- a/Content.Server/_Shitmed/StatusEffects/ExpelGasSystem.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared._Shitmed.StatusEffects;
-using Content.Server.Atmos.EntitySystems;
-using Content.Server.Chat.Systems;
-using Robust.Shared.Random;
-
-namespace Content.Server._Shitmed.StatusEffects;
-
-public sealed class ExpelGasEffectSystem : EntitySystem
-{
-    [Dependency] private readonly AtmosphereSystem _atmos = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<ExpelGasComponent, ComponentInit>(OnInit);
-    }
-    private void OnInit(EntityUid uid, ExpelGasComponent component, ComponentInit args)
-    {
-        var mix = _atmos.GetContainingMixture((uid, Transform(uid)), true, true) ?? new();
-        var gas = _random.Pick(component.PossibleGases);
-        mix.AdjustMoles(gas, 60);
-        _chat.TryEmoteWithChat(uid, "Fart");
-    }
-
-
-}
-
diff --git a/Content.Server/_Shitmed/StatusEffects/ScramEffectSystem.cs b/Content.Server/_Shitmed/StatusEffects/ScramEffectSystem.cs
deleted file mode 100644
index ea1b9d597af..00000000000
--- a/Content.Server/_Shitmed/StatusEffects/ScramEffectSystem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared._Shitmed.StatusEffects;
-using Content.Server.Teleportation;
-
-namespace Content.Server._Shitmed.StatusEffects;
-
-public sealed class ScrambleLocationEffectSystem : EntitySystem
-{
-    [Dependency] private readonly TeleportSystem _teleportSys = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<ScrambleLocationEffectComponent, ComponentInit>(OnInit);
-    }
-    private void OnInit(EntityUid uid, ScrambleLocationEffectComponent component, ComponentInit args)
-    {
-        // TODO: Add the teleport component via onAdd:
-        var teleport = EnsureComp<RandomTeleportComponent>(uid);
-        _teleportSys.RandomTeleport(uid, teleport);
-    }
-
-
-}
\ No newline at end of file
diff --git a/Content.Server/_Shitmed/StatusEffects/ScrambleDnaEffectSystem.cs b/Content.Server/_Shitmed/StatusEffects/ScrambleDnaEffectSystem.cs
deleted file mode 100644
index 5176f414f7f..00000000000
--- a/Content.Server/_Shitmed/StatusEffects/ScrambleDnaEffectSystem.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Content.Server.Forensics;
-using Content.Server.Humanoid;
-using Content.Shared._Shitmed.StatusEffects;
-using Content.Shared.Forensics;
-using Content.Shared.Forensics.Components;
-using Content.Shared.Humanoid;
-using Content.Shared.Preferences;
-using Content.Shared.Popups;
-
-namespace Content.Server._Shitmed.StatusEffects;
-
-public sealed class ScrambleDnaEffectSystem : EntitySystem
-{
-    [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
-    [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<ScrambleDnaEffectComponent, ComponentInit>(OnInit);
-    }
-
-    private void OnInit(EntityUid uid, ScrambleDnaEffectComponent component, ComponentInit args)
-    {
-        if (TryComp<HumanoidAppearanceComponent>(uid, out var humanoid))
-        {
-            var newProfile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
-            _humanoidAppearance.LoadProfile(uid, newProfile, humanoid, loadExtensions: false, generateLoadouts: false);
-            _metaData.SetEntityName(uid, newProfile.Name);
-            if (TryComp<DnaComponent>(uid, out var dna))
-            {
-                dna.DNA = _forensicsSystem.GenerateDNA();
-
-                var ev = new GenerateDnaEvent { Owner = uid, DNA = dna.DNA };
-                RaiseLocalEvent(uid, ref ev);
-            }
-            if (TryComp<FingerprintComponent>(uid, out var fingerprint))
-            {
-                fingerprint.Fingerprint = _forensicsSystem.GenerateFingerprint();
-            }
-            _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup"), uid, uid);
-        }
-    }
-
-
-}
diff --git a/Content.Server/_Shitmed/StatusEffects/SpawnEntityEffectSystem.cs b/Content.Server/_Shitmed/StatusEffects/SpawnEntityEffectSystem.cs
deleted file mode 100644
index 0418e732a35..00000000000
--- a/Content.Server/_Shitmed/StatusEffects/SpawnEntityEffectSystem.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Content.Shared.NPC.Components;
-using Content.Shared.NPC.Systems;
-using Content.Shared._Shitmed.StatusEffects;
-
-namespace Content.Server._Shitmed.StatusEffects;
-
-public sealed class SpawnEntityEffectSystem : EntitySystem
-{
-    [Dependency] private readonly SharedTransformSystem _xformSys = default!;
-    [Dependency] private readonly NpcFactionSystem _factionException = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<SpawnSpiderEggsComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SpawnSlimesComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SpawnEmpComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SpawnGravityWellComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SpawnFlashComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SpawnSmokeComponent, ComponentInit>(OnInit);
-    }
-
-    private void OnInit(EntityUid uid, SpawnEntityEffectComponent component, ComponentInit args)
-    {
-        EntityUid entity;
-
-        if (component.AttachToParent)
-        {
-            entity = SpawnAttachedTo(component.EntityPrototype, Transform(uid).Coordinates);
-            _xformSys.SetParent(entity, uid);
-        }
-        else
-        {
-            entity = Spawn(component.EntityPrototype, Transform(uid).Coordinates);
-        }
-
-        if (component.IsFriendly)
-        {
-            if (EnsureComp<FactionExceptionComponent>(entity, out var comp))
-                return;
-
-            _factionException.IgnoreEntities(entity, new[] { uid });
-        }
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/Content.Server/_Shitmed/Targeting/TargetingSystem.cs b/Content.Server/_Shitmed/Targeting/TargetingSystem.cs
deleted file mode 100644
index 889d8e7b301..00000000000
--- a/Content.Server/_Shitmed/Targeting/TargetingSystem.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Content.Shared.Body.Systems;
-using Content.Shared.Mobs;
-using Content.Shared._Shitmed.Targeting;
-using Content.Shared._Shitmed.Targeting.Events;
-using Content.Shared.Body.Part;
-
-namespace Content.Server._Shitmed.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.Server/_White/Atmos/Systems/BreathToolSystem.cs b/Content.Server/_White/Atmos/Systems/BreathToolSystem.cs
new file mode 100644
index 00000000000..b8a5f2b7481
--- /dev/null
+++ b/Content.Server/_White/Atmos/Systems/BreathToolSystem.cs
@@ -0,0 +1,78 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Shared.Clothing;
+using Content.Shared.Inventory;
+using Content.Shared.Inventory.Events;
+
+namespace Content.Server._White.Atmos.Systems;
+
+public sealed class BreathToolSystem : EntitySystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmos = default!;
+    [Dependency] private readonly InternalsSystem _internals = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BreathToolComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<BreathToolComponent, GotEquippedEvent>(OnGotEquipped);
+        SubscribeLocalEvent<BreathToolComponent, GotUnequippedEvent>(OnGotUnequipped);
+        SubscribeLocalEvent<BreathToolComponent, ItemMaskToggledEvent>(OnMaskToggled);
+    }
+
+    private void OnInit(Entity<BreathToolComponent> ent, ref ComponentInit args)
+    {
+        var comp = ent.Comp;
+
+        comp.IsFunctional = true;
+
+        if (!_inventory.TryGetContainingEntity(ent.Owner, out var parent)
+            || !_inventory.TryGetContainingSlot(ent.Owner, out var slot)
+            || (slot.SlotFlags & comp.AllowedSlots) == 0
+            || !TryComp(parent, out InternalsComponent? internals))
+            return;
+
+        ent.Comp.ConnectedInternalsEntity = parent;
+        _internals.ConnectBreathTool((parent.Value, internals), ent);
+    }
+
+    private void OnGotUnequipped(Entity<BreathToolComponent> ent, ref GotUnequippedEvent args)
+    {
+        _atmos.DisconnectInternals(ent);
+    }
+
+    private void OnGotEquipped(Entity<BreathToolComponent> ent, ref GotEquippedEvent args)
+    {
+        if ((args.SlotFlags & ent.Comp.AllowedSlots) == 0)
+            return;
+
+        ent.Comp.IsFunctional = true;
+
+        if (TryComp(args.Equipee, out InternalsComponent? internals))
+        {
+            ent.Comp.ConnectedInternalsEntity = args.Equipee;
+            _internals.ConnectBreathTool((args.Equipee, internals), ent);
+        }
+    }
+
+    private void OnMaskToggled(Entity<BreathToolComponent> ent, ref ItemMaskToggledEvent args)
+    {
+        if (args.IsToggled || args.IsEquip)
+        {
+            _atmos.DisconnectInternals(ent);
+            return;
+        }
+
+        ent.Comp.IsFunctional = true;
+
+        if (!TryComp(args.Wearer, out InternalsComponent? internals))
+            return;
+
+        ent.Comp.ConnectedInternalsEntity = args.Wearer;
+        _internals.ConnectBreathTool((args.Wearer, internals), ent);
+    }
+}
diff --git a/Content.Server/_White/BloodCult/BloodRites/BloodRitesSystem.cs b/Content.Server/_White/BloodCult/BloodRites/BloodRitesSystem.cs
index d358e3446db..cd3087b75ea 100644
--- a/Content.Server/_White/BloodCult/BloodRites/BloodRitesSystem.cs
+++ b/Content.Server/_White/BloodCult/BloodRites/BloodRitesSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server.DoAfter;
 using Content.Server.Popups;
 using Content.Shared._White.BloodCult.BloodCultist;
 using Content.Shared._White.BloodCult.BloodRites;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
@@ -168,7 +168,7 @@ Entity<BloodstreamComponent> target
         if (target.Comp.BloodSolution is null)
             return false;
 
-        _bloodstream.FlushChemicals(target, string.Empty, 10);
+        _bloodstream.FlushChemicals(target.Owner, 10);
         var missingBlood = target.Comp.BloodSolution.Value.Comp.Solution.AvailableVolume;
         if (missingBlood == 0)
             return false;
@@ -183,8 +183,8 @@ Entity<BloodstreamComponent> target
             bloodCost = user.Comp.StoredBloodAmount;
         }
 
-        _bloodstream.TryModifyBleedAmount(target, -3);
-        _bloodstream.TryModifyBloodLevel(target, bloodCost / rites.Comp.BloodRegenerationRatio);
+        _bloodstream.TryModifyBleedAmount(target.Owner, -3);
+        _bloodstream.TryModifyBloodLevel(target.Owner, bloodCost / rites.Comp.BloodRegenerationRatio);
 
         user.Comp.StoredBloodAmount -= bloodCost;
         Dirty(user);
diff --git a/Content.Server/_White/BloodCult/Runes/BloodBoil/CultRuneBloodBoilSystem.cs b/Content.Server/_White/BloodCult/Runes/BloodBoil/CultRuneBloodBoilSystem.cs
index 5eacb050529..796386b0e08 100644
--- a/Content.Server/_White/BloodCult/Runes/BloodBoil/CultRuneBloodBoilSystem.cs
+++ b/Content.Server/_White/BloodCult/Runes/BloodBoil/CultRuneBloodBoilSystem.cs
@@ -2,12 +2,12 @@
 using System.Numerics;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Body.Components;
 using Content.Server.Examine;
 using Content.Server.Popups;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared._White.BloodCult.BloodCultist;
 using Content.Shared._White.BloodCult.Runes.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Projectiles;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/_White/BloodCult/Runes/Offering/CultRuneOfferingSystem.cs b/Content.Server/_White/BloodCult/Runes/Offering/CultRuneOfferingSystem.cs
index d5a5f839427..62a593f10cf 100644
--- a/Content.Server/_White/BloodCult/Runes/Offering/CultRuneOfferingSystem.cs
+++ b/Content.Server/_White/BloodCult/Runes/Offering/CultRuneOfferingSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server._White.GameTicking.Rules;
+using Content.Server._White.Gibbing;
 using Content.Server.Bible.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Cuffs;
@@ -19,9 +20,9 @@ public sealed class CultRuneOfferingSystem : EntitySystem
 {
     [Dependency] private readonly BloodCultRuleSystem _bloodCultRule = default!;
     [Dependency] private readonly BloodCultRuneSystem _bloodCultRune = default!;
-    [Dependency] private readonly BodySystem _body = default!;
     [Dependency] private readonly CuffableSystem _cuffable = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
@@ -103,7 +104,7 @@ private void Sacrifice(Entity<CultRuneOfferingComponent> rune, EntityUid target)
             _mind.UnVisit(mindId);
         }
 
-        _body.GibBody(target);
+        _gibbing.GibBody(target);
     }
 
     private void Convert(Entity<CultRuneOfferingComponent> rune, EntityUid target, EntityUid user)
diff --git a/Content.Server/_White/BloodCult/Runes/Revive/CultRuneReviveSystem.cs b/Content.Server/_White/BloodCult/Runes/Revive/CultRuneReviveSystem.cs
index f7072bdc605..115e343aced 100644
--- a/Content.Server/_White/BloodCult/Runes/Revive/CultRuneReviveSystem.cs
+++ b/Content.Server/_White/BloodCult/Runes/Revive/CultRuneReviveSystem.cs
@@ -47,7 +47,6 @@ private void OnReviveRuneInvoked(Entity<CultRuneReviveComponent> ent, ref Invoke
             ent.Comp.ReviveRange,
             entity =>
                 !HasComp<DamageableComponent>(entity) ||
-                !HasComp<MobThresholdsComponent>(entity) ||
                 !HasComp<MobStateComponent>(entity) ||
                 _mobState.IsAlive(entity)
         );
diff --git a/Content.Server/_White/Body/Bloodstream/Systems/BloodstreamSystem.cs b/Content.Server/_White/Body/Bloodstream/Systems/BloodstreamSystem.cs
new file mode 100644
index 00000000000..94b43d8488b
--- /dev/null
+++ b/Content.Server/_White/Body/Bloodstream/Systems/BloodstreamSystem.cs
@@ -0,0 +1,125 @@
+using Content.Server.Body.Components;
+using Content.Server.EntityEffects.Effects;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Chemistry.Reagent;
+using Content.Shared.CCVar;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Contests;
+using Content.Shared.Forensics;
+using Content.Shared.HeightAdjust;
+using Robust.Shared.Configuration;
+
+namespace Content.Server._White.Body.Bloodstream.Systems;
+
+public sealed class BloodstreamSystem : SharedBloodstreamSystem
+{
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+
+    [Dependency] private readonly ContestsSystem _contests = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BloodstreamComponent, BeingGibbedEvent>(OnBeingGibbed);
+        SubscribeLocalEvent<BloodstreamComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<BloodstreamComponent, GenerateDnaEvent>(OnDnaGenerated);
+        SubscribeLocalEvent<BloodstreamComponent, HeightAdjustedEvent>(OnHeightAdjusted);
+        SubscribeLocalEvent<BloodstreamComponent, ReactionAttemptEvent>(OnReactionAttempt);
+        SubscribeLocalEvent<BloodstreamComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
+    }
+
+    #region Event Handling
+
+    private void OnBeingGibbed(Entity<BloodstreamComponent> ent, ref BeingGibbedEvent args) => SpillAllSolutions(ent.AsNullable());
+
+    private void OnComponentInit(Entity<BloodstreamComponent> ent, ref ComponentInit args)
+    {
+        if (!SolutionContainer.EnsureSolution(ent.Owner, ent.Comp.BloodSolutionName, out var bloodSolution)
+            || !SolutionContainer.EnsureSolution(ent.Owner, ent.Comp.BloodTemporarySolutionName, out var tempSolution))
+            return;
+
+        if (ent.Comp.PowerMassAdjust != 0f && _configuration.GetCVar(CCVars.HeightAdjustModifiesBloodstream))
+        {
+            var factor = Math.Pow(_contests.MassContest(ent, bypassClamp: true, rangeFactor: 4f), ent.Comp.PowerMassAdjust);
+            ent.Comp.BloodMaxVolumeMultiplier = Math.Clamp(factor, ent.Comp.MinMassAdjust, ent.Comp.MaxMassAdjust);
+            DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodMaxVolumeMultiplier));
+        }
+
+        bloodSolution.MaxVolume = ent.Comp.CurrentBloodMaxVolume + ent.Comp.ChemicalMaxVolume;
+        tempSolution.MaxVolume = ent.Comp.BleedPuddleThreshold * 4; // give some leeway, for chem stream as well
+
+        // Fill a blood solution with BLOOD
+        bloodSolution.AddReagent(new ReagentId(ent.Comp.BloodReagent, GetEntityBloodData(ent.AsNullable())), ent.Comp.CurrentBloodMaxVolume - bloodSolution.Volume);
+    }
+
+    private void OnDnaGenerated(Entity<BloodstreamComponent> ent, ref GenerateDnaEvent args)
+    {
+        if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+        {
+            Log.Error("Unable to set bloodstream DNA, solution entity could not be resolved");
+            return;
+        }
+
+        var bloodData = GenerateEntityBloodData(ent.AsNullable());
+        foreach (var reagent in bloodSolution.Contents)
+        {
+            if (reagent.Reagent.Prototype != ent.Comp.BloodReagent)
+                continue;
+
+            var reagentData = reagent.Reagent.EnsureReagentData();
+            reagentData.RemoveAll(x => x is DnaData or BloodReagentData);
+            reagentData.AddRange(bloodData);
+        }
+    }
+
+    private void OnHeightAdjusted(Entity<BloodstreamComponent> ent, ref HeightAdjustedEvent args)
+    {
+        if (ent.Comp.PowerMassAdjust == 0f
+            || !_configuration.GetCVar(CCVars.HeightAdjustModifiesBloodstream)
+            || !SolutionContainer.EnsureSolution(ent.Owner, ent.Comp.BloodSolutionName, out var bloodSolution))
+            return;
+
+        var factor = Math.Pow(_contests.MassContest(ent, bypassClamp: true, rangeFactor: 4f), ent.Comp.PowerMassAdjust);
+        factor = Math.Clamp(factor, ent.Comp.MinMassAdjust, ent.Comp.MaxMassAdjust);
+        ent.Comp.BloodMaxVolumeMultiplier = factor;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodMaxVolumeMultiplier));
+
+        var bloodAmount = GetBloodAmount(ent.AsNullable());
+        bloodSolution.MaxVolume = ent.Comp.CurrentBloodMaxVolume + ent.Comp.ChemicalMaxVolume;
+        TryModifyBloodLevel(ent.AsNullable(), bloodAmount * factor - bloodAmount);
+    }
+
+    private void OnReactionAttempt(Entity<BloodstreamComponent> ent, ref ReactionAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        foreach (var effect in args.Reaction.Effects)
+        {
+            switch (effect)
+            {
+                case CreateEntityReactionEffect: // Prevent entities from spawning in the bloodstream
+                case AreaReactionEffect: // No spontaneous smoke or foam leaking out of blood vessels.
+                    args.Cancelled = true;
+                    return;
+            }
+        }
+
+        // TODO apply organ damage instead of just blocking the reaction?
+        // Having cheese-clots form in your veins can't be good for you.
+    }
+
+    private void OnReactionAttempt(Entity<BloodstreamComponent> ent, ref SolutionRelayEvent<ReactionAttemptEvent> args)
+    {
+        if (args.Name != ent.Comp.BloodSolutionName && args.Name != ent.Comp.BloodTemporarySolutionName)
+            return;
+
+        OnReactionAttempt(ent, ref args.Event);
+    }
+
+    #endregion
+}
diff --git a/Content.Server/_White/Body/BodyParts/Gibbable/GibbableBodyPartComponent.cs b/Content.Server/_White/Body/BodyParts/Gibbable/GibbableBodyPartComponent.cs
new file mode 100644
index 00000000000..80d5b0f7e90
--- /dev/null
+++ b/Content.Server/_White/Body/BodyParts/Gibbable/GibbableBodyPartComponent.cs
@@ -0,0 +1,46 @@
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._White.Body.BodyParts.Gibbable;
+
+[RegisterComponent]
+public sealed partial class GibbableBodyPartComponent : Component
+{
+    /// <summary>
+    /// The wound that will be created after gib of this limb.
+    /// </summary>
+    [DataField]
+    public EntProtoId<WoundComponent> Wound;
+
+    /// <summary>
+    /// Damage, the value of which affects the chance of gibbing a body part.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<DamageTypePrototype>, float> SupportedDamageType = new();
+
+    /// <summary>
+    /// Chance of gibbed body parts based on damage. The highest threshold is selected.
+    /// </summary>
+    [DataField(required: true)]
+    public SortedDictionary<FixedPoint2, float> ChanceThresholds;
+
+    /// <summary>
+    /// A multiplier for the chance of body part gib based on the current bone status.
+    /// </summary>
+    [DataField]
+    public Dictionary<BoneStatus, float> BoneMultiplierThresholds= new();
+
+    [ViewVariables]
+    public FixedPoint2 TotalDamage = FixedPoint2.Zero;
+
+    [ViewVariables]
+    public float CurrentChance => float.Clamp(CurrentChanceThreshold * CurrentBoneMultiplierThreshold, 0f, 1f);
+
+    [ViewVariables]
+    public float CurrentChanceThreshold;
+
+    [ViewVariables]
+    public float CurrentBoneMultiplierThreshold = 1f;
+}
diff --git a/Content.Server/_White/Body/BodyParts/Gibbable/GibbableBodyPartSystem.cs b/Content.Server/_White/Body/BodyParts/Gibbable/GibbableBodyPartSystem.cs
new file mode 100644
index 00000000000..b892d626b97
--- /dev/null
+++ b/Content.Server/_White/Body/BodyParts/Gibbable/GibbableBodyPartSystem.cs
@@ -0,0 +1,85 @@
+using Content.Shared._White.Body.BodyParts.Amputatable;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared._White.Gibbing;
+using Content.Shared._White.Threshold;
+using Content.Shared.FixedPoint;
+using Content.Shared.Rejuvenate;
+using Content.Shared.Throwing;
+using Robust.Shared.Random;
+
+namespace Content.Server._White.Body.BodyParts.Gibbable;
+
+public sealed class GibbableBodyPartSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    [Dependency] private readonly SharedGibbingSystem _gibbing = default!;
+    [Dependency] private readonly SharedWoundSystem _wound = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<GibbableBodyPartComponent, BodyPartRelayedEvent<RejuvenateEvent>>(OnRejuvenate);
+        SubscribeLocalEvent<GibbableBodyPartComponent, BoneStatusChangedEvent>(OnBoneStatusChange);
+        SubscribeLocalEvent<GibbableBodyPartComponent, WoundDamageChangedEvent>(OnWoundDamageChanged, after: new [] {typeof(AmputatableBodyPartSystem)});
+    }
+
+    private void OnRejuvenate(Entity<GibbableBodyPartComponent> gibbableBodyPart, ref BodyPartRelayedEvent<RejuvenateEvent> args)
+    {
+        gibbableBodyPart.Comp.TotalDamage = FixedPoint2.Zero;
+        gibbableBodyPart.Comp.CurrentChanceThreshold = gibbableBodyPart.Comp.ChanceThresholds.HighestMatch(gibbableBodyPart.Comp.TotalDamage) ?? 0f;
+    }
+
+    private void OnBoneStatusChange(Entity<GibbableBodyPartComponent> gibbableBodyPart, ref BoneStatusChangedEvent args)
+    {
+        if (!gibbableBodyPart.Comp.BoneMultiplierThresholds.TryGetValue(args.BoneState, out var boneMultiplier))
+            return;
+
+        gibbableBodyPart.Comp.CurrentBoneMultiplierThreshold = boneMultiplier;
+    }
+
+    private void OnWoundDamageChanged(Entity<GibbableBodyPartComponent> gibbableBodyPart, ref WoundDamageChangedEvent args)
+    {
+        if (args.Handled
+            || args.Wound.Comp.IsScar
+            || !gibbableBodyPart.Comp.SupportedDamageType.TryGetValue(args.Wound.Comp.DamageType, out var modify))
+            return;
+
+        gibbableBodyPart.Comp.TotalDamage += (args.Wound.Comp.DamageAmount - args.OldDamage) * modify;
+
+        if (args.OldDamage >= args.Wound.Comp.DamageAmount)
+            return;
+
+        gibbableBodyPart.Comp.CurrentChanceThreshold = gibbableBodyPart.Comp.ChanceThresholds.HighestMatch(gibbableBodyPart.Comp.TotalDamage) ?? 0f;
+
+        if (!_random.Prob(gibbableBodyPart.Comp.CurrentChance))
+            return;
+
+        var outerEntity = gibbableBodyPart.Owner;
+        if (TryComp<BodyPartComponent>(gibbableBodyPart, out var bodyPartComponent))
+        {
+            if (bodyPartComponent.Body.HasValue)
+                outerEntity = bodyPartComponent.Body.Value;
+
+            if (bodyPartComponent.Parent.HasValue
+                && _wound.TryCreateWound(bodyPartComponent.Parent.Value, gibbableBodyPart.Comp.Wound, out var wound))
+                _wound.ChangeWoundDamage(wound.Value.AsNullable(), gibbableBodyPart.Comp.TotalDamage);
+        }
+
+        var droppedEntities = new HashSet<EntityUid>();
+        _gibbing.TryGibEntity(outerEntity, gibbableBodyPart.Owner, GibType.Gib, GibType.Drop, ref droppedEntities, false);
+
+        foreach (var entity in droppedEntities)
+        {
+            _throwing.TryThrow(
+                entity,
+                _random.NextAngle().ToWorldVec() * _random.NextFloat(0.8f, 2f),
+                _random.NextFloat(0.5f, 1f),
+                pushbackRatio: 0.3f);
+        }
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/_White/Body/Commands/AttachBodyPartCommand.cs b/Content.Server/_White/Body/Commands/AttachBodyPartCommand.cs
new file mode 100644
index 00000000000..2abee6ceaf0
--- /dev/null
+++ b/Content.Server/_White/Body/Commands/AttachBodyPartCommand.cs
@@ -0,0 +1,58 @@
+using Content.Server._White.Body.Systems;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Body.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AttachBodyPartCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "attachbodypart";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 3)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var parentNetUid)
+            || !NetEntity.TryParse(args[1], out var bodyPartNetUid))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+            return;
+        }
+
+        var parentUid = _entManager.GetEntity(parentNetUid);
+        var bodyPartUid = _entManager.GetEntity(bodyPartNetUid);
+
+        var bodySystem = _entManager.System<BodySystem>();
+
+        if (!bodySystem.TryAttachBodyPart(parentUid, bodyPartUid, args[2]))
+        {
+            shell.WriteError(Loc.GetString($"cmd-{Command}-fail"));
+            return;
+        }
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 3)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Body/Commands/AttachBoneCommand.cs b/Content.Server/_White/Body/Commands/AttachBoneCommand.cs
new file mode 100644
index 00000000000..9eac504d24e
--- /dev/null
+++ b/Content.Server/_White/Body/Commands/AttachBoneCommand.cs
@@ -0,0 +1,58 @@
+using Content.Server._White.Body.Systems;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Body.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AttachBoneCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "attachbone";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 3)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var parentNetUid)
+            || !NetEntity.TryParse(args[1], out var boneNetUid))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+            return;
+        }
+
+        var parentUid = _entManager.GetEntity(parentNetUid);
+        var boneUid = _entManager.GetEntity(boneNetUid);
+
+        var bodySystem = _entManager.System<BodySystem>();
+
+        if (!bodySystem.TryAttachBone(parentUid, boneUid, args[2]))
+        {
+            shell.WriteError(Loc.GetString($"cmd-{Command}-fail"));
+            return;
+        }
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 3)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Body/Commands/AttachOrganCommand.cs b/Content.Server/_White/Body/Commands/AttachOrganCommand.cs
new file mode 100644
index 00000000000..473398b1b83
--- /dev/null
+++ b/Content.Server/_White/Body/Commands/AttachOrganCommand.cs
@@ -0,0 +1,58 @@
+using Content.Server._White.Body.Systems;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Body.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AttachOrganCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "attachorgan";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 3)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var parentNetUid)
+            || !NetEntity.TryParse(args[1], out var organNetUid))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+            return;
+        }
+
+        var parentUid = _entManager.GetEntity(parentNetUid);
+        var organUid = _entManager.GetEntity(organNetUid);
+
+        var bodySystem = _entManager.System<BodySystem>();
+
+        if (!bodySystem.TryAttachOrgan(parentUid, organUid, args[2]))
+        {
+            shell.WriteError(Loc.GetString($"cmd-{Command}-fail"));
+            return;
+        }
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 3)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Body/Commands/CreateBodyPartSlotCommand.cs b/Content.Server/_White/Body/Commands/CreateBodyPartSlotCommand.cs
new file mode 100644
index 00000000000..493eedbe7e1
--- /dev/null
+++ b/Content.Server/_White/Body/Commands/CreateBodyPartSlotCommand.cs
@@ -0,0 +1,65 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Commands;
+using Content.Server.Administration;
+using Content.Shared._White.Body.Components;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Body.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class CreateBodyPartCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "createbodypartslot";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var bodyPartType = BodyPartType.None;
+        if (args.Length is < 2 or > 3)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var netUid))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+            return;
+        }
+
+        if (args.Length == 3 && !Enum.TryParse(args[2], out bodyPartType))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-body-part-type-invalid", ("index", args[2])));
+            return;
+        }
+
+        var uid = _entManager.GetEntity(netUid);
+
+        var bodySystem = _entManager.System<BodySystem>();
+
+        if (!bodySystem.TryCreateBodyPartSlot(uid, args[1], bodyPartType))
+        {
+            shell.WriteError(Loc.GetString($"cmd-{Command}-fail"));
+            return;
+        }
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-hint"));
+
+        if (args.Length == 3)
+            return CompletionResult.FromHintOptions(WhiteCompletionHelper.Emuns(typeof(BodyPartType)), Loc.GetString("shell-argument-body-part-type-optional-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Body/Commands/CreateBoneSlotCommand.cs b/Content.Server/_White/Body/Commands/CreateBoneSlotCommand.cs
new file mode 100644
index 00000000000..76eb2abedcc
--- /dev/null
+++ b/Content.Server/_White/Body/Commands/CreateBoneSlotCommand.cs
@@ -0,0 +1,65 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Commands;
+using Content.Server.Administration;
+using Content.Shared._White.Body.Components;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Body.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class CreateBoneSlotCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "createboneslot";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var boneType = BoneType.None;
+        if (args.Length is < 2 or > 3)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var netUid))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+            return;
+        }
+
+        if (args.Length == 3 && !Enum.TryParse(args[2], out boneType))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-bone-type-invalid", ("index", args[2])));
+            return;
+        }
+
+        var uid = _entManager.GetEntity(netUid);
+
+        var bodySystem = _entManager.System<BodySystem>();
+
+        if (!bodySystem.TryCreateBoneSlot(uid, args[1], boneType))
+        {
+            shell.WriteError(Loc.GetString($"cmd-{Command}-fail"));
+            return;
+        }
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-hint"));
+
+        if (args.Length == 3)
+            return CompletionResult.FromHintOptions(WhiteCompletionHelper.Emuns(typeof(BoneType)), Loc.GetString("shell-argument-bone-type-optional-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Body/Commands/CreateOrganSlotCommand.cs b/Content.Server/_White/Body/Commands/CreateOrganSlotCommand.cs
new file mode 100644
index 00000000000..7b00375c227
--- /dev/null
+++ b/Content.Server/_White/Body/Commands/CreateOrganSlotCommand.cs
@@ -0,0 +1,65 @@
+using Content.Server._White.Body.Systems;
+using Content.Server._White.Commands;
+using Content.Server.Administration;
+using Content.Shared._White.Body.Components;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Body.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class CreateOrganSlotCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "createorganslot";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        var organType = OrganType.None;
+        if (args.Length is < 2 or > 3)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            shell.WriteLine(Help);
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var netUid))
+        {
+            shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+            return;
+        }
+
+        if (args.Length == 3 && !Enum.TryParse(args[2], out organType))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-organ-type-invalid", ("index", args[2])));
+            return;
+        }
+
+        var uid = _entManager.GetEntity(netUid);
+
+        var bodySystem = _entManager.System<BodySystem>();
+
+        if (!bodySystem.TryCreateOrganSlot(uid, args[1], organType))
+        {
+            shell.WriteError(Loc.GetString($"cmd-{Command}-fail"));
+            return;
+        }
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-hint"));
+
+        if (args.Length == 3)
+            return CompletionResult.FromHintOptions(WhiteCompletionHelper.Emuns(typeof(OrganType)), Loc.GetString("shell-argument-organ-type-optional-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Body/Organs/Heart/HeartComponent.cs b/Content.Server/_White/Body/Organs/Heart/HeartComponent.cs
new file mode 100644
index 00000000000..1b48e61e6fe
--- /dev/null
+++ b/Content.Server/_White/Body/Organs/Heart/HeartComponent.cs
@@ -0,0 +1,98 @@
+using Content.Shared.FixedPoint;
+
+namespace Content.Server._White.Body.Organs.Heart;
+
+[RegisterComponent, AutoGenerateComponentPause]
+public sealed partial class HeartComponent : Component
+{
+    /// <summary>
+    /// How much damage to inflict on the heart depending on strain.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 StrainDamage = 0.1;
+
+    /// <summary>
+    /// How much chance to inflict damage on the heart depending on strain.
+    /// </summary>
+    [DataField]
+    public float CurrentStrainDamageChanceThreshold;
+
+    /// <summary>
+    /// How much the reported heart rate deviates.
+    /// </summary>
+    [DataField]
+    public int HeartRateDeviation = 15;
+
+    /// <summary>
+    /// Minimum heart rate.
+    /// </summary>
+    [DataField]
+    public int MinHeartRate = 75;
+
+    /// <summary>
+    /// Maximum heart rate.
+    /// </summary>
+    [DataField]
+    public int MaxHeartRate = 200;
+
+    /// <summary>
+    /// How much chance to inflict damage on the heart depending on strain.
+    /// The highest amount is chosen.
+    /// </summary>
+    [DataField(required: true)]
+    public SortedDictionary<float, float> StrainDamageChanceThresholds;
+
+    /// <summary>
+    /// Is the heart beating now?
+    /// </summary>
+    [ViewVariables]
+    public bool Enable;
+
+    /// <summary>
+    /// Current blood level in the body.
+    /// </summary>
+    [ViewVariables]
+    public float BloodLevel = 1f;
+
+    /// <summary>
+    /// How badly is the heart damaged?
+    /// </summary>
+    [ViewVariables]
+    public float HealthFactor = 1f;
+
+    /// <summary>
+    /// Body metabolic rate.
+    /// </summary>
+    [ViewVariables]
+    public float MetabolicRate = 1f;
+
+    /// <summary>
+    /// How well does the heart pump blood around the body?
+    /// </summary>
+    [ViewVariables]
+    public float OxygenSupply => SaturationLevel * MathF.Min(BloodLevel, HealthFactor);
+
+    /// <summary>
+    /// Current blood saturation level in the body.
+    /// </summary>
+    [ViewVariables]
+    public float SaturationLevel = 1f;
+
+    /// <summary>
+    /// How tense is the heart at the moment?
+    /// </summary>
+    [ViewVariables]
+    public float Strain = 0f;
+
+    /// <summary>
+    /// Current heart rate.
+    /// </summary>
+    [ViewVariables]
+    public int HeartRate = 0;
+
+    /// <summary>
+    /// The next time that this heart will beat.
+    /// </summary>
+    [ViewVariables, AutoPausedField]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
+}
diff --git a/Content.Server/_White/Body/Organs/Heart/HeartSystem.cs b/Content.Server/_White/Body/Organs/Heart/HeartSystem.cs
new file mode 100644
index 00000000000..b86a9bec454
--- /dev/null
+++ b/Content.Server/_White/Body/Organs/Heart/HeartSystem.cs
@@ -0,0 +1,133 @@
+using Content.Server._White.Body.Organs.Metabolizer;
+using Content.Server._White.Body.Respirator.Systems;
+using Content.Server._White.Body.Wound.Systems;
+using Content.Shared._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared._White.Threshold;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server._White.Body.Organs.Heart;
+
+public sealed class HeartSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    [Dependency] private readonly MetabolizerSystem _metabolizer = default!;
+    [Dependency] private readonly WoundSystem _wound = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<HeartComponent, AfterOrganToggledEvent>(OnAfterOrganToggled);
+        SubscribeLocalEvent<HeartComponent, OrganRelayedEvent<AfterBloodAmountChangedEvent>>(OnAfterBloodLevelChanged);
+        SubscribeLocalEvent<HeartComponent, OrganRelayedEvent<AfterSaturationLevelChangedEvent>>(OnAfterSaturationLevelChanged);
+        SubscribeLocalEvent<HeartComponent, OrganRelayedEvent<ApplyMetabolicRateEvent>>(OnApplyMetabolicMultiplier);
+        SubscribeLocalEvent<HeartComponent, OrganRelayedEvent<GetMetabolicRateEvent>>(OnGetMetabolicMultiplier);
+        SubscribeLocalEvent<HeartComponent, OrganAddedEvent>(OnOrganAdded);
+        SubscribeLocalEvent<HeartComponent, OrganHealthChangedEvent>(OnOrganHealthChanged);
+        SubscribeLocalEvent<HeartComponent, OrganRemovedEvent>(OnOrganRemoved);
+    }
+
+    private void OnAfterOrganToggled(Entity<HeartComponent> ent, ref AfterOrganToggledEvent args)
+    {
+        ent.Comp.Enable = args.Enable;
+        UpdateStrain(ent);
+    }
+
+    private void OnAfterBloodLevelChanged(Entity<HeartComponent> ent, ref OrganRelayedEvent<AfterBloodAmountChangedEvent> args)
+    {
+        ent.Comp.BloodLevel = (args.Args.BloodAmount / args.Args.Bloodstream.Comp.CurrentBloodMaxVolume).Float();
+        UpdateStrain(ent);
+    }
+
+    private void OnAfterSaturationLevelChanged(Entity<HeartComponent> ent, ref OrganRelayedEvent<AfterSaturationLevelChangedEvent> args)
+    {
+        ent.Comp.SaturationLevel = args.Args.SaturationLevel;
+        UpdateStrain(ent);
+    }
+
+    private void OnApplyMetabolicMultiplier(Entity<HeartComponent> ent, ref OrganRelayedEvent<ApplyMetabolicRateEvent> args)
+    {
+        ent.Comp.MetabolicRate = args.Args.Rate;
+        UpdateStrain(ent);
+    }
+
+    private void OnGetMetabolicMultiplier(Entity<HeartComponent> ent, ref OrganRelayedEvent<GetMetabolicRateEvent> args) =>
+        args.Args = new(args.Args.Rate + (!ent.Comp.Enable ? 0f : 1 + ent.Comp.Strain));
+
+    private void OnOrganAdded(Entity<HeartComponent> ent, ref OrganAddedEvent args)
+    {
+        if (!args.Body.HasValue)
+            return;
+
+        _metabolizer.UpdateMetabolicRate(args.Body.Value);
+    }
+
+    private void OnOrganHealthChanged(Entity<HeartComponent> ent, ref OrganHealthChangedEvent args)
+    {
+        ent.Comp.HealthFactor = (args.Organ.Comp2.Health / args.Organ.Comp2.MaximumHealth).Float();
+        UpdateStrain(ent);
+
+        if (args.Organ.Comp1.Body.HasValue)
+            _metabolizer.UpdateMetabolicRate(args.Organ.Comp1.Body.Value);
+    }
+
+    private void OnOrganRemoved(Entity<HeartComponent> ent, ref OrganRemovedEvent args)
+    {
+        if (!args.Body.HasValue)
+            return;
+
+        _metabolizer.UpdateMetabolicRate(args.Body.Value);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<HeartComponent>();
+        while (query.MoveNext(out var uid, out var heart))
+        {
+            if (!heart.Enable || _gameTiming.CurTime < heart.NextUpdate)
+                continue;
+
+            heart.NextUpdate += TimeSpan.FromSeconds(60 / heart.HeartRate);
+            UpdateHeartRate((uid, heart));
+
+            if (_random.Prob(heart.CurrentStrainDamageChanceThreshold))
+                _wound.ChangeOrganDamage(uid, heart.StrainDamage);
+        }
+    }
+
+    private void UpdateHeartRate(Entity<HeartComponent> ent)
+    {
+        if (!ent.Comp.Enable)
+        {
+            ent.Comp.HeartRate = 0;
+            return;
+        }
+
+        var deviation = _random.Next(-ent.Comp.HeartRateDeviation, ent.Comp.HeartRateDeviation);
+        ent.Comp.HeartRate = Math.Max((int)MathHelper.Lerp(ent.Comp.MinHeartRate, ent.Comp.MaxHeartRate, ent.Comp.Strain) + deviation, 0);
+    }
+
+    private void UpdateStrain(Entity<HeartComponent> ent)
+    {
+        var invert = 0f;
+        if (ent.Comp.OxygenSupply != 0 && ent.Comp.MetabolicRate != 0)
+            invert = MathF.Log(ent.Comp.MetabolicRate / ent.Comp.OxygenSupply);
+
+        if (!float.IsFinite(invert))
+            throw new InvalidOperationException($"demand/supply {ent.Comp.MetabolicRate}/{ent.Comp.OxygenSupply} is not finite: {invert}");
+
+        var healthFactor = !ent.Comp.Enable ? 0f : 1f - ent.Comp.HealthFactor;
+
+        ent.Comp.Strain = Math.Clamp(healthFactor + invert, 0f, 1f);
+        ent.Comp.CurrentStrainDamageChanceThreshold = ent.Comp.StrainDamageChanceThresholds.HighestMatch(ent.Comp.Strain) ?? 0f;
+
+        UpdateHeartRate(ent);
+    }
+}
diff --git a/Content.Server/_White/Body/Organs/Lung/LungComponent.cs b/Content.Server/_White/Body/Organs/Lung/LungComponent.cs
new file mode 100644
index 00000000000..53125d8aedd
--- /dev/null
+++ b/Content.Server/_White/Body/Organs/Lung/LungComponent.cs
@@ -0,0 +1,68 @@
+using Content.Shared.Alert;
+using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._White.Body.Organs.Lung;
+
+[RegisterComponent]
+public sealed partial class LungComponent : Component
+{
+    /// <summary>
+    /// Can reactions occur in the lung?
+    /// </summary>
+    [DataField]
+    public bool CanReact;
+
+    /// <summary>
+    /// The volume that the lung inhales.
+    /// </summary>
+    [DataField]
+    public float BreathVolume = 2f;
+
+    /// <summary>
+    /// Multiplier applied to <see cref="BreathVolume"/> for adjusting based on health.
+    /// </summary>
+    [DataField]
+    public float BreathVolumeMultiplier = 1f;
+
+    /// <summary>
+    /// Maximum lung volume.
+    /// </summary>
+    [DataField]
+    public float MaxVolume = 100f;
+
+    /// <summary>
+    /// A mixture of gases inside the lung.
+    /// </summary>
+    [DataField]
+    public GasMixture Air = new()
+    {
+        Volume = 10,
+        Temperature = Atmospherics.NormalBodyTemperature
+    };
+
+    /// <summary>
+    /// The type of gas this lung needs. Used only for the breathing alerts, not actual metabolism.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> Alert = "LowOxygen";
+
+    /// <summary>
+    /// The name/key of the solution on this entity which these lungs act on.
+    /// </summary>
+    [DataField]
+    public string SolutionName = "lung";
+
+    /// <summary>
+    /// The solution on this entity that these lungs act on.
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? Solution = null;
+
+    /// <summary>
+    /// Adjusted breath volume.
+    /// </summary>
+    [ViewVariables]
+    public float AdjustedBreathVolume => BreathVolume * BreathVolumeMultiplier;
+}
diff --git a/Content.Server/_White/Body/Organs/Lung/LungSystem.cs b/Content.Server/_White/Body/Organs/Lung/LungSystem.cs
new file mode 100644
index 00000000000..caffcf75e0e
--- /dev/null
+++ b/Content.Server/_White/Body/Organs/Lung/LungSystem.cs
@@ -0,0 +1,189 @@
+using Content.Server._White.Body.Organs.Metabolizer;
+using Content.Server._White.Body.Respirator.Systems;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.EntityEffects.EffectConditions;
+using Content.Server.EntityEffects.Effects;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Prototypes;
+using Content.Shared._White.Body.Systems;
+using Content.Shared.Alert;
+using Content.Shared.Atmos;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._White.Body.Organs.Lung;
+
+public sealed class LungSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
+    [Dependency] private readonly MetabolizerSystem _metabolizer = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    private static readonly ProtoId<MetabolismStagePrototype> RespirationId = new("Respiration");
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<LungComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<LungComponent, OrganRelayedEvent<BeforeBreathEvent>>(OnBeforeBreath);
+        SubscribeLocalEvent<LungComponent, OrganRelayedEvent<CanMetabolizeGasEvent>>(OnCanMetabolizeGas);
+        SubscribeLocalEvent<LungComponent, OrganRelayedEvent<ExhaledGasEvent>>(OnExhaledGas);
+        SubscribeLocalEvent<LungComponent, OrganRelayedEvent<InhaledGasEvent>>(OnInhaledGas);
+        SubscribeLocalEvent<LungComponent, OrganRelayedEvent<StopSuffocatingEvent>>(OnStopSuffocating);
+        SubscribeLocalEvent<LungComponent, OrganRelayedEvent<SuffocationEvent>>(OnSuffocation);
+    }
+
+    private void OnComponentInit(Entity<LungComponent> ent, ref ComponentInit args)
+    {
+        if (!_solutionContainer.EnsureSolution(ent.Owner, ent.Comp.SolutionName, out var solution))
+            return;
+
+        solution.MaxVolume = ent.Comp.MaxVolume;
+        solution.CanReact = ent.Comp.CanReact;
+    }
+
+    private void OnBeforeBreath(Entity<LungComponent> ent, ref OrganRelayedEvent<BeforeBreathEvent> args) =>
+        args.Args = new (args.Args.BreathVolume + ent.Comp.AdjustedBreathVolume);
+
+    private void OnCanMetabolizeGas(Entity<LungComponent> ent, ref OrganRelayedEvent<CanMetabolizeGasEvent> args)
+    {
+        var solution = GasToReagent(args.Args.Gas);
+
+        var saturation = GetSaturation(solution, ent.Owner, out var toxic);
+        if (toxic)
+        {
+            args.Args = args.Args with { Toxic = true, };
+            return;
+        }
+
+        args.Args = args.Args with { Saturation = saturation, };
+    }
+
+    private void OnExhaledGas(Entity<LungComponent> ent, ref OrganRelayedEvent<ExhaledGasEvent> args)
+    {
+        var outGas = new GasMixture(args.Args.Gas.Volume);
+
+        _atmosphere.Merge(outGas, ent.Comp.Air);
+        ent.Comp.Air.Clear();
+
+        if (_solutionContainer.ResolveSolution(ent.Owner, ent.Comp.SolutionName, ref ent.Comp.Solution))
+            _solutionContainer.RemoveAllSolution(ent.Comp.Solution.Value);
+
+        _atmosphere.Merge(args.Args.Gas, outGas);
+    }
+
+    private void OnInhaledGas(Entity<LungComponent> ent, ref OrganRelayedEvent<InhaledGasEvent> args) =>
+        args.Args = args.Args with { Succeeded = TryInhaleGas(ent.AsNullable(), args.Args.Gas), };
+
+    private void OnStopSuffocating(Entity<LungComponent> ent, ref OrganRelayedEvent<StopSuffocatingEvent> args) =>
+        _alerts.ClearAlert(args.Body, ent.Comp.Alert);
+
+    private void OnSuffocation(Entity<LungComponent> ent, ref OrganRelayedEvent<SuffocationEvent> args) =>
+        _alerts.ShowAlert(args.Body, ent.Comp.Alert);
+
+    private bool TryInhaleGas(Entity<LungComponent?> ent, GasMixture gas)
+    {
+        if (!Resolve(ent, ref ent.Comp) || ent.Comp.AdjustedBreathVolume == 0)
+            return false;
+
+        _atmosphere.Merge(ent.Comp.Air, gas);
+        GasToReagent(ent);
+        _metabolizer.Metabolize(ent.Owner);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Get the amount of saturation that would be generated if the lung were to metabolize the given solution.
+    /// </summary>
+    /// <remarks>
+    /// This assumes the metabolism rate is unbounded, which generally should be the case for lungs, otherwise we get
+    /// back to the old pulmonary edema bug.
+    /// </remarks>
+    /// <param name="solution">The reagents to metabolize</param>
+    /// <param name="lung">The entity doing the metabolizing</param>
+    /// <param name="toxic">Whether or not any of the reagents would deal damage to the entity</param>
+    private float GetSaturation(Solution solution, Entity<MetabolizerComponent?> lung, out bool toxic)
+    {
+        toxic = false;
+        if (!Resolve(lung, ref lung.Comp))
+            return 0;
+
+        float saturation = 0;
+        foreach (var (id, quantity) in solution.Contents)
+        {
+            var reagent = _prototype.Index<ReagentPrototype>(id.Prototype);
+            if (reagent.Metabolisms == null || !reagent.Metabolisms.TryGetValue(RespirationId, out var entry))
+                continue;
+
+            foreach (var effect in entry.Effects)
+            {
+                if (effect is HealthChange health)
+                    toxic |= CanMetabolize(health) && health.Damage.AnyPositive();
+                else if (effect is Oxygenate oxy && CanMetabolize(oxy))
+                    saturation += oxy.Factor * quantity.Float();
+            }
+        }
+
+        // this is pretty janky, but I just want to bodge a method that checks if an entity can breathe a gas mixture
+        // Applying actual reaction effects require a full ReagentEffectArgs struct.
+        bool CanMetabolize(EntityEffect effect)
+        {
+            if (effect.Conditions == null)
+                return true;
+
+            // TODO: Use Metabolism Public API to do this instead, once that API has been built.
+            foreach (var cond in effect.Conditions)
+            {
+                if (cond is MetabolizerType metabolizerType && !metabolizerType.Condition(lung, EntityManager))
+                    return false;
+            }
+
+            return true;
+        }
+
+        return saturation;
+    }
+
+    public void GasToReagent(Entity<LungComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp)
+            || !_solutionContainer.ResolveSolution(ent.Owner, ent.Comp.SolutionName, ref ent.Comp.Solution, out var solution))
+            return;
+
+        GasToReagent(ent.Comp.Air, solution);
+        _solutionContainer.UpdateChemicals(ent.Comp.Solution.Value);
+    }
+
+    public Solution GasToReagent(GasMixture gas)
+    {
+        var solution = new Solution();
+        GasToReagent(gas, solution);
+        return solution;
+    }
+
+    private void GasToReagent(GasMixture gas, Solution solution)
+    {
+        foreach (var gasId in Enum.GetValues<Gas>())
+        {
+            var i = (int) gasId;
+            var moles = gas[i];
+            if (moles <= 0)
+                continue;
+
+            var reagent = _atmosphere.GasReagents[i];
+            if (reagent is null)
+                continue;
+
+            var amount = moles * Atmospherics.BreathMolesToReagentMultiplier;
+            solution.AddReagent(reagent, amount);
+        }
+    }
+}
diff --git a/Content.Server/_White/Body/Organs/Metabolizer/MetabolizerSystem.cs b/Content.Server/_White/Body/Organs/Metabolizer/MetabolizerSystem.cs
new file mode 100644
index 00000000000..a5c2725a2e9
--- /dev/null
+++ b/Content.Server/_White/Body/Organs/Metabolizer/MetabolizerSystem.cs
@@ -0,0 +1,287 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Prototypes;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Database;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Server._White.Body.Organs.Metabolizer;
+
+public sealed class MetabolizerSystem : SharedMetabolizerSystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
+
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    private EntityQuery<BloodstreamComponent> _bloodstreamQuery;
+    private EntityQuery<MetabolizerComponent> _metabolizerQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _bloodstreamQuery = GetEntityQuery<BloodstreamComponent>();
+        _metabolizerQuery = GetEntityQuery<MetabolizerComponent>();
+
+        SubscribeLocalEvent<MetabolizerComponent, AfterOrganToggledEvent>(OnAfterOrganToggled);
+        SubscribeLocalEvent<MetabolizerComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<MetabolizerComponent, OrganAddedEvent>(OnOrganAdded);
+        SubscribeLocalEvent<MetabolizerComponent, OrganHealthChangedEvent>(OnOrganHealthChanged);
+        SubscribeLocalEvent<MetabolizerComponent, OrganRelayedEvent<ApplyMetabolicRateEvent>>(OnApplyMetabolicMultiplier);
+        SubscribeLocalEvent<MetabolizerComponent, OrganRemovedEvent>(OnOrganRemoved);
+    }
+
+    private void OnAfterOrganToggled(Entity<MetabolizerComponent> ent, ref AfterOrganToggledEvent args) =>
+        ent.Comp.Enable = args.Enable;
+
+    private void OnMapInit(Entity<MetabolizerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
+
+        foreach (var stageEntry in ent.Comp.Stages.Values)
+        {
+            if (stageEntry.SolutionOnBody)
+                continue;
+
+            stageEntry.SolutionOwner = ent;
+            _solutionContainer.ResolveSolution(
+                stageEntry.SolutionOwner.Value,
+                stageEntry.SolutionName,
+                ref stageEntry.Solution,
+                out _);
+        }
+    }
+
+    private void OnOrganAdded(Entity<MetabolizerComponent> ent, ref OrganAddedEvent args)
+    {
+        if (!_bloodstreamQuery.TryComp(args.Body, out var bloodstream))
+            return;
+
+        foreach (var (stage, stageEntry) in ent.Comp.Stages)
+        {
+            if (stageEntry.SolutionOnBody)
+            {
+                stageEntry.SolutionOwner = args.Body.Value.Owner;
+                _solutionContainer.ResolveSolution(
+                    stageEntry.SolutionOwner.Value,
+                    stageEntry.SolutionName,
+                    ref stageEntry.Solution,
+                    out _);
+            }
+
+            if (!bloodstream.Stages.TryGetValue(stage, out var stagesEntry))
+                continue;
+
+            stagesEntry.Stages.Add(stageEntry);
+        }
+
+        ent.Comp.Body = args.Body.Value;
+    }
+
+    private void OnOrganHealthChanged(Entity<MetabolizerComponent> ent, ref OrganHealthChangedEvent args) =>
+        ent.Comp.UpdateIntervalHealthMultiplier = (args.Organ.Comp2.MaximumHealth / args.Organ.Comp2.Health).Float();
+
+    private void OnApplyMetabolicMultiplier(Entity<MetabolizerComponent> ent, ref OrganRelayedEvent<ApplyMetabolicRateEvent> args) =>
+        ent.Comp.UpdateIntervalMultiplier = args.Args.Rate == 0 ? 0 : 1 / args.Args.Rate;
+
+    private void OnOrganRemoved(Entity<MetabolizerComponent> ent, ref OrganRemovedEvent args)
+    {
+        if (!_bloodstreamQuery.TryComp(args.Body, out var bloodstream))
+            return;
+
+        foreach (var (stage, stageEntry) in ent.Comp.Stages)
+        {
+            if (stageEntry.SolutionOnBody)
+            {
+                stageEntry.SolutionOwner = null;
+                stageEntry.Solution = null;
+            }
+
+            if (!bloodstream.Stages.TryGetValue(stage, out var stagesEntry))
+                continue;
+
+            stagesEntry.Stages.Remove(stageEntry);
+        }
+
+        ent.Comp.Body = null;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<MetabolizerComponent>();
+        while (query.MoveNext(out var uid, out var metabolizer))
+        {
+            if (metabolizer.AdjustedUpdateInterval == TimeSpan.Zero || _gameTiming.CurTime < metabolizer.NextUpdate)
+                continue;
+
+            metabolizer.NextUpdate += metabolizer.AdjustedUpdateInterval;
+            Metabolize((uid, metabolizer));
+        }
+    }
+
+    private bool TryGetTransferSolution(
+        Entity<BloodstreamComponent?> ent,
+        ProtoId<MetabolismStagePrototype> stage,
+        [NotNullWhen(true)] out Solution? transferSolution
+    )
+    {
+        transferSolution = null;
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (!ent.Comp.Stages.TryGetValue(stage, out var currentStages) || !currentStages.NextStage.HasValue)
+            return false;
+
+        if (!ent.Comp.Stages.TryGetValue(currentStages.NextStage.Value, out var nextStages))
+            return false;
+
+        var pickedNextStage = _random.Pick(nextStages.Stages);
+        if (pickedNextStage.SolutionOwner is null)
+            return false;
+
+        return _solutionContainer.ResolveSolution(
+            pickedNextStage.SolutionOwner.Value,
+            pickedNextStage.SolutionName,
+            ref pickedNextStage.Solution,
+            out transferSolution);
+    }
+
+    public void Metabolize(Entity<MetabolizerComponent?> ent)
+    {
+        if (!_metabolizerQuery.Resolve(ent, ref ent.Comp) || !ent.Comp.Enable)
+            return;
+
+        var owner = ent.Owner;
+        if (ent.Comp.Body.HasValue)
+            owner = ent.Comp.Body.Value;
+
+        var isDead = _mobState.IsDead(owner);
+
+        foreach (var (stage, stageEntry) in ent.Comp.Stages)
+        {
+            if (stageEntry.SolutionOwner is not {} solutionOwner
+                || !_solutionContainer.ResolveSolution(
+                    solutionOwner,
+                    stageEntry.SolutionName,
+                    ref stageEntry.Solution,
+                    out var solution))
+                continue;
+
+            TryGetTransferSolution(owner, stage, out var transferSolution);
+
+            // Copy the solution do not edit the original solution list
+            var reagents = solution.Contents.ToList();
+            if (_bloodstreamQuery.TryComp(solutionOwner, out var bloodstream))
+                reagents = _bloodstream.GetChemicals((solutionOwner, bloodstream), solution);
+
+            // randomize the reagent list so we don't have any unique quirks
+            _random.Shuffle(reagents);
+
+            var processedReagents = 0;
+            foreach (var (reagent, quantity) in reagents)
+            {
+                if (!_prototypeManager.TryIndex<ReagentPrototype>(reagent.Prototype, out var proto))
+                    continue;
+
+                var mostToTransfer = FixedPoint2.Clamp(stageEntry.TransferRate, 0, quantity);
+                if (proto.Metabolisms is null || !proto.Metabolisms.TryGetValue(stage, out var entry))
+                {
+                    if (transferSolution is not null)
+                    {
+                        solution.RemoveReagent(reagent, mostToTransfer);
+                        transferSolution.AddReagent(reagent, mostToTransfer * stageEntry.TransferEfficacy);
+                    }
+                    else
+                        solution.RemoveReagent(reagent, FixedPoint2.New(1));
+
+                    continue;
+                }
+
+                var rate = stageEntry.MetabolizeAll ? quantity : entry.MetabolismRate;
+                var mostToRemove = FixedPoint2.Clamp(rate, 0, quantity);
+
+                if (processedReagents >= ent.Comp.MaxReagentsProcessable)
+                    return;
+
+                var scale = mostToRemove.Float();
+                if (!stageEntry.MetabolizeAll)
+                    scale /= rate.Float();
+
+                if (isDead && !proto.WorksOnTheDead)
+                    continue;
+
+                var ev = new TryMetabolizeReagent(reagent, proto, quantity);
+                RaiseLocalEvent(owner, ref ev);
+
+                var args = new EntityEffectReagentArgs(owner, EntityManager, ent, solution, mostToRemove, proto, null, scale);
+
+                foreach (var effect in entry.Effects)
+                {
+                    if (!effect.ShouldApply(args, _random))
+                        continue;
+
+                    effect.Effect(args);
+
+                    if (!effect.ShouldLog)
+                        continue;
+
+                    _adminLog.Add(
+                        LogType.ReagentEffect,
+                        effect.LogImpact,
+                        $"Metabolism effect {effect.GetType().Name:effect}"
+                        + $" of reagent {proto.LocalizedName:reagent}"
+                        + $" applied on entity {owner:entity}"
+                        + $" at {Transform(owner).Coordinates:coordinates}"
+                    );
+                }
+
+                if (mostToRemove == FixedPoint2.Zero)
+                    continue;
+
+                solution.RemoveReagent(reagent, mostToRemove);
+                processedReagents++;
+
+                if (transferSolution is null)
+                    continue;
+
+                foreach (var (metabolite, ratio) in entry.Metabolites)
+                    transferSolution.AddReagent(metabolite, mostToRemove * ratio);
+            }
+
+            _solutionContainer.UpdateChemicals(stageEntry.Solution.Value);
+        }
+    }
+
+    public void AddMetabolizerTypes(Entity<MetabolizerComponent?> ent, HashSet<ProtoId<MetabolizerTypePrototype>> metabolizerTypes)
+    {
+        if (!_metabolizerQuery.Resolve(ent, ref ent.Comp))
+            return;
+
+        foreach (var metabolizerType in metabolizerTypes)
+            ent.Comp.Types.Add(metabolizerType);
+    }
+}
+
+[ByRefEvent]
+public record struct TryMetabolizeReagent(ReagentId Reagent, ReagentPrototype Prototype, FixedPoint2 Quantity, float Scale = 1f, float QuantityMultiplier = 1f);
diff --git a/Content.Server/_White/Body/Organs/Stomach/StomachComponent.cs b/Content.Server/_White/Body/Organs/Stomach/StomachComponent.cs
new file mode 100644
index 00000000000..117168d17ec
--- /dev/null
+++ b/Content.Server/_White/Body/Organs/Stomach/StomachComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Whitelist;
+
+namespace Content.Server._White.Body.Organs.Stomach;
+
+[RegisterComponent, Access(typeof(StomachSystem))]
+public sealed partial class StomachComponent : Component
+{
+    /// <summary>
+    /// Controls whitelist behavior. If true, this stomach can digest <i>only</i> food that passes the whitelist. If false, it can digest normal food <i>and</i> any food that passes the whitelist.
+    /// </summary>
+    [DataField]
+    public bool IsSpecialDigestibleExclusive = true;
+
+    /// <summary>
+    /// A whitelist for what special-digestible-required foods this stomach is capable of eating.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? SpecialDigestible;
+
+    /// <summary>
+    /// The name of the solution inside of this stomach.
+    /// </summary>
+    [DataField]
+    public string? SolutionName = "stomach";
+
+    /// <summary>
+    /// The solution inside of this stomach.
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? Solution;
+}
diff --git a/Content.Server/_White/Body/Organs/Stomach/StomachSystem.cs b/Content.Server/_White/Body/Organs/Stomach/StomachSystem.cs
new file mode 100644
index 00000000000..3cdc1e25a69
--- /dev/null
+++ b/Content.Server/_White/Body/Organs/Stomach/StomachSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Whitelist;
+
+namespace Content.Server._White.Body.Organs.Stomach;
+
+public sealed class StomachSystem : EntitySystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+
+    public bool TryTransferSolution(Entity<StomachComponent?> stomach, Solution solution)
+    {
+        if (!Resolve(stomach, ref stomach.Comp)
+            || !_solutionContainer.ResolveSolution(stomach.Owner, stomach.Comp.SolutionName, ref stomach.Comp.Solution))
+            return false;
+
+        return _solutionContainer.TryAddSolution(stomach.Comp.Solution.Value, solution);
+    }
+
+    public void SetSpecialDigestible(Entity<StomachComponent?> stomach, EntityWhitelist? whitelist)
+    {
+        if (!Resolve(stomach, ref stomach.Comp))
+            return;
+
+        stomach.Comp.SpecialDigestible = whitelist;
+    }
+}
diff --git a/Content.Server/_White/Body/Pain/Systems/PainSystem.cs b/Content.Server/_White/Body/Pain/Systems/PainSystem.cs
new file mode 100644
index 00000000000..eb1c6a733da
--- /dev/null
+++ b/Content.Server/_White/Body/Pain/Systems/PainSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Body.Pain.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Server._White.Body.Pain.Systems;
+
+public sealed class PainSystem : SharedPainSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PainfulComponent, ComponentGetState>(OnGetState);
+    }
+
+    #region Event Handling
+
+    private void OnGetState(Entity<PainfulComponent> painful, ref ComponentGetState args) =>
+        args.State = new PainfulComponentState(painful.Comp);
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<PainfulComponent>();
+        while (query.MoveNext(out var uid, out var painful))
+        {
+            if (painful.LastUpdate + painful.CurrentUpdateInterval >= GameTiming.CurTime)
+                continue;
+
+            UpdatePain((uid, painful));
+        }
+    }
+
+    #endregion
+}
diff --git a/Content.Server/_White/Body/Respirator/Components/RespiratorComponent.cs b/Content.Server/_White/Body/Respirator/Components/RespiratorComponent.cs
new file mode 100644
index 00000000000..de12fda327c
--- /dev/null
+++ b/Content.Server/_White/Body/Respirator/Components/RespiratorComponent.cs
@@ -0,0 +1,87 @@
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._White.Body.Respirator.Components;
+
+[RegisterComponent, AutoGenerateComponentPause]
+public sealed partial class RespiratorComponent : Component
+{
+    /// <summary>
+    /// How much of the gas we inhale is metabolized? Value range is (0, 1].
+    /// </summary>
+    [DataField]
+    public float Ratio = 1.0f;
+
+    /// <summary>
+    /// Saturation level.
+    /// </summary>
+    [DataField]
+    public float SaturationLevel = 1.0f;
+
+    /// <summary>
+    /// At what level of saturation will you begin to suffocate?
+    /// </summary>
+    [DataField]
+    public float SuffocationThreshold = 0.95f;
+
+    /// <summary>
+    /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate.
+    /// </summary>
+    [DataField]
+    public float UpdateIntervalMultiplier = 1f;
+
+    /// <summary>
+    /// The emoting when gasps.
+    /// </summary>
+    [DataField]
+    public ProtoId<EmotePrototype> GaspEmote = "Gasp";
+
+    /// <summary>
+    /// The interval between the gasp emotions.
+    /// </summary>
+    [DataField]
+    public TimeSpan GaspEmoteCooldown = TimeSpan.FromSeconds(8);
+
+    /// <summary>
+    /// The interval between updates. Each update is either inhale or exhale,
+    /// so a full cycle takes twice as long.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// How many cycles in a row has the mob been under-saturated?
+    /// </summary>
+    [ViewVariables]
+    public int SuffocationCycles = 0;
+
+    /// <summary>
+    /// How many cycles in a row does it take for the suffocation alert to pop up?
+    /// </summary>
+    [ViewVariables]
+    public int SuffocationCycleThreshold = 3;
+
+    [ViewVariables]
+    public RespiratorStatus Status = RespiratorStatus.Inhaling;
+
+    /// <summary>
+    /// Adjusted update interval based off of the multiplier value.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
+    [ViewVariables]
+    public TimeSpan LastGaspEmoteTime;
+
+    /// <summary>
+    /// The next time that this body will inhale or exhale.
+    /// </summary>
+    [ViewVariables, AutoPausedField]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
+}
+
+public enum RespiratorStatus
+{
+    Inhaling,
+    Exhaling
+}
diff --git "a/Content.Server/_White/Body/Respirator/Components/Respirator\320\241onsumerComponent.cs" "b/Content.Server/_White/Body/Respirator/Components/Respirator\320\241onsumerComponent.cs"
new file mode 100644
index 00000000000..2401e457d07
--- /dev/null
+++ "b/Content.Server/_White/Body/Respirator/Components/Respirator\320\241onsumerComponent.cs"
@@ -0,0 +1,55 @@
+using Content.Shared.FixedPoint;
+
+namespace Content.Server._White.Body.Respirator.Components;
+
+[RegisterComponent, AutoGenerateComponentPause]
+public sealed partial class RespiratorСonsumerComponent : Component
+{
+    /// <summary>
+    /// How much of the body's oxidant saturation does a given organ/body part consume?
+    /// </summary>
+    [DataField]
+    public float SaturationConsumption = 0.01f;
+
+    /// <summary>
+    /// Damage to the organ with each update at low oxygen levels in the blood.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 Damage = FixedPoint2.New(0.1);
+
+    /// <summary>
+    /// What percentage of available oxygen in the blood is needed to avoid damage caused by blood loss?
+    /// </summary>
+    [DataField]
+    public float DamageThreshold = 0.5f;
+
+    /// <summary>
+    /// The interval between updates.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// Current blood level in the body.
+    /// </summary>
+    [ViewVariables]
+    public float BloodLevel = 1f;
+
+    /// <summary>
+    /// Body metabolic rate.
+    /// </summary>
+    [ViewVariables]
+    public float MetabolicRate = 1f;
+
+    /// <summary>
+    /// Current blood saturation level in the body.
+    /// </summary>
+    [ViewVariables]
+    public float SaturationLevel = 1f;
+
+    /// <summary>
+    /// The next time update.
+    /// </summary>
+    [ViewVariables, AutoPausedField]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
+}
diff --git a/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.Consumer.cs b/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.Consumer.cs
new file mode 100644
index 00000000000..0f9cf689e0e
--- /dev/null
+++ b/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.Consumer.cs
@@ -0,0 +1,61 @@
+using Content.Server._White.Body.Respirator.Components;
+using Content.Shared._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Systems;
+
+namespace Content.Server._White.Body.Respirator.Systems;
+
+public sealed partial class RespiratorSystem
+{
+    private void InitializeConsumer()
+    {
+        SubscribeLocalEvent<RespiratorСonsumerComponent, OrganRelayedEvent<AfterBloodAmountChangedEvent>>(OnAfterBloodLevelChanged);
+        SubscribeLocalEvent<RespiratorСonsumerComponent, OrganRelayedEvent<AfterSaturationLevelChangedEvent>>(OnAfterSaturationLevelChanged);
+        SubscribeLocalEvent<RespiratorСonsumerComponent, OrganRelayedEvent<ApplyMetabolicRateEvent>>(OnApplyMetabolicMultiplier);
+        SubscribeLocalEvent<RespiratorСonsumerComponent, OrganRelayedEvent<BeforeUpdateRespiratorEvent>>(OnBeforeUpdateRespirator);
+    }
+
+    #region Event Handling
+
+    private void OnAfterBloodLevelChanged(Entity<RespiratorСonsumerComponent> ent, ref OrganRelayedEvent<AfterBloodAmountChangedEvent> args) =>
+        ent.Comp.BloodLevel = (args.Args.BloodAmount / args.Args.Bloodstream.Comp.CurrentBloodMaxVolume).Float();
+
+    private void OnAfterSaturationLevelChanged(Entity<RespiratorСonsumerComponent> ent, ref OrganRelayedEvent<AfterSaturationLevelChangedEvent> args) =>
+        ent.Comp.SaturationLevel = args.Args.SaturationLevel;
+
+    private void OnApplyMetabolicMultiplier(Entity<RespiratorСonsumerComponent> ent, ref OrganRelayedEvent<ApplyMetabolicRateEvent> args) =>
+        ent.Comp.MetabolicRate = args.Args.Rate;
+
+    private void OnBeforeUpdateRespirator(Entity<RespiratorСonsumerComponent> ent, ref OrganRelayedEvent<BeforeUpdateRespiratorEvent> args) =>
+        args.Args = new (SaturationConsumption: args.Args.SaturationConsumption + ent.Comp.SaturationConsumption);
+
+    private void UpdateConsumers()
+    {
+        var query = EntityQueryEnumerator<RespiratorСonsumerComponent>();
+        while (query.MoveNext(out var uid, out var consumer))
+        {
+            if (_gameTiming.CurTime < consumer.NextUpdate)
+                continue;
+
+            consumer.NextUpdate += consumer.UpdateInterval;
+
+            UpdateConsumer((uid, consumer));
+        }
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void UpdateConsumer(Entity<RespiratorСonsumerComponent> ent)
+    {
+        var oxygenateLevel = ent.Comp.BloodLevel * ent.Comp.SaturationLevel * ent.Comp.MetabolicRate;
+
+        if (ent.Comp.DamageThreshold < oxygenateLevel)
+            return;
+
+        _wound.ChangeOrganDamage(ent.Owner, ent.Comp.Damage);
+    }
+
+    #endregion
+}
diff --git a/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.Respirator.cs b/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.Respirator.cs
new file mode 100644
index 00000000000..5936b992cdf
--- /dev/null
+++ b/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.Respirator.cs
@@ -0,0 +1,215 @@
+using Content.Server._White.Body.Respirator.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared.Atmos;
+using Content.Shared.Chat;
+using Content.Shared.Database;
+
+namespace Content.Server._White.Body.Respirator.Systems;
+
+public sealed partial class RespiratorSystem
+{
+    private void InitializeRespirator()
+    {
+        SubscribeLocalEvent<RespiratorComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<RespiratorComponent, ApplyMetabolicRateEvent>(OnApplyMetabolicMultiplier);
+    }
+
+    #region Event Handling
+
+    private void OnMapInit(Entity<RespiratorComponent> ent, ref MapInitEvent args) =>
+        ent.Comp.NextUpdate = _gameTiming.CurTime + ent.Comp.AdjustedUpdateInterval;
+
+    private void OnApplyMetabolicMultiplier(Entity<RespiratorComponent> ent, ref ApplyMetabolicRateEvent args) =>
+        ent.Comp.UpdateIntervalMultiplier = args.Rate == 0 ? 0 : 1 / args.Rate;
+
+    private void UpdateRespirators()
+    {
+        var query = EntityQueryEnumerator<RespiratorComponent>();
+        while (query.MoveNext(out var uid, out var respirator))
+        {
+            if (respirator.AdjustedUpdateInterval == TimeSpan.Zero || _gameTiming.CurTime < respirator.NextUpdate)
+                continue;
+
+            respirator.NextUpdate += respirator.AdjustedUpdateInterval;
+
+            UpdateRespirator((uid, respirator));
+        }
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void Exhale(Entity<RespiratorComponent> ent)
+    {
+        var ev = new ExhaleLocationEvent();
+        RaiseLocalEvent(ent, ref ev, broadcast: false);
+
+        if (ev.Gas is null)
+        {
+            ev.Gas = _atmosphere.GetContainingMixture(ent.Owner, excite: true);
+
+            // Walls and grids without atmos comp return null. I guess it makes sense to not be able to exhale in walls,
+            // but this also means you cannot exhale on some grids.
+            ev.Gas ??= GasMixture.SpaceGas;
+        }
+
+        var exhaleEv = new ExhaledGasEvent(ev.Gas);
+        RaiseLocalEvent(ent, ref exhaleEv);
+    }
+
+    private void Inhale(Entity<RespiratorComponent> ent)
+    {
+        var ev = new InhaleLocationEvent
+        {
+            Respirator = ent.Comp
+        };
+        RaiseLocalEvent(ent, ref ev);
+
+        ev.Gas ??= _atmosphere.GetContainingMixture(ent.Owner, excite: true);
+
+        if (ev.Gas is null)
+            return;
+
+        var breathEv = new BeforeBreathEvent();
+        RaiseLocalEvent(ent, ref breathEv);
+
+        var gas = ev.Gas.RemoveVolume(breathEv.BreathVolume);
+
+        var inhaleEv = new InhaledGasEvent(gas);
+        RaiseLocalEvent(ent, ref inhaleEv);
+
+        if (inhaleEv is { Succeeded: true, })
+            return;
+
+        // If nothing could inhale, the gasses give it back.
+        _atmosphere.Merge(ev.Gas, gas);
+    }
+
+    private void UpdateRespirator(Entity<RespiratorComponent> ent)
+    {
+        if (_mobState.IsDead(ent))
+            return;
+
+        var ev = new BeforeUpdateRespiratorEvent();
+        RaiseLocalEvent(ent, ref ev);
+
+        ChangeSaturationLevel(ent.AsNullable(), -ev.SaturationConsumption);
+
+        if (!_mobState.IsIncapacitated(ent))
+        {
+            switch (ent.Comp.Status)
+            {
+                case RespiratorStatus.Inhaling:
+                    Inhale(ent);
+                    ent.Comp.Status = RespiratorStatus.Exhaling;
+                    break;
+                case RespiratorStatus.Exhaling:
+                    Exhale(ent);
+                    ent.Comp.Status = RespiratorStatus.Inhaling;
+                    break;
+            }
+        }
+
+        if (ent.Comp.SaturationLevel < ent.Comp.SuffocationThreshold)
+        {
+            if (_gameTiming.CurTime >= ent.Comp.LastGaspEmoteTime + ent.Comp.GaspEmoteCooldown)
+            {
+                ent.Comp.LastGaspEmoteTime = _gameTiming.CurTime;
+                _chat.TryEmoteWithChat(ent, ent.Comp.GaspEmote, ChatTransmitRange.HideChat, ignoreActionBlocker: true);
+            }
+
+            StartSuffocation(ent);
+            ent.Comp.SuffocationCycles += 1;
+            return;
+        }
+
+        StopSuffocation(ent);
+        ent.Comp.SuffocationCycles = 0;
+    }
+
+    private void StartSuffocation(Entity<RespiratorComponent> ent)
+    {
+        if (ent.Comp.SuffocationCycles == 2)
+            _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} started suffocating");
+
+        if (ent.Comp.SuffocationCycles < ent.Comp.SuffocationCycleThreshold)
+            return;
+
+        var ev = new SuffocationEvent();
+        RaiseLocalEvent(ent, ref ev);
+    }
+
+    private void StopSuffocation(Entity<RespiratorComponent> ent)
+    {
+        if (ent.Comp.SuffocationCycles >= 2)
+            _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} stopped suffocating");
+
+        var ev = new StopSuffocatingEvent();
+        RaiseLocalEvent(ent, ref ev);
+    }
+
+    #endregion
+
+    #region Public API
+
+    /// <summary>
+    /// Checks if it's safe for a given entity to breathe the air from the environment it is currently situated in.
+    /// </summary>
+    /// <param name="ent">The entity attempting to metabolize the gas.</param>
+    /// <returns>Returns true only if the air is not toxic, and it wouldn't suffocate.</returns>
+    public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        // Get the gas at our location but don't actually remove it from the gas mixture.
+        var ev = new InhaleLocationEvent
+        {
+            Respirator = ent.Comp,
+        };
+        RaiseLocalEvent(ent, ref ev);
+
+        ev.Gas ??= _atmosphere.GetContainingMixture(ent.Owner, excite: true);
+
+        // If there's no air to breathe or we can't metabolize it then internals should be on.
+        return ev.Gas is not null && CanMetabolizeInhaledAir(ent, ev.Gas);
+    }
+
+    /// <summary>
+    /// Checks if a given entity can safely metabolize a given gas mixture.
+    /// </summary>
+    /// <param name="ent">The entity attempting to metabolize the gas.</param>
+    /// <param name="gas">The gas mixture we are trying to metabolize.</param>
+    /// <returns>Returns true only if the gas mixture is not toxic, and it wouldn't suffocate.</returns>
+    public bool CanMetabolizeInhaledAir(Entity<RespiratorComponent?> ent, GasMixture gas)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        var ev = new CanMetabolizeGasEvent(gas);
+        RaiseLocalEvent(ent, ref ev);
+
+        if (ev.Toxic)
+            return false;
+
+        var beforeUpdateEv = new BeforeUpdateRespiratorEvent();
+        RaiseLocalEvent(ent, ref beforeUpdateEv);
+
+        return ev.Saturation > beforeUpdateEv.SaturationConsumption;
+    }
+
+    public void ChangeSaturationLevel(Entity<RespiratorComponent?> ent, float amount)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        var oldSaturationLevel = ent.Comp.SaturationLevel;
+        ent.Comp.SaturationLevel = Math.Clamp(ent.Comp.SaturationLevel + amount, 0, 1);
+
+        var ev = new AfterSaturationLevelChangedEvent(ent.Comp.SaturationLevel, oldSaturationLevel);
+        RaiseLocalEvent(ent, ev);
+    }
+
+    #endregion
+}
diff --git a/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.cs b/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.cs
new file mode 100644
index 00000000000..6ddf3d76cdf
--- /dev/null
+++ b/Content.Server/_White/Body/Respirator/Systems/RespiratorSystem.cs
@@ -0,0 +1,112 @@
+using Content.Server._White.Body.Respirator.Components;
+using Content.Server._White.Body.Wound.Systems;
+using Content.Server.Administration.Logs;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Chat.Systems;
+using Content.Shared.Atmos;
+using Content.Shared.Mobs.Systems;
+using JetBrains.Annotations;
+using Robust.Shared.Timing;
+
+namespace Content.Server._White.Body.Respirator.Systems;
+
+[UsedImplicitly]
+public sealed partial class RespiratorSystem : EntitySystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly WoundSystem _wound = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeRespirator();
+        InitializeConsumer();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateRespirators();
+        UpdateConsumers();
+    }
+}
+
+
+/// <summary>
+/// Event raised after an entity changes his oxidant saturation level.
+/// </summary>
+public record struct AfterSaturationLevelChangedEvent(float SaturationLevel, float OldSaturationLevel);
+
+/// <summary>
+/// Event raised when an entity is about to take a breath.
+/// </summary>
+/// <param name="BreathVolume">The volume to breathe in.</param>
+[ByRefEvent]
+public record struct BeforeBreathEvent(float BreathVolume = 0f);
+
+/// <summary>
+/// Event raised when an entity is about to update respirator.
+/// </summary>
+[ByRefEvent]
+public record struct BeforeUpdateRespiratorEvent(float SaturationConsumption = 0f);
+
+/// <summary>
+/// An event raised to inhalation handlers that asks them nicely to simulate what it would be like to metabolize
+/// a given volume of gas, without actually metabolizing it.
+/// </summary>
+/// <param name="Gas">The gas mixture we are testing.</param>
+/// <param name="Toxic">Whether the gas returns as toxic to any respirator.</param>
+/// <param name="Saturation">The amount of saturation we got from the gas.</param>
+[ByRefEvent]
+public record struct CanMetabolizeGasEvent(GasMixture Gas, bool Toxic = false, float Saturation = 0f);
+
+/// <summary>
+/// Event raised when an entity is exhaling
+/// </summary>
+/// <param name="Gas">The gas mixture we're exhaling into.</param>
+/// <param name="Handled">Whether we have successfully exhaled or not.</param>
+[ByRefEvent]
+public record struct ExhaledGasEvent(GasMixture Gas);
+
+/// <summary>
+/// Event raised when an entity first tries to exhale a gas, determines where the gas they're exhaling will be sent.
+/// </summary>
+/// <param name="Gas">The gas mixture that the exhaled gas will be merged into.</param>
+[ByRefEvent]
+public record struct ExhaleLocationEvent(GasMixture? Gas);
+
+/// <summary>
+/// Event raised when an entity successfully inhales a gas, attempts to find a place to put the gas.
+/// </summary>
+/// <param name="Gas">The gas we're inhaling.</param>
+/// <param name="Handled">Whether a system has responded appropriately.</param>
+/// <param name="Succeeded">Whether we successfully managed to inhale the gas</param>
+[ByRefEvent]
+public record struct InhaledGasEvent(GasMixture Gas, bool Succeeded = false);
+
+/// <summary>
+/// Event raised when an entity first tries to inhale that returns a GasMixture from a given location.
+/// </summary>
+/// <param name="Gas">The gas that gets returned, null if there is none.</param>
+/// <param name="Respirator">The Respirator component of the entity attempting to inhale</param>
+[ByRefEvent]
+public record struct InhaleLocationEvent(GasMixture? Gas, RespiratorComponent Respirator);
+
+/// <summary>
+/// Raised when an entity that was suffocating stops suffocating.
+/// </summary>
+[ByRefEvent]
+public record struct StopSuffocatingEvent;
+
+/// <summary>
+/// Raised when an entity starts suffocating and when suffocation progresses.
+/// </summary>
+[ByRefEvent]
+public record struct SuffocationEvent;
diff --git a/Content.Server/_White/Body/Systems/BodySystem.Body.cs b/Content.Server/_White/Body/Systems/BodySystem.Body.cs
new file mode 100644
index 00000000000..8550ae6dc54
--- /dev/null
+++ b/Content.Server/_White/Body/Systems/BodySystem.Body.cs
@@ -0,0 +1,17 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Server._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    private void InitializeBody() =>
+        SubscribeLocalEvent<BodyComponent, ComponentGetState>(OnBodyGetState);
+
+    #region Event Handling
+
+    private void OnBodyGetState(Entity<BodyComponent> body, ref ComponentGetState args) =>
+        args.State = new BodyComponentState(body.Comp, EntityManager);
+
+    #endregion
+}
diff --git a/Content.Server/_White/Body/Systems/BodySystem.BodyPart.cs b/Content.Server/_White/Body/Systems/BodySystem.BodyPart.cs
new file mode 100644
index 00000000000..b12f71e8f02
--- /dev/null
+++ b/Content.Server/_White/Body/Systems/BodySystem.BodyPart.cs
@@ -0,0 +1,17 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Server._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    private void InitializeBodyPart() =>
+        SubscribeLocalEvent<BodyPartComponent, ComponentGetState>(OnBodyPartGetState);
+
+    #region Event Handling
+
+    private void OnBodyPartGetState(Entity<BodyPartComponent> bodyPart, ref ComponentGetState args) =>
+        args.State = new BodyPartComponentState(bodyPart.Comp, EntityManager);
+
+    #endregion
+}
diff --git a/Content.Server/_White/Body/Systems/BodySystem.Bone.cs b/Content.Server/_White/Body/Systems/BodySystem.Bone.cs
new file mode 100644
index 00000000000..292ad6ffdba
--- /dev/null
+++ b/Content.Server/_White/Body/Systems/BodySystem.Bone.cs
@@ -0,0 +1,17 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Server._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    private void InitializeBone() =>
+        SubscribeLocalEvent<BoneComponent, ComponentGetState>(OnBoneGetState);
+
+    #region Event Handling
+
+    private void OnBoneGetState(Entity<BoneComponent> bone, ref ComponentGetState args) =>
+        args.State = new BoneComponentState(bone.Comp, EntityManager);
+
+    #endregion
+}
diff --git a/Content.Server/_White/Body/Systems/BodySystem.Relay.cs b/Content.Server/_White/Body/Systems/BodySystem.Relay.cs
new file mode 100644
index 00000000000..75bb4000675
--- /dev/null
+++ b/Content.Server/_White/Body/Systems/BodySystem.Relay.cs
@@ -0,0 +1,19 @@
+using Content.Server._White.Body.Respirator.Systems;
+using Content.Shared._White.Body.Components;
+
+namespace Content.Server._White.Body.Systems;
+
+public sealed partial class BodySystem
+{
+    public void InitializeRelay()
+    {
+        SubscribeLocalEvent<BodyComponent, AfterSaturationLevelChangedEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, BeforeBreathEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, BeforeUpdateRespiratorEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, CanMetabolizeGasEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, ExhaledGasEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, InhaledGasEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, StopSuffocatingEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, SuffocationEvent>(RelayEventToOrgans);
+    }
+}
diff --git a/Content.Server/_White/Body/Systems/BodySystem.cs b/Content.Server/_White/Body/Systems/BodySystem.cs
new file mode 100644
index 00000000000..61175b59508
--- /dev/null
+++ b/Content.Server/_White/Body/Systems/BodySystem.cs
@@ -0,0 +1,43 @@
+using Content.Server.Ghost;
+using Content.Server.Mind;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Server._White.Body.Systems;
+
+public sealed partial class BodySystem : SharedBodySystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    [Dependency] private readonly GhostSystem _ghostSystem = default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<BodyComponent, MoveInputEvent>(OnRelayMoveInput);
+        InitializeBody();
+        InitializeBodyPart();
+        InitializeBone();
+        InitializeRelay();
+    }
+
+    private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
+    {
+        // If they haven't actually moved then ignore it.
+        if ((args.Entity.Comp.HeldMoveButtons & (MoveButtons.Down | MoveButtons.Left | MoveButtons.Up | MoveButtons.Right)) == 0x0)
+            return;
+
+        if (_mobState.IsDead(ent) && _mindSystem.TryGetMind(ent, out var mindId, out var mind))
+        {
+            mind.TimeOfDeath ??= _gameTiming.RealTime;
+            _ghostSystem.OnGhostAttempt(mindId, canReturnGlobal: true, mind: mind);
+        }
+    }
+}
diff --git a/Content.Server/_White/Body/Wound/Systems/WoundSystem.cs b/Content.Server/_White/Body/Wound/Systems/WoundSystem.cs
new file mode 100644
index 00000000000..2e0695ba4d0
--- /dev/null
+++ b/Content.Server/_White/Body/Wound/Systems/WoundSystem.cs
@@ -0,0 +1,127 @@
+using Content.Server._White.Body.Bloodstream.Systems;
+using Content.Server._White.Body.Systems;
+using Content.Server.Administration.Logs;
+using Content.Server.Medical;
+using Content.Server.Medical.Components;
+using Content.Server.Popups;
+using Content.Server.Stack;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared.Damage;
+using Content.Shared.Database;
+using Content.Shared.FixedPoint;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Medical;
+using Content.Shared.Stacks;
+using Robust.Server.Audio;
+using Robust.Shared.Audio;
+using Robust.Shared.Utility;
+
+namespace Content.Server._White.Body.Wound.Systems;
+
+public sealed class WoundSystem : SharedWoundSystem
+{
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+
+    [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly BodySystem _body = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly StackSystem _stacks = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<WoundableComponent, HealingDoAfterEvent>(OnHealingDoAfter, before: new [] { typeof(HealingSystem), });
+    }
+
+    #region Event Handling
+
+    private void OnHealingDoAfter(Entity<WoundableComponent> woundable, ref HealingDoAfterEvent args)
+    {
+        if (args.Handled
+            || args.Cancelled
+            || !TryComp<HealingComponent>(args.Used, out var healing)
+            || !TryComp<DamageableComponent>(woundable, out var damageableBody)
+            || _body.GetBodyParts<DamageableComponent>(woundable.Owner, args.BodyPartType).FirstOrNull() is not {} bodyPart)
+            return;
+
+        args.Handled = true;
+
+        if (TryComp<BloodstreamComponent>(woundable, out var bloodstream))
+        {
+            if (healing.BloodlossModifier != 0)
+            {
+                _bloodstream.TryModifyBleedAmount(woundable.Owner, healing.BloodlossModifier, args.BodyPartType);
+
+                if (bloodstream.Bleeding == 0)
+                {
+                    var popup = args.User == woundable.Owner
+                        ? Loc.GetString("medical-item-stop-bleeding-self")
+                        : Loc.GetString(
+                            "medical-item-stop-bleeding",
+                            ("target", Identity.Entity(woundable.Owner, EntityManager)));
+
+                    _popup.PopupEntity(popup, woundable, args.User);
+                }
+            }
+
+            if (healing.ModifyBloodLevel != 0)
+                _bloodstream.TryModifyBloodLevel((woundable, bloodstream), healing.ModifyBloodLevel);
+        }
+
+        if (healing.DamageContainers is not null &&
+            bodyPart.Comp2.DamageContainerID is not null &&
+            !healing.DamageContainers.Contains(bodyPart.Comp2.DamageContainerID))
+            return;
+
+        var healed = Damageable.TryChangeDamage(woundable, healing.Damage, true, false, damageableBody, args.Args.User, args.BodyPartType);
+
+        if (healed == null && healing.BloodlossModifier != 0)
+            return;
+
+        var total = healed?.GetTotal() ?? FixedPoint2.Zero;
+        var repeat = false;
+
+        if (TryComp<StackComponent>(args.Used.Value, out var stackComp))
+        {
+            _stacks.Use(args.Used.Value, 1, stackComp);
+            repeat = _stacks.GetCount(args.Used.Value, stackComp) > 0;
+        }
+        else
+            QueueDel(args.Used.Value);
+
+        if (woundable.Owner != args.User)
+            _adminLogger.Add(LogType.Healed, $"{EntityManager.ToPrettyString(args.User):user} healed {EntityManager.ToPrettyString(woundable):target} for {total:damage} damage");
+        else
+            _adminLogger.Add(LogType.Healed, $"{EntityManager.ToPrettyString(args.User):user} healed themselves for {total:damage} damage");
+
+        _audio.PlayPvs(healing.HealingEndSound, woundable, AudioParams.Default.WithVariation(0.125f).WithVolume(1f));
+
+        args.Repeat = false;
+
+        if (repeat)
+        {
+            if (HasWounds(bodyPart, healing.Damage))
+                args.Repeat = true;
+            else if (GetWoundableBodyParts(woundable.AsNullable(), healing.Damage).FirstOrNull() is { } newBodyPart)
+            {
+                _popup.PopupEntity(Loc.GetString("medical-item-cant-use-switch-body-part", ("item", args.Used), ("body-part", args.BodyPartType), ("new-body-part", newBodyPart.Comp1.Type)), args.Used.Value, args.User);
+                args.BodyPartType = newBodyPart.Comp1.Type;
+                args.Repeat = true;
+            }
+        }
+
+        if (!args.Repeat)
+        {
+            _popup.PopupEntity(
+                Loc.GetString("medical-item-finished-using", ("item", args.Used)),
+                woundable,
+                args.User);
+        }
+    }
+
+    #endregion
+}
diff --git a/Content.Server/_White/Commands/WhiteCompletionHelper.cs b/Content.Server/_White/Commands/WhiteCompletionHelper.cs
new file mode 100644
index 00000000000..91d5a52226a
--- /dev/null
+++ b/Content.Server/_White/Commands/WhiteCompletionHelper.cs
@@ -0,0 +1,15 @@
+using System.Linq;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Commands;
+
+/// <summary>
+/// Helper functions for programming console command completions.
+/// </summary>
+public static class WhiteCompletionHelper
+{
+    /// <summary>
+    /// Returns the enum as completion options.
+    /// </summary>
+    public static IEnumerable<CompletionOption> Emuns(Type type) => Enum.GetNames(type).Select(name => new CompletionOption(name));
+}
diff --git a/Content.Server/_White/DespawnOnLandItem/DespawnOnLandItemSystem.cs b/Content.Server/_White/DespawnOnLandItem/DespawnOnLandItemSystem.cs
index d1bb7431012..8780cb01baf 100644
--- a/Content.Server/_White/DespawnOnLandItem/DespawnOnLandItemSystem.cs
+++ b/Content.Server/_White/DespawnOnLandItem/DespawnOnLandItemSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Interaction.Events;
 using Robust.Shared.Containers;
 using Robust.Shared.Spawners;
diff --git a/Content.Server/_White/GameTicking/Rules/BloodCultRuleSystem.cs b/Content.Server/_White/GameTicking/Rules/BloodCultRuleSystem.cs
index c2b218773d5..0c86e8e0e86 100644
--- a/Content.Server/_White/GameTicking/Rules/BloodCultRuleSystem.cs
+++ b/Content.Server/_White/GameTicking/Rules/BloodCultRuleSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server._White.BloodCult.Items.BloodSpear;
 using Content.Server._White.BloodCult.Runes;
 using Content.Server._White.GameTicking.Rules.Components;
+using Content.Server._White.Gibbing;
 using Content.Server._White.Objectives.Components;
 using Content.Server._White.Roles;
 using Content.Server.Actions;
@@ -49,8 +50,8 @@ public sealed class BloodCultRuleSystem : GameRuleSystem<BloodCultRuleComponent>
     [Dependency] private readonly ActionsSystem _actions = default!;
     [Dependency] private readonly AntagSelectionSystem _antagSelection = default!;
     [Dependency] private readonly BloodSpearSystem _bloodSpear = default!;
-    [Dependency] private readonly BodySystem _body = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly LanguageSystem _language = default!;
@@ -175,7 +176,7 @@ private void OnNarsieSummon(BloodCultNarsieSummoned ev)
 
                 var harvester = Spawn(cult.HarvesterPrototype, Transform(ent.Owner).Coordinates);
                 _mind.TransferTo(mindContainer.Mind.Value, harvester);
-                _body.GibBody(ent);
+                _gibbing.GibBody(ent.Owner);
             }
 
             return;
diff --git a/Content.Server/_White/Gibbing/GibbingSystem.cs b/Content.Server/_White/Gibbing/GibbingSystem.cs
new file mode 100644
index 00000000000..541d60b5be4
--- /dev/null
+++ b/Content.Server/_White/Gibbing/GibbingSystem.cs
@@ -0,0 +1,43 @@
+using System.Numerics;
+using Content.Server.Body.Components;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Gibbing;
+using Robust.Shared.Audio;
+
+namespace Content.Server._White.Gibbing;
+
+public sealed class GibbingSystem : SharedGibbingSystem
+{
+    public override HashSet<EntityUid> GibBody(
+        Entity<BodyComponent?, GibbableComponent?> body,
+        bool gibOrgans = false,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null
+    )
+    {
+        if (!Resolve(body, ref body.Comp1, logMissing: false)
+            || TerminatingOrDeleted(body)
+            || EntityManager.IsQueuedForDeletion(body))
+            return new HashSet<EntityUid>();
+
+        var xform = Transform(body);
+        if (xform.MapUid is null)
+            return new HashSet<EntityUid>();
+
+        var gibs = base.GibBody(
+            body,
+            gibOrgans,
+            splatDirection: splatDirection,
+            splatModifier: splatModifier,
+            splatCone:splatCone);
+
+        var ev = new BeingGibbedEvent(gibs);
+        RaiseLocalEvent(body, ref ev);
+
+        QueueDel(body);
+
+        return gibs;
+    }
+}
diff --git a/Content.Server/_White/Guns/GunFluxSystem.cs b/Content.Server/_White/Guns/GunFluxSystem.cs
index 1e92fe2e172..6c9abdfac68 100644
--- a/Content.Server/_White/Guns/GunFluxSystem.cs
+++ b/Content.Server/_White/Guns/GunFluxSystem.cs
@@ -4,7 +4,6 @@
 using Content.Server.Stunnable;
 using Content.Server.Temperature.Systems;
 using Content.Shared._Lavaland.Weapons.Ranged.Events;
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared._White.Guns;
 using Content.Shared.Damage;
 using Content.Shared.Projectiles;
@@ -57,11 +56,11 @@ private void OnProjectileShot(EntityUid uid, GunFluxComponent comp, ProjectileSh
         proj.Damage *= damageMul;
     }
 
-    protected override void ApplyOverheatDamage(EntityUid shooter, float damage, string type, TargetBodyPart? bodyPart)
+    protected override void ApplyOverheatDamage(EntityUid shooter, float damage, string type)
     {
-        base.ApplyOverheatDamage(shooter, damage, type, bodyPart);
+        base.ApplyOverheatDamage(shooter, damage, type);
         DamageSpecifier damagespec = new DamageSpecifier() { DamageDict = new() { { type, damage } } };
-        _damage.TryChangeDamage(shooter, damagespec, targetPart: bodyPart);
+        _damage.TryChangeDamage(shooter, damagespec);
     }
 
     protected override void TryMalfunction(EntityUid shooter, EntityUid gun, GunFluxComponent gunFlux, FluxCoreComponent core)
@@ -114,7 +113,7 @@ private void MalfunctionEject(EntityUid shooter, EntityUid gun, GunFluxComponent
         if(gunFlux.Owner == core.Owner)
         {
             //_popup.PopupEntity(Loc.GetString("gun-malfunction-eject-empty"), gun);
-            return; 
+            return;
         }
         if (!_slots.TryEject(gun, gunFlux.CoreSlot, gun, out _))
             return;
diff --git a/Content.Server/_White/Hands/Commands/AddHandCommand.cs b/Content.Server/_White/Hands/Commands/AddHandCommand.cs
new file mode 100644
index 00000000000..32d377ef5ad
--- /dev/null
+++ b/Content.Server/_White/Hands/Commands/AddHandCommand.cs
@@ -0,0 +1,72 @@
+using Content.Server._White.Commands;
+using Content.Server.Administration;
+using Content.Server.Hands.Systems;
+using Content.Shared.Administration;
+using Content.Shared.Hands.Components;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Hands.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AddHandCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "addhand";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        EntityUid entity = default;
+        var handName = "hand";
+        var handLocation = HandLocation.Middle;
+
+        if (args.Length == 0)
+        {
+            if (shell.Player?.AttachedEntity == null)
+            {
+                shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+                return;
+            }
+
+            entity = shell.Player.AttachedEntity.Value;
+        }
+
+        if (args.Length >= 1)
+        {
+            if (!NetEntity.TryParse(args[0], out var netEntity))
+            {
+                shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+                return;
+            }
+
+            entity = _entManager.GetEntity(netEntity);
+        }
+
+        if (args.Length >= 2)
+            handName = args[1];
+
+        if (args.Length >= 3 && !Enum.TryParse(args[2], out handLocation))
+        {
+            shell.WriteError(Loc.GetString("shell-argument-hand-location-invalid", ("index", args[2])));
+            return;
+        }
+
+        _entManager.System<HandsSystem>().AddHand(entity, handName, handLocation);
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-optional-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-optional-hint"));
+
+        if (args.Length == 3)
+            return CompletionResult.FromHintOptions(WhiteCompletionHelper.Emuns(typeof(HandLocation)), Loc.GetString("shell-argument-hand-location-optional-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Hands/Commands/RemoveHandCommand.cs b/Content.Server/_White/Hands/Commands/RemoveHandCommand.cs
new file mode 100644
index 00000000000..b9727634de5
--- /dev/null
+++ b/Content.Server/_White/Hands/Commands/RemoveHandCommand.cs
@@ -0,0 +1,60 @@
+using Content.Server.Administration;
+using Content.Server.Hands.Systems;
+using Content.Shared.Administration;
+using Robust.Shared.Console;
+
+namespace Content.Server._White.Hands.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed partial class RemoveHandCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    public override string Command => "removehand";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        EntityUid entity = default;
+        var handName = "hand";
+
+        if (args.Length == 0)
+        {
+            if (shell.Player?.AttachedEntity == null)
+            {
+                shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+                return;
+            }
+
+            entity = shell.Player.AttachedEntity.Value;
+        }
+
+        if (args.Length >= 1)
+        {
+            if (!NetEntity.TryParse(args[0], out var netEntity))
+            {
+                shell.WriteError(Loc.GetString("shell-invalid-entity-id"));
+                return;
+            }
+
+            entity = _entManager.GetEntity(netEntity);
+        }
+
+        if (args.Length >= 2)
+            handName = args[1];
+
+        _entManager.System<HandsSystem>().RemoveHand(entity, handName);
+
+        shell.WriteLine(Loc.GetString("shell-command-success"));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-entity-optional-hint"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHint(Loc.GetString("shell-argument-string-optional-hint"));
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs
index de274bfa840..dcc4a4eed31 100644
--- a/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs
+++ b/Content.Server/_White/Melee/BloodAbsorb/BloodAbsorbSystem.cs
@@ -1,7 +1,7 @@
+using Content.Server._White.Body.Bloodstream.Systems;
 using Content.Server._White.Melee.Crit;
 using Content.Server._White.Other.BloodLust;
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
+using Content.Shared._White.Body.Bloodstream.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Weapons.Melee.Events;
@@ -46,7 +46,7 @@ private void OnCritHit(EntityUid uid, BloodAbsorbComponent component, CritHitEve
 
             var bloodLevel = blood.Value.Comp.Solution.Volume.Int();
 
-            if (!_bloodstream.TryModifyBloodLevel(target, -absorbed, bloodstream, false))
+            if (!_bloodstream.TryModifyBloodLevel((target, bloodstream), -absorbed))
                 continue;
 
             absorbed = Math.Min(absorbed, bloodLevel);
@@ -66,6 +66,6 @@ private void OnMeleeHit(EntityUid uid, BloodAbsorbComponent component, MeleeHitE
             return;
 
         EnsureComp<BloodLustComponent>(args.User);
-        _bloodstream.TryModifyBleedAmount(args.User, bloodstream.MaxBleedAmount, bloodstream);
+        _bloodstream.TryModifyBleedAmount((args.User, bloodstream), bloodstream.MaximumBleeding);
     }
 }
diff --git a/Content.Server/_White/Mood/PainkillerSystem.cs b/Content.Server/_White/Mood/PainkillerSystem.cs
deleted file mode 100644
index 47f7ce04e6e..00000000000
--- a/Content.Server/_White/Mood/PainkillerSystem.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Server.Mood;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Robust.Shared.Configuration;
-using Content.Shared.CCVar;
-
-namespace Content.Server._White.Mood;
-
-/// <summary>
-/// Updates the mood when the effect of a painkiller (Morphine) starts/ends
-/// Everything else is handled by MoodSystem.OnDamageChange
-/// </summary>
-public sealed class PainkillerSystem : EntitySystem
-{
-    [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly MoodSystem _mood = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<NoScreamComponent, ComponentStartup>(OnInit);
-        SubscribeLocalEvent<NoScreamComponent, ComponentRemove>(OnRemove);
-    }
-
-    private void OnInit(EntityUid uid, NoScreamComponent component, ComponentStartup args)
-    {
-        if (!_config.GetCVar(CCVars.MoodEnabled) || !TryComp<MoodComponent>(uid, out var mood))
-            return;
-
-        _mood.UpdateDamageState(uid, mood);
-    }
-
-    private void OnRemove(EntityUid uid, NoScreamComponent component, ComponentRemove args)
-    {
-        if (!_config.GetCVar(CCVars.MoodEnabled) || !TryComp<MoodComponent>(uid, out var mood))
-            return;
-
-        _mood.UpdateDamageState(uid, mood);
-    }
-
-}
diff --git a/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs b/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs
index 68dc2e4dab9..a228c1cd133 100644
--- a/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs
+++ b/Content.Server/_White/Other/BloodLust/BloodLustSystem.cs
@@ -1,4 +1,5 @@
-using Content.Server.Body.Components;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Bloodstream.Systems;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Weapons.Melee.Events;
 
@@ -6,12 +7,23 @@ namespace Content.Server._White.Other.BloodLust;
 
 public sealed class BloodLustSystem : EntitySystem
 {
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+
     public override void Initialize()
     {
+        SubscribeLocalEvent<BloodLustComponent, AfterBleedingChangedEvent>(OnAfterBleedingChanged);
         SubscribeLocalEvent<BloodLustComponent, GetMeleeAttackRateEvent>(OnGetMeleeAttackRate);
         SubscribeLocalEvent<BloodLustComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
     }
 
+    private void OnAfterBleedingChanged(EntityUid uid, BloodLustComponent component, AfterBleedingChangedEvent args)
+    {
+        if (args.Bleeding == 0f)
+            RemComp<BloodLustComponent>(uid);
+
+        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+    }
+
     private void OnGetMeleeAttackRate(EntityUid uid, BloodLustComponent component, GetMeleeAttackRateEvent args)
     {
         if (!TryComp(args.User, out BloodLustComponent? bloodLust))
@@ -29,10 +41,10 @@ private void OnRefreshMovementSpeedModifiers(EntityUid uid, BloodLustComponent c
 
     private float GetBloodLustModifier(EntityUid uid)
     {
-        if (!TryComp(uid, out BloodstreamComponent? bloodstream) || bloodstream.MaxBleedAmount == 0f)
+        if (!TryComp(uid, out BloodstreamComponent? bloodstream) || bloodstream.MaximumBleeding == 0f)
             return 1f;
 
-        return Math.Clamp(bloodstream.BleedAmount / bloodstream.MaxBleedAmount, 0f, 1f);
+        return Math.Clamp((bloodstream.Bleeding / bloodstream.MaximumBleeding).Float(), 0f, 1f);
     }
 
     private float GetBloodLustMultiplier(float multiplier, float modifier)
diff --git a/Content.Server/_White/PreventGridLeave/PreventGridLeaveSystem.cs b/Content.Server/_White/PreventGridLeave/PreventGridLeaveSystem.cs
index 79f85c4f57b..7107dac52ad 100644
--- a/Content.Server/_White/PreventGridLeave/PreventGridLeaveSystem.cs
+++ b/Content.Server/_White/PreventGridLeave/PreventGridLeaveSystem.cs
@@ -1,20 +1,21 @@
+using Content.Server._White.Gibbing;
 using Content.Server.Explosion.Components;
 using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
+using Content.Server.Popups;
 using Content.Shared.Implants.Components;
 using Content.Shared.Popups;
+using Robust.Server.GameObjects;
 using Robust.Shared.Timing;
 
-
 namespace Content.Server._White.PreventGridLeave;
 
 public sealed class PreventGridLeaveSystem : EntitySystem
 {
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
+
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly TriggerSystem _trigger = default!;
 
     public override void Initialize()
@@ -75,9 +76,7 @@ private void Kill(EntityUid uid)
         }
 
         // In case there is no implant, gib or delete
-        if (TryComp<BodyComponent>(uid, out var body))
-            _body.GibBody(uid, true, body);
-        else
+        if (!_gibbing.TryGibBody(uid, out _, true))
             Del(uid);
     }
 }
diff --git a/Content.Server/_White/Projectiles/PenetratedProjectileSystem.cs b/Content.Server/_White/Projectiles/PenetratedProjectileSystem.cs
index 4089a171ce4..07034a060c7 100644
--- a/Content.Server/_White/Projectiles/PenetratedProjectileSystem.cs
+++ b/Content.Server/_White/Projectiles/PenetratedProjectileSystem.cs
@@ -77,6 +77,6 @@ private void FreePenetrated(EntityUid uid, PenetratedProjectileComponent compone
         _penetrated.FreePenetrated(penetratedUid);
 
         if (TryComp<EmbeddableProjectileComponent>(uid, out var embeddable))
-            _projectile.TryEmbed(uid, penetratedUid, null, embeddable, null, false);
+            _projectile.TryEmbed(uid, penetratedUid, null, embeddable, false);
     }
 }
diff --git a/Content.Server/_White/TargetDoll/TargetDollSystem.cs b/Content.Server/_White/TargetDoll/TargetDollSystem.cs
new file mode 100644
index 00000000000..b4ff2e0cb8d
--- /dev/null
+++ b/Content.Server/_White/TargetDoll/TargetDollSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared._White.TargetDoll;
+
+namespace Content.Server._White.TargetDoll;
+
+public sealed class TargetDollSystem : SharedTargetDollSystem;
diff --git a/Content.Server/_White/Teleporter/ExperimentalTeleporterSystem.cs b/Content.Server/_White/Teleporter/ExperimentalTeleporterSystem.cs
index 4a4fc5dab41..99db028d41e 100644
--- a/Content.Server/_White/Teleporter/ExperimentalTeleporterSystem.cs
+++ b/Content.Server/_White/Teleporter/ExperimentalTeleporterSystem.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using System.Numerics;
-using Content.Server.Body.Systems;
+using Content.Server._White.Gibbing;
+using Content.Server.Charges.Systems;
 using Content.Server.Standing;
-using Content.Shared.Charges.Systems;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Maps;
@@ -18,16 +18,17 @@ namespace Content.Server._White.Teleporter;
 
 public sealed class ExperimentalTeleporterSystem : EntitySystem
 {
-    [Dependency] private readonly TransformSystem _transform = default!;
-    [Dependency] private readonly BodySystem _bodySystem = default!;
-    [Dependency] private readonly MapSystem _mapSystem = default!;
     [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
     [Dependency] private readonly AudioSystem _audio = default!;
+    [Dependency] private readonly ChargesSystem _charges = default!;
     [Dependency] private readonly ContainerSystem _containerSystem = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly LayingDownSystem _layingDown = default!;
-    [Dependency] private readonly SharedChargesSystem _charges = default!;
+    [Dependency] private readonly MapSystem _mapSystem = default!;
     [Dependency] private readonly TagSystem _tag = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -38,9 +39,9 @@ public override void Initialize()
     private void OnUse(EntityUid uid, ExperimentalTeleporterComponent component, UseInHandEvent args)
     {
         if (_charges.IsEmpty(uid)
-            || !TryComp<TransformComponent>(args.User, out var xform)
-            || (_containerSystem.IsEntityInContainer(args.User)
-                && !_containerSystem.TryRemoveFromContainer(args.User)))
+            || !TryComp(args.User, out TransformComponent? xform)
+            || _containerSystem.IsEntityInContainer(args.User)
+                && !_containerSystem.TryRemoveFromContainer(args.User))
             return;
 
         var oldCoords = xform.Coordinates;
@@ -57,7 +58,7 @@ private void OnUse(EntityUid uid, ExperimentalTeleporterComponent component, Use
             || EmergencyTeleportation(args.User, uid, component, xform, oldCoords, newOffset))
             return;
 
-        _bodySystem.GibBody(args.User, true, splatModifier: 3F);
+        _gibbing.GibBody(args.User, true, splatModifier: 3F);
     }
 
     private bool EmergencyTeleportation(EntityUid uid, EntityUid teleporterUid, ExperimentalTeleporterComponent component, TransformComponent xform, EntityCoordinates oldCoords, Vector2 offset)
diff --git a/Content.Server/_White/Traits/BlueBloodTraitComponent.cs b/Content.Server/_White/Traits/BlueBloodTraitComponent.cs
deleted file mode 100644
index 401875b0dcb..00000000000
--- a/Content.Server/_White/Traits/BlueBloodTraitComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Body.Prototypes;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server._White.Traits;
-
-[RegisterComponent]
-public sealed partial class BlueBloodTraitComponent : Component
-{
-    [DataField]
-    public HashSet<ProtoId<MetabolizerTypePrototype>> MetabolizerPrototype = new() { "Arachnid" };
-
-    [DataField]
-    public string Blood = "CopperBlood";
-}
diff --git a/Content.Server/_White/Traits/BlueBloodTraitSystem.cs b/Content.Server/_White/Traits/BlueBloodTraitSystem.cs
deleted file mode 100644
index 8cbb59236e9..00000000000
--- a/Content.Server/_White/Traits/BlueBloodTraitSystem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Body.Systems;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Systems;
-using System.Diagnostics.CodeAnalysis;
-using static Content.Server.Power.Pow3r.PowerState;
-
-namespace Content.Server._White.Traits;
-public sealed class BlueBloodTraitSystem : EntitySystem
-{
-    [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
-    [Dependency] private readonly SharedBodySystem _bodySys = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<BlueBloodTraitComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, BlueBloodTraitComponent component, MapInitEvent args)
-    {
-        if (TryComp<BloodstreamComponent>(uid, out var bloodstream))
-        {
-            _bloodstream.TryModifyBloodLevel(uid, 0, bloodstream, false);
-            _bloodstream.ChangeBloodReagent(uid, component.Blood, bloodstream);
-            _bloodstream.TryModifyBloodLevel(uid, bloodstream.BloodMaxVolume, bloodstream, false);
-        }
-
-        if (TryGetMetabolizer(uid, out var metabolizer) && metabolizer != null)
-                metabolizer.Value.Comp.MetabolizerTypes = component.MetabolizerPrototype;
-    }
-
-    private bool TryGetMetabolizer(EntityUid uid, out Entity<MetabolizerComponent>? metabolizer)
-    {
-        metabolizer = null;
-
-        foreach (var (organId, _) in _bodySys.GetBodyOrgans(uid))
-        {
-            if (TryComp(organId, out MetabolizerComponent? metabolizerComp))
-            {
-                metabolizer = (organId, metabolizerComp);
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/Content.Server/_White/Traits/TraitAddMetabolizerTypes.cs b/Content.Server/_White/Traits/TraitAddMetabolizerTypes.cs
new file mode 100644
index 00000000000..90bb2998f2d
--- /dev/null
+++ b/Content.Server/_White/Traits/TraitAddMetabolizerTypes.cs
@@ -0,0 +1,35 @@
+using Content.Server._White.Body.Organs.Metabolizer;
+using Content.Server._White.Body.Systems;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Prototypes;
+using Content.Shared.Traits;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager;
+
+namespace Content.Server._White.Traits;
+
+[UsedImplicitly]
+public sealed partial class TraitAddMetabolizerTypes : TraitFunction
+{
+    [DataField(required: true), AlwaysPushInheritance]
+    public HashSet<ProtoId<MetabolizerTypePrototype>> MetabolizerTypes;
+
+    [DataField, AlwaysPushInheritance]
+    public OrganType OrganType = OrganType.None;
+
+    public override void OnPlayerSpawn(
+        EntityUid uid,
+        IComponentFactory factory,
+        IEntityManager entityManager,
+        ISerializationManager serializationManager
+    )
+    {
+        var bodySystem = entityManager.System<BodySystem>();
+        var metabolizerSystem = entityManager.System<MetabolizerSystem>();
+
+        foreach (var metabolizer in bodySystem.GetOrgans<MetabolizerComponent>(uid, OrganType))
+            metabolizerSystem.AddMetabolizerTypes((metabolizer, metabolizer), MetabolizerTypes);
+    }
+}
diff --git a/Content.Server/_White/Traits/TraitReplaceBloodReagent.cs b/Content.Server/_White/Traits/TraitReplaceBloodReagent.cs
new file mode 100644
index 00000000000..1eeb43ea60a
--- /dev/null
+++ b/Content.Server/_White/Traits/TraitReplaceBloodReagent.cs
@@ -0,0 +1,26 @@
+using Content.Shared._White.Body.Bloodstream.Systems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Traits;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager;
+
+namespace Content.Server._White.Traits;
+
+[UsedImplicitly]
+public sealed partial class TraitReplaceBloodReagent : TraitFunction
+{
+    [DataField(required: true), AlwaysPushInheritance]
+    public ProtoId<ReagentPrototype> Reagent;
+
+    public override void OnPlayerSpawn(
+        EntityUid uid,
+        IComponentFactory factory,
+        IEntityManager entityManager,
+        ISerializationManager serializationManager
+        )
+    {
+        var bloodstreamSystem = entityManager.System<SharedBloodstreamSystem>();
+        bloodstreamSystem.ChangeBloodReagent(uid, Reagent);
+    }
+}
diff --git a/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerComponent.cs b/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerComponent.cs
index 58977580934..bcc6dc473e3 100644
--- a/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerComponent.cs
+++ b/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
@@ -8,6 +9,9 @@ namespace Content.Server._White.Xenomorphs.FaceHugger;
 [RegisterComponent]
 public sealed partial class FaceHuggerComponent : Component
 {
+    [DataField]
+    public BodyPartType BodyPartType = BodyPartType.Chest;
+
     [DataField]
     public DamageSpecifier DamageOnImpact = new();
 
diff --git a/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs b/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs
index ea6865bfae9..f6e44b48e4f 100644
--- a/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs
+++ b/Content.Server/_White/Xenomorphs/FaceHugger/FaceHuggerSystem.cs
@@ -1,6 +1,7 @@
-using Content.Server.Body.Systems;
+using Content.Server._White.Body.Systems;
 using Content.Server.Popups;
 using Content.Server.Stunnable;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Damage;
 using Content.Shared.Hands;
@@ -119,13 +120,12 @@ private void Infect(EntityUid uid, FaceHuggerComponent component)
             || !TryComp<ClothingComponent>(uid, out var clothing)
             || clothing.InSlot != component.Slot
             || !_container.TryGetContainingContainer((uid, null, null), out var target)
-            || _body.GetRootPartOrNull(target.Owner) is not {} rootPart)
+            || _body.GetBodyParts(target.Owner, component.BodyPartType).FirstOrNull() is not {} bodyPart)
             return;
 
         var organ = Spawn(component.InfectionPrototype);
-        _body.TryCreateOrganSlot(rootPart.Entity, component.InfectionSlotId, out _, rootPart.BodyPart);
-
-        if (!_body.InsertOrgan(rootPart.Entity, organ, component.InfectionSlotId, rootPart.BodyPart))
+        if (!TryComp<OrganComponent>(organ, out var organComponent)
+            || !_body.TryCreateOrganSlotAndAttachOrgan(bodyPart.AsNullable(), (organ, organComponent), component.InfectionSlotId, organComponent.Type))
         {
             QueueDel(organ);
             return;
diff --git a/Content.Server/_White/Xenomorphs/Infection/XenomorphInfectionSystem.cs b/Content.Server/_White/Xenomorphs/Infection/XenomorphInfectionSystem.cs
index e84cb873000..42f4e09f1fe 100644
--- a/Content.Server/_White/Xenomorphs/Infection/XenomorphInfectionSystem.cs
+++ b/Content.Server/_White/Xenomorphs/Infection/XenomorphInfectionSystem.cs
@@ -1,6 +1,6 @@
+using Content.Shared._White.Body.Systems;
 using Content.Shared._White.Xenomorphs.Infection;
 using Content.Shared._White.Xenomorphs.Larva;
-using Content.Shared.Body.Events;
 using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
 using Robust.Server.Containers;
@@ -22,8 +22,8 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<XenomorphInfectionComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<XenomorphInfectionComponent, OrganAddedToBodyEvent>(OnOrganAddedToBody);
-        SubscribeLocalEvent<XenomorphInfectionComponent, OrganRemovedFromBodyEvent>(OnOrganRemovedFromBody);
+        SubscribeLocalEvent<XenomorphInfectionComponent, OrganAddedEvent>(OnOrganAdded);
+        SubscribeLocalEvent<XenomorphInfectionComponent, OrganRemovedEvent>(OnOrganRemoved);
     }
 
     private void OnShutdown(EntityUid uid, XenomorphInfectionComponent component, ComponentShutdown args)
@@ -32,19 +32,25 @@ private void OnShutdown(EntityUid uid, XenomorphInfectionComponent component, Co
             RemComp<XenomorphInfectedComponent>(component.Infected.Value);
     }
 
-    private void OnOrganAddedToBody(EntityUid uid, XenomorphInfectionComponent component, OrganAddedToBodyEvent args)
+    private void OnOrganAdded(EntityUid uid, XenomorphInfectionComponent component, OrganAddedEvent args)
     {
-        var xenomorphInfected = EnsureComp<XenomorphInfectedComponent>(args.Body);
+        if (args.Body is not {} body)
+            return;
+
+        var xenomorphInfected = EnsureComp<XenomorphInfectedComponent>(body);
         xenomorphInfected.Infection = uid;
         xenomorphInfected.InfectedIcons = component.InfectedIcons;
-        Dirty(args.Body, xenomorphInfected);
+        Dirty(body, xenomorphInfected);
 
         component.Infected = args.Body;
     }
 
-    private void OnOrganRemovedFromBody(EntityUid uid, XenomorphInfectionComponent component, OrganRemovedFromBodyEvent args)
+    private void OnOrganRemoved(EntityUid uid, XenomorphInfectionComponent component, OrganRemovedEvent args)
     {
-        RemComp<XenomorphInfectedComponent>(args.OldBody);
+        if (args.Body is not {} body)
+            return;
+
+        RemComp<XenomorphInfectedComponent>(body);
         component.Infected = null;
     }
 
diff --git a/Content.Server/_White/Xenomorphs/Larva/XenomorphLarvaSystem.cs b/Content.Server/_White/Xenomorphs/Larva/XenomorphLarvaSystem.cs
index 5dcd8bff68e..1467b2d11aa 100644
--- a/Content.Server/_White/Xenomorphs/Larva/XenomorphLarvaSystem.cs
+++ b/Content.Server/_White/Xenomorphs/Larva/XenomorphLarvaSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Body.Systems;
+using Content.Server._White.Gibbing;
 using Content.Server.DoAfter;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Jittering;
@@ -16,9 +16,9 @@ namespace Content.Server._White.Xenomorphs.Larva;
 
 public sealed class XenomorphLarvaSystem : EntitySystem
 {
-    [Dependency] private readonly BodySystem _body = default!;
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
+    [Dependency] private readonly GibbingSystem _gibbing = default!;
     [Dependency] private readonly JitteringSystem _jitter = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
 
@@ -74,6 +74,6 @@ private void OnLarvaBurstDoAfter(EntityUid uid, XenomorphLarvaComponent componen
             return;
 
         _container.Remove(uid, container);
-        _body.GibBody(victim);
+        _gibbing.GibBody(victim);
     }
 }
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index a919a088d9c..f29878ef564 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -13,10 +13,6 @@
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 
-// Shitmed Change
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared.Silicons.StationAi;
-
 namespace Content.Shared.ActionBlocker
 {
     /// <summary>
@@ -90,10 +86,6 @@ public bool CanInteract(EntityUid user, EntityUid? target)
             if (!CanConsciouslyPerformAction(user))
                 return false;
 
-            // Shitmed Change
-            if (HasComp<StationAiOverlayComponent>(user) && HasComp<AbductorScientistComponent>(user))
-                return false;
-
             var ev = new InteractionAttemptEvent(user, target);
             RaiseLocalEvent(user, ref ev);
 
@@ -256,15 +248,5 @@ public bool CanSweat(EntityUid uid)
 
             return !ev.Cancelled;
         }
-
-        // Shitmed Change Start - Starlight Abductors
-        public bool CanInstrumentInteract(EntityUid user, EntityUid used, EntityUid? target)
-        {
-            var ev = new InteractionAttemptEvent(user, target);
-            RaiseLocalEvent(used, ref ev);
-
-            return !ev.Cancelled;
-        }
-        // Shitmed Change End - Starlight Abductors
     }
 }
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 0a9facd6880..bc84dc98da0 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Shared._Shitmed.Antags.Abductor;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Logs;
@@ -36,7 +35,7 @@ public abstract class SharedActionsSystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!; // Shitmed Change
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
 
     public override void Initialize()
@@ -540,8 +539,7 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
                 break;
             }
             case InstantActionComponent instantAction:
-                var hasNoSpecificComponents = !HasComp<StationAiOverlayComponent>(user) && !HasComp<AbductorScientistComponent>(user); // Shitmed Change
-                if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null) && hasNoSpecificComponents) // Shitmed Change
+                if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null))
                     return;
 
                 _adminLogger.Add(LogType.Action,
@@ -636,8 +634,7 @@ private bool ValidateWorldTargetBase(EntityUid user,
         if (entityCoordinates is not { } coords)
             return false;
 
-        var hasNoSpecificComponents = !HasComp<StationAiOverlayComponent>(user) && !HasComp<AbductorScientistComponent>(user); // Shitmed Change
-        if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, null) && hasNoSpecificComponents) // Shitmed Change
+        if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, null))
             return false;
 
         if (!checkCanAccess)
@@ -1200,7 +1197,6 @@ protected bool ShouldResetCharges(BaseActionComponent action)
         return action is { Charges: < 1, RenewCharges: true };
     }
 
-    // Shitmed Change Start - Starlight Abductors
     public EntityUid[] HideActions(EntityUid performer, ActionsComponent? comp = null)
     {
         if (!Resolve(performer, ref comp, false))
@@ -1221,5 +1217,4 @@ public void UnHideActions(EntityUid performer, EntityUid[] actions, ActionsCompo
             comp.Actions.Add(action);
         Dirty(performer, comp);
     }
-    // Shitmed Change End
 }
diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
index a7e07ae2b50..6647f79168f 100644
--- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
@@ -1,5 +1,5 @@
-using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Prototypes;
+using Content.Shared._White.Body.Prototypes;
+using Content.Shared.Anomaly.Effects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 42cb0506296..34e5f9048a5 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -213,8 +213,7 @@ private void OnDamageChanged(Entity<SleepingComponent> ent, ref DamageChangedEve
         if (!args.DamageIncreased || args.DamageDelta == null)
             return;
 
-        if (args.DamageDelta.GetTotal() >= ent.Comp.WakeThreshold
-            && !HasComp<ForcedSleepingComponent>(ent))
+        if (args.DamageDelta.GetTotal() >= ent.Comp.WakeThreshold)
             TryWaking((ent, ent.Comp));
     }
 
diff --git a/Content.Shared/Body/Components/BodyComponent.cs b/Content.Shared/Body/Components/BodyComponent.cs
deleted file mode 100644
index 670aee12bc1..00000000000
--- a/Content.Shared/Body/Components/BodyComponent.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Body.Systems;
-using Robust.Shared.Audio;
-using Robust.Shared.Containers;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Body.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedBodySystem))]
-public sealed partial class BodyComponent : Component
-{
-    /// <summary>
-    /// Relevant template to spawn for this body.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public ProtoId<BodyPrototype>? Prototype;
-
-    /// <summary>
-    /// Container that holds the root body part.
-    /// </summary>
-    /// <remarks>
-    /// Typically is the torso.
-    /// </remarks>
-    [ViewVariables] public ContainerSlot RootContainer = default!;
-
-    [ViewVariables]
-    public string RootPartSlot => RootContainer.ID;
-
-    [DataField, AutoNetworkedField]
-    public SoundSpecifier GibSound = new SoundCollectionSpecifier("gib");
-
-    /// <summary>
-    /// The amount of legs required to move at full speed.
-    /// If 0, then legs do not impact speed.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public int RequiredLegs;
-
-    [ViewVariables]
-    [DataField, AutoNetworkedField]
-    public HashSet<EntityUid> LegEntities = new();
-
-    [DataField, AutoNetworkedField]
-    public bool ThermalVisibility = true;
-
-    /// <summary>
-    /// WWDP; Minimal move speed regardless of any bodyparts
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float MinimumMovementSpeed = 1f;
-}
diff --git a/Content.Shared/Body/Events/MechanismBodyEvents.cs b/Content.Shared/Body/Events/MechanismBodyEvents.cs
deleted file mode 100644
index 968b172aef5..00000000000
--- a/Content.Shared/Body/Events/MechanismBodyEvents.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Content.Shared.Body.Events;
-
-// All of these events are raised on a mechanism entity when added/removed to a body in different
-// ways.
-
-/// <summary>
-/// Raised on a mechanism when it is added to a body part.
-/// </summary>
-[ByRefEvent]
-public readonly record struct OrganAddedEvent(EntityUid Part);
-
-/// <summary>
-/// Raised on a mechanism when it is added to a body part within a body.
-/// </summary>
-[ByRefEvent]
-public readonly record struct OrganAddedToBodyEvent(EntityUid Body, EntityUid Part);
-
-/// <summary>
-/// Raised on a mechanism when it is removed from a body part.
-/// </summary>
-[ByRefEvent]
-public readonly record struct OrganRemovedEvent(EntityUid OldPart);
-
-/// <summary>
-/// Raised on a mechanism when it is removed from a body part within a body.
-/// </summary>
-[ByRefEvent]
-public readonly record struct OrganRemovedFromBodyEvent(EntityUid OldBody, EntityUid OldPart);
diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs
deleted file mode 100644
index cec371285be..00000000000
--- a/Content.Shared/Body/Organ/OrganComponent.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using Content.Shared.Body.Systems;
-using Content.Shared.Traits;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes; // Shitmed Change
-using Content.Shared._Shitmed.Medical.Surgery; // Shitmed Change
-using Content.Shared._Shitmed.Medical.Surgery.Tools; // Shitmed Change
-
-namespace Content.Shared.Body.Organ;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(SharedBodySystem), typeof(SharedSurgerySystem))] // Shitmed Change
-public sealed partial class OrganComponent : Component, ISurgeryToolComponent // Shitmed Change
-{
-    /// <summary>
-    /// Relevant body this organ is attached to.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? Body;
-
-    /// <summary>
-    ///     Shitmed Change:Relevant body this organ originally belonged to.
-    ///     FOR WHATEVER FUCKING REASON AUTONETWORKING THIS CRASHES GIBTEST AAAAAAAAAAAAAAA
-    /// </summary>
-    [DataField]
-    public EntityUid? OriginalBody;
-
-    // Shitmed Change Start
-    /// <summary>
-    ///     Shitmed Change: 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 = string.Empty;
-
-    [DataField]
-    public string ToolName { get; set; } = "An organ";
-
-    [DataField]
-    public float Speed { get; set; } = 1f;
-
-    /// <summary>
-    ///     Shitmed Change: If true, the organ will not heal an entity when transplanted into them.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool? Used { get; set; }
-
-
-    /// <summary>
-    ///     When attached, the organ will ensure these components on the entity, and delete them on removal.
-    /// </summary>
-    [DataField]
-    public ComponentRegistry? OnAdd;
-
-    /// <summary>
-    ///     When removed, the organ will ensure these components on the entity, and delete them on insertion.
-    /// </summary>
-    [DataField]
-    public ComponentRegistry? OnRemove;
-
-    /// <summary>
-    ///     Is this organ working or not?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled = true;
-
-    /// <summary>
-    ///     Can this organ be enabled or disabled? Used mostly for prop, damaged or useless organs.
-    /// </summary>
-    [DataField]
-    public bool CanEnable = true;
-    // Shitmed Change End
-
-    /// <summary>
-    ///     These functions are called when this organ is added/implanted to an entity.
-    /// </summary>
-    [DataField(serverOnly: true)]
-    public TraitFunction[] OnImplantFunctions { get; private set; } = Array.Empty<TraitFunction>();
-
-    /// <summary>
-    ///     These functions are called when this organ is removed from an entity.
-    /// </summary>
-    [DataField(serverOnly: true)]
-    public TraitFunction[] OnRemoveFunctions { get; private set; } = Array.Empty<TraitFunction>();
-}
diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs
deleted file mode 100644
index 8a8aa4ac927..00000000000
--- a/Content.Shared/Body/Part/BodyPartComponent.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-// Shitmed Change
-
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.FixedPoint;
-using Content.Shared._Shitmed.Medical.Surgery.Tools;
-using Content.Shared._Shitmed.Targeting;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Body.Part;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-//[Access(typeof(SharedBodySystem))] // Shitmed Change - all access :godo:
-public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent // Shitmed Change
-{
-    // Need to set this on container changes as it may be several transform parents up the hierarchy.
-    /// <summary>
-    /// Parent body for this part.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? Body;
-
-    // Shitmed Change Start
-
-    [DataField, AutoNetworkedField]
-    public BodyPartSlot? ParentSlot;
-
-    /// <summary>
-    ///     Shitmed Change: Amount of damage to deal when the part gets removed.
-    ///     Only works if IsVital is true.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public FixedPoint2 VitalDamage = 100;
-
-    [DataField]
-    public string ToolName { get; set; } = "A body part";
-
-    [DataField]
-    public string SlotId = string.Empty;
-
-    [DataField, AutoNetworkedField]
-    public bool? Used { get; set; } = null;
-
-    [DataField]
-    public float Speed { get; set; } = 1f;
-
-    /// <summary>
-    /// Shitmed Change: What's the max health this body part can have?
-    /// </summary>
-    [DataField]
-    public float MinIntegrity;
-
-    /// <summary>
-    /// Whether this body part can be severed or not
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool CanSever = true;
-
-    /// <summary>
-    ///     Shitmed Change: Whether this body part is enabled or not.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Enabled = true;
-
-    /// <summary>
-    ///     Shitmed Change: Whether this body part can be enabled or not. Used for non-functional prosthetics.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool CanEnable = true;
-
-    /// <summary>
-    /// Whether this body part can attach children or not.
-    /// </summary>
-    [DataField]
-    public bool CanAttachChildren = true;
-
-    /// <summary>
-    ///     Shitmed Change: How long it takes to run another self heal tick on the body part.
-    /// </summary>
-    [DataField]
-    public float HealingTime = 30;
-
-    /// <summary>
-    ///     Shitmed Change: How long it has been since the last self heal tick on the body part.
-    /// </summary>
-    public float HealingTimer;
-
-    /// <summary>
-    ///     Shitmed Change: How much health to heal on the body part per tick.
-    /// </summary>
-    [DataField]
-    public float SelfHealingAmount = 5;
-
-    /// <summary>
-    ///     Shitmed Change: The name of the container for this body part. Used in insertion surgeries.
-    /// </summary>
-    [DataField]
-    public string ContainerName { get; set; } = "part_slot";
-
-    /// <summary>
-    ///     Shitmed Change: The slot for item insertion.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public ItemSlot ItemInsertionSlot = new();
-
-
-    /// <summary>
-    ///     Shitmed Change: Current species. Dictates things like body part sprites.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string Species { get; set; } = "";
-
-    /// <summary>
-    ///     Shitmed Change: 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>
-    ///     Shitmed Change: The ID of the base layer for this body part.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string? BaseLayerId;
-
-    /// <summary>
-    ///     Shitmed Change: 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 },
-    };
-
-
-    [DataField, AutoNetworkedField]
-    public BodyPartType PartType = BodyPartType.Other;
-
-
-    // TODO BODY Replace with a simulation of organs
-    /// <summary>
-    ///     Whether or not the owning <see cref="Body"/> will die if all
-    ///     <see cref="BodyComponent"/>s of this type are removed from it.
-    /// </summary>
-    [DataField("vital"), AutoNetworkedField]
-    public bool IsVital;
-
-    [DataField, AutoNetworkedField]
-    public BodyPartSymmetry Symmetry = BodyPartSymmetry.None;
-
-    /// <summary>
-    ///     When attached, the part will ensure these components on the entity, and delete them on removal.
-    /// </summary>
-    [DataField, AlwaysPushInheritance]
-    public ComponentRegistry? OnAdd;
-
-    /// <summary>
-    ///     When removed, the part will ensure these components on the entity, and add them on removal.
-    /// </summary>
-    [DataField, AlwaysPushInheritance]
-    public ComponentRegistry? OnRemove;
-
-    // Shitmed Change End
-
-    /// <summary>
-    /// Child body parts attached to this body part.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Dictionary<string, BodyPartSlot> Children = new();
-
-    /// <summary>
-    /// Organs attached to this body part.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Dictionary<string, OrganSlot> Organs = new();
-
-    /// <summary>
-    /// These are only for VV/Debug do not use these for gameplay/systems
-    /// </summary>
-    [ViewVariables]
-    private List<ContainerSlot> BodyPartSlotsVV
-    {
-        get
-        {
-            List<ContainerSlot> temp = new();
-            var containerSystem = IoCManager.Resolve<IEntityManager>().System<SharedContainerSystem>();
-
-            foreach (var slotId in Children.Keys)
-            {
-                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.PartSlotContainerIdPrefix+slotId));
-            }
-
-            return temp;
-        }
-    }
-
-    [ViewVariables]
-    private List<ContainerSlot> OrganSlotsVV
-    {
-        get
-        {
-            List<ContainerSlot> temp = new();
-            var containerSystem = IoCManager.Resolve<IEntityManager>().System<SharedContainerSystem>();
-
-            foreach (var slotId in Organs.Keys)
-            {
-                temp.Add((ContainerSlot) containerSystem.GetContainer(Owner, SharedBodySystem.OrganSlotContainerIdPrefix+slotId));
-            }
-
-            return temp;
-        }
-    }
-}
-
-/// <summary>
-/// Contains metadata about a body part in relation to its slot.
-/// </summary>
-[NetSerializable, Serializable]
-[DataRecord]
-public partial struct BodyPartSlot
-{
-    public string Id;
-    public BodyPartType Type;
-
-    public BodyPartSlot(string id, BodyPartType type)
-    {
-        Id = id;
-        Type = type;
-    }
-};
-
-/// <summary>
-/// Contains metadata about an organ part in relation to its slot.
-/// </summary>
-[NetSerializable, Serializable]
-[DataRecord]
-public partial struct OrganSlot
-{
-    public string Id;
-
-    public OrganSlot(string id)
-    {
-        Id = id;
-    }
-};
diff --git a/Content.Shared/Body/Part/BodyPartEvents.cs b/Content.Shared/Body/Part/BodyPartEvents.cs
deleted file mode 100644
index 0d8d2c8a268..00000000000
--- a/Content.Shared/Body/Part/BodyPartEvents.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared.Body.Part;
-
-[ByRefEvent]
-public readonly record struct BodyPartAddedEvent(string Slot, Entity<BodyPartComponent> Part);
-
-[ByRefEvent]
-public readonly record struct BodyPartRemovedEvent(string Slot, Entity<BodyPartComponent> Part);
diff --git a/Content.Shared/Body/Part/BodyPartSymmetry.cs b/Content.Shared/Body/Part/BodyPartSymmetry.cs
deleted file mode 100644
index aa008698231..00000000000
--- a/Content.Shared/Body/Part/BodyPartSymmetry.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Body.Components;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Body.Part
-{
-    /// <summary>
-    ///     Defines the symmetry of a <see cref="BodyComponent"/>.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public enum BodyPartSymmetry
-    {
-        None = 0,
-        Left,
-        Right
-    }
-}
diff --git a/Content.Shared/Body/Part/BodyPartType.cs b/Content.Shared/Body/Part/BodyPartType.cs
deleted file mode 100644
index acaee76fd85..00000000000
--- a/Content.Shared/Body/Part/BodyPartType.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Body.Components;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Body.Part
-{
-    /// <summary>
-    ///     Defines the type of a <see cref="BodyComponent"/>.
-    /// </summary>
-    [Serializable, NetSerializable]
-    public enum BodyPartType
-    {
-        Other = 0,
-        Torso,
-        Head,
-        Arm,
-        Hand,
-        Leg,
-        Foot,
-        Tail
-    }
-}
diff --git a/Content.Shared/Body/Prototypes/BodyPrototype.cs b/Content.Shared/Body/Prototypes/BodyPrototype.cs
deleted file mode 100644
index 646acaaf6bd..00000000000
--- a/Content.Shared/Body/Prototypes/BodyPrototype.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Body.Prototypes;
-
-[Prototype("body")]
-public sealed partial class BodyPrototype : IPrototype
-{
-    [IdDataField] public string ID { get; private set; } = default!;
-
-    [DataField("name")]
-    public string Name { get; private set; } = "";
-
-    [DataField("root")] public string Root { get; private set; } = string.Empty;
-
-    [DataField("slots")] public Dictionary<string, BodyPrototypeSlot> Slots { get; private set; } = new();
-
-    private BodyPrototype() { }
-
-    public BodyPrototype(string id, string name, string root, Dictionary<string, BodyPrototypeSlot> slots)
-    {
-        ID = id;
-        Name = name;
-        Root = root;
-        Slots = slots;
-    }
-}
-
-[DataRecord]
-public sealed partial record BodyPrototypeSlot(EntProtoId? Part, HashSet<string> Connections, Dictionary<string, string> Organs);
diff --git a/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs b/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
deleted file mode 100644
index 46453e0c509..00000000000
--- a/Content.Shared/Body/Prototypes/BodyPrototypeSerializer.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System.Linq;
-using Content.Shared.Body.Organ;
-using Content.Shared.Prototypes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Serialization.Markdown.Mapping;
-using Robust.Shared.Serialization.Markdown.Sequence;
-using Robust.Shared.Serialization.Markdown.Validation;
-using Robust.Shared.Serialization.Markdown.Value;
-using Robust.Shared.Serialization.TypeSerializers.Interfaces;
-
-namespace Content.Shared.Body.Prototypes;
-
-[TypeSerializer]
-public sealed class BodyPrototypeSerializer : ITypeReader<BodyPrototype, MappingDataNode>
-{
-    private (ValidationNode Node, List<string> Connections) ValidateSlot(MappingDataNode slot, IDependencyCollection dependencies)
-    {
-        var nodes = new List<ValidationNode>();
-        var prototypes = dependencies.Resolve<IPrototypeManager>();
-        var factory = dependencies.Resolve<IComponentFactory>();
-
-        var connections = new List<string>();
-        if (slot.TryGet("connections", out SequenceDataNode? connectionsNode))
-        {
-            foreach (var node in connectionsNode)
-            {
-                if (node is not ValueDataNode connection)
-                {
-                    nodes.Add(new ErrorNode(node, $"Connection is not a value data node"));
-                    continue;
-                }
-
-                connections.Add(connection.Value);
-            }
-        }
-
-        if (slot.TryGet("organs", out MappingDataNode? organsNode))
-        {
-            foreach (var (key, value) in organsNode)
-            {
-                if (value is not ValueDataNode organ)
-                {
-                    nodes.Add(new ErrorNode(value, $"Value is not a value data node"));
-                    continue;
-                }
-
-                if (!prototypes.TryIndex(organ.Value, out EntityPrototype? organPrototype))
-                {
-                    nodes.Add(new ErrorNode(value, $"No organ entity prototype found with id {organ.Value}"));
-                    continue;
-                }
-
-                if (!organPrototype.HasComponent<OrganComponent>(factory))
-                {
-                    nodes.Add(new ErrorNode(value, $"Organ {organ.Value} does not have a body component"));
-                }
-            }
-        }
-
-        var validation = new ValidatedSequenceNode(nodes);
-        return (validation, connections);
-    }
-
-    public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node,
-        IDependencyCollection dependencies, ISerializationContext? context = null)
-    {
-        var nodes = new List<ValidationNode>();
-
-        if (!node.TryGet("root", out ValueDataNode? root))
-            nodes.Add(new ErrorNode(node, $"No root value data node found"));
-
-        if (!node.TryGet("slots", out MappingDataNode? slots))
-        {
-            nodes.Add(new ErrorNode(node, $"No slots mapping data node found"));
-        }
-        else if (root != null)
-        {
-            if (!slots.TryGet(root.Value, out MappingDataNode? _))
-            {
-                nodes.Add(new ErrorNode(slots, $"No slot found with id {root.Value}"));
-                return new ValidatedSequenceNode(nodes);
-            }
-
-            foreach (var (key, value) in slots)
-            {
-                if (value is not MappingDataNode slot)
-                {
-                    nodes.Add(new ErrorNode(value, $"Slot is not a mapping data node"));
-                    continue;
-                }
-
-                var result = ValidateSlot(slot, dependencies);
-                nodes.Add(result.Node);
-
-                foreach (var connection in result.Connections)
-                {
-                    if (!slots.TryGet(connection, out MappingDataNode? _))
-                        nodes.Add(new ErrorNode(slots, $"No slot found with id {connection}"));
-                }
-            }
-        }
-
-        return new ValidatedSequenceNode(nodes);
-    }
-
-    public BodyPrototype Read(ISerializationManager serializationManager, MappingDataNode node,
-        IDependencyCollection dependencies,
-        SerializationHookContext hookCtx, ISerializationContext? context = null,
-        ISerializationManager.InstantiationDelegate<BodyPrototype>? instanceProvider = null)
-    {
-        var id = node.Get<ValueDataNode>("id").Value;
-        var name = node.Get<ValueDataNode>("name").Value;
-        var root = node.Get<ValueDataNode>("root").Value;
-        var slotNodes = node.Get<MappingDataNode>("slots");
-        var allConnections = new Dictionary<string, (string? Part, HashSet<string>? Connections, Dictionary<string, string>? Organs)>();
-
-        foreach (var (slotId, valueNode) in slotNodes)
-        {
-            var slot = (MappingDataNode) valueNode;
-
-            string? part = null;
-            if (slot.TryGet<ValueDataNode>("part", out var value))
-            {
-                part = value.Value;
-            }
-
-            HashSet<string>? connections = null;
-            if (slot.TryGet("connections", out SequenceDataNode? slotConnectionsNode))
-            {
-                connections = new HashSet<string>();
-
-                foreach (var connection in slotConnectionsNode.Cast<ValueDataNode>())
-                {
-                    connections.Add(connection.Value);
-                }
-            }
-
-            Dictionary<string, string>? organs = null;
-            if (slot.TryGet("organs", out MappingDataNode? slotOrgansNode))
-            {
-                organs = new Dictionary<string, string>();
-
-                foreach (var (organKey, organValueNode) in slotOrgansNode)
-                {
-                    organs.Add(organKey, ((ValueDataNode) organValueNode).Value);
-                }
-            }
-
-            allConnections.Add(slotId, (part, connections, organs));
-        }
-
-        foreach (var (slotId, (_, connections, _)) in allConnections)
-        {
-            if (connections == null)
-                continue;
-
-            foreach (var connection in connections)
-            {
-                var other = allConnections[connection];
-                other.Connections ??= new HashSet<string>();
-                other.Connections.Add(slotId);
-                allConnections[connection] = other;
-            }
-        }
-
-        var slots = new Dictionary<string, BodyPrototypeSlot>();
-
-        foreach (var (slotId, (part, connections, organs)) in allConnections)
-        {
-            var slot = new BodyPrototypeSlot(part, connections ?? new HashSet<string>(), organs ?? new Dictionary<string, string>());
-            slots.Add(slotId, slot);
-        }
-
-        return new BodyPrototype(id, name, root, slots);
-    }
-}
diff --git a/Content.Shared/Body/Prototypes/MetabolismGroupPrototype.cs b/Content.Shared/Body/Prototypes/MetabolismGroupPrototype.cs
deleted file mode 100644
index 82f4e70ce0c..00000000000
--- a/Content.Shared/Body/Prototypes/MetabolismGroupPrototype.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Body.Prototypes
-{
-    [Prototype("metabolismGroup")]
-    public sealed partial class MetabolismGroupPrototype : IPrototype
-    {
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        [DataField("name", required: true)]
-        private LocId Name { get; set; }
-
-        [ViewVariables(VVAccess.ReadOnly)]
-        public string LocalizedName => Loc.GetString(Name);
-    }
-}
diff --git a/Content.Shared/Body/Prototypes/MetabolizerTypePrototype.cs b/Content.Shared/Body/Prototypes/MetabolizerTypePrototype.cs
deleted file mode 100644
index 5273ac722b2..00000000000
--- a/Content.Shared/Body/Prototypes/MetabolizerTypePrototype.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Body.Prototypes
-{
-    [Prototype("metabolizerType")]
-    public sealed partial class MetabolizerTypePrototype : IPrototype
-    {
-        [IdDataField]
-        public string ID { get; private set; } = default!;
-
-        [DataField("name", required: true)]
-        private LocId Name { get; set; }
-
-        [ViewVariables(VVAccess.ReadOnly)]
-        public string LocalizedName => Loc.GetString(Name);
-    }
-}
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
deleted file mode 100644
index 94703966e84..00000000000
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ /dev/null
@@ -1,498 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Prototypes;
-using Content.Shared.Buckle.Components;
-using Content.Shared.DragDrop;
-using Content.Shared.Gibbing.Components;
-using Content.Shared.Gibbing.Events;
-using Content.Shared.Gibbing.Systems;
-using Content.Shared.Inventory;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Utility;
-
-// Shitmed Change
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared._Shitmed.Body.Part;
-using Content.Shared._Shitmed.Humanoid.Events;
-using Content.Shared.Silicons.Borgs.Components;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Humanoid;
-using Content.Shared.Inventory.Events;
-using Content.Shared.Standing;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Body.Systems;
-
-public partial class SharedBodySystem
-{
-    /*
-     * tl;dr of how bobby works
-     * - BodyComponent uses a BodyPrototype as a template.
-     * - On MapInit we spawn the root entity in the prototype and spawn all connections outwards from here
-     * - Each "connection" is a body part (e.g. arm, hand, etc.) and each part can also contain organs.
-     */
-
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly ItemSlotsSystem _slots = default!; // Shitmed Change
-    [Dependency] private readonly IGameTiming _gameTiming = default!; // Shitmed Change
-
-    private const float GibletLaunchImpulse = 8;
-    private const float GibletLaunchImpulseVariance = 3;
-
-    private void InitializeBody()
-    {
-        // Body here to handle root body parts.
-        SubscribeLocalEvent<BodyComponent, EntInsertedIntoContainerMessage>(OnBodyInserted);
-        SubscribeLocalEvent<BodyComponent, EntRemovedFromContainerMessage>(OnBodyRemoved);
-
-        SubscribeLocalEvent<BodyComponent, ComponentInit>(OnBodyInit);
-        SubscribeLocalEvent<BodyComponent, MapInitEvent>(OnBodyMapInit);
-        SubscribeLocalEvent<BodyComponent, CanDragEvent>(OnBodyCanDrag);
-        SubscribeLocalEvent<BodyComponent, StandAttemptEvent>(OnStandAttempt); // Shitmed Change
-        SubscribeLocalEvent<BodyComponent, UnbuckledEvent>(OnUnbuckled); // WD EDIT
-        SubscribeLocalEvent<BodyComponent, ProfileLoadFinishedEvent>(OnProfileLoadFinished); // Shitmed change
-        SubscribeLocalEvent<BodyComponent, IsEquippingAttemptEvent>(OnBeingEquippedAttempt); // Shitmed Change
-
-    }
-
-    private void OnBodyInserted(Entity<BodyComponent> ent, ref EntInsertedIntoContainerMessage args)
-    {
-        // Root body part?
-        var slotId = args.Container.ID;
-
-        if (slotId != BodyRootContainerId)
-            return;
-
-        var insertedUid = args.Entity;
-
-        if (TryComp(insertedUid, out BodyPartComponent? part))
-        {
-            AddPart((ent, ent), (insertedUid, part), slotId);
-            RecursiveBodyUpdate((insertedUid, part), ent);
-        }
-
-        if (TryComp(insertedUid, out OrganComponent? organ))
-        {
-            AddOrgan((insertedUid, organ), ent, ent);
-        }
-    }
-
-    private void OnBodyRemoved(Entity<BodyComponent> ent, ref EntRemovedFromContainerMessage args)
-    {
-        // Root body part?
-        var slotId = args.Container.ID;
-
-        if (slotId != BodyRootContainerId)
-            return;
-
-        var removedUid = args.Entity;
-        DebugTools.Assert(!TryComp(removedUid, out BodyPartComponent? b) || b.Body == ent);
-        DebugTools.Assert(!TryComp(removedUid, out OrganComponent? o) || o.Body == ent);
-
-        if (TryComp(removedUid, out BodyPartComponent? part))
-        {
-            RemovePart((ent, ent), (removedUid, part), slotId);
-            RecursiveBodyUpdate((removedUid, part), null);
-        }
-
-        if (TryComp(removedUid, out OrganComponent? organ))
-            RemoveOrgan((removedUid, organ), ent);
-    }
-
-    private void OnBodyInit(Entity<BodyComponent> ent, ref ComponentInit args)
-    {
-        // Setup the initial container.
-        ent.Comp.RootContainer = Containers.EnsureContainer<ContainerSlot>(ent, BodyRootContainerId);
-    }
-
-    private void OnBodyMapInit(Entity<BodyComponent> ent, ref MapInitEvent args)
-    {
-        if (ent.Comp.Prototype is null)
-            return;
-
-        // One-time setup
-        // Obviously can't run in Init to avoid double-spawns on save / load.
-        var prototype = Prototypes.Index(ent.Comp.Prototype.Value);
-        MapInitBody(ent, prototype);
-    }
-
-    private void MapInitBody(EntityUid bodyEntity, BodyPrototype prototype)
-    {
-        var protoRoot = prototype.Slots[prototype.Root];
-        if (protoRoot.Part is null)
-            return;
-
-        // This should already handle adding the entity to the root.
-        var rootPartUid = SpawnInContainerOrDrop(protoRoot.Part, bodyEntity, BodyRootContainerId);
-        var rootPart = Comp<BodyPartComponent>(rootPartUid);
-        rootPart.Body = bodyEntity;
-        Dirty(rootPartUid, rootPart);
-
-        // Setup the rest of the body entities.
-        SetupOrgans((rootPartUid, rootPart), protoRoot.Organs);
-        MapInitParts(rootPartUid, rootPart, prototype); // Shitmed Change
-    }
-
-    private void OnBodyCanDrag(Entity<BodyComponent> ent, ref CanDragEvent args)
-    {
-        args.Handled = true;
-    }
-
-    /// <summary>
-    /// Sets up all of the relevant body parts for a particular body entity and root part.
-    /// </summary>
-    private void MapInitParts(EntityUid rootPartId, BodyPartComponent rootPart, BodyPrototype prototype) // Shitmed Change
-    {
-        // Start at the root part and traverse the body graph, setting up parts as we go.
-        // Basic BFS pathfind.
-        var rootSlot = prototype.Root;
-        var frontier = new Queue<string>();
-        frontier.Enqueue(rootSlot);
-
-        // Child -> Parent connection.
-        var cameFrom = new Dictionary<string, string>();
-        cameFrom[rootSlot] = rootSlot;
-        // Maps slot to its relevant entity.
-        var cameFromEntities = new Dictionary<string, EntityUid>();
-        cameFromEntities[rootSlot] = rootPartId;
-
-        while (frontier.TryDequeue(out var currentSlotId))
-        {
-            var currentSlot = prototype.Slots[currentSlotId];
-
-            foreach (var connection in currentSlot.Connections)
-            {
-                // Already been handled
-                if (!cameFrom.TryAdd(connection, currentSlotId))
-                    continue;
-
-                // Setup part
-                var connectionSlot = prototype.Slots[connection];
-                var parentEntity = cameFromEntities[currentSlotId];
-                var parentPartComponent = Comp<BodyPartComponent>(parentEntity);
-
-                // Spawn the entity on the target
-                // then get the body part type, create the slot, and finally
-                // we can insert it into the container.
-                var childPart = Spawn(connectionSlot.Part, new EntityCoordinates(parentEntity, Vector2.Zero));
-                cameFromEntities[connection] = childPart;
-
-                var childPartComponent = Comp<BodyPartComponent>(childPart);
-                TryCreatePartSlot(parentEntity, connection, childPartComponent.PartType, out var partSlot, parentPartComponent);
-                // Shitmed Change Start
-                childPartComponent.ParentSlot = partSlot;
-                Dirty(childPart, childPartComponent);
-                // Shitmed Change End
-                var cont = Containers.GetContainer(parentEntity, GetPartSlotContainerId(connection));
-
-                if (partSlot is null || !Containers.Insert(childPart, cont))
-                {
-                    Log.Error($"Could not create slot for connection {connection} in body {prototype.ID}");
-                    QueueDel(childPart);
-                    continue;
-                }
-
-                // Add organs
-                SetupOrgans((childPart, childPartComponent), connectionSlot.Organs);
-
-                // Enqueue it so we can also get its neighbors.
-                frontier.Enqueue(connection);
-            }
-        }
-    }
-
-    private void SetupOrgans(Entity<BodyPartComponent> ent, Dictionary<string, string> organs)
-    {
-        foreach (var (organSlotId, organProto) in organs)
-        {
-            TryCreateOrganSlot(ent, organSlotId, out var slot); // Shitmed Change
-            SpawnInContainerOrDrop(organProto, ent, GetOrganContainerId(organSlotId));
-
-            if (slot is null)
-            {
-                Log.Error($"Could not create organ for slot {organSlotId} in {ToPrettyString(ent)}");
-            }
-        }
-    }
-
-    /// <summary>
-    /// Gets all body containers on this entity including the root one.
-    /// </summary>
-    public IEnumerable<BaseContainer> GetBodyContainers(
-        EntityUid id,
-        BodyComponent? body = null,
-        BodyPartComponent? rootPart = null)
-    {
-        if (!Resolve(id, ref body, logMissing: false)
-            || body.RootContainer.ContainedEntity is null
-            || !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
-        {
-            yield break;
-        }
-
-        yield return body.RootContainer;
-
-        foreach (var childContainer in GetPartContainers(body.RootContainer.ContainedEntity.Value, rootPart))
-        {
-            yield return childContainer;
-        }
-    }
-
-    /// <summary>
-    /// Gets all child body parts of this entity, including the root entity.
-    /// </summary>
-    public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyChildren(
-        EntityUid? id,
-        BodyComponent? body = null,
-        BodyPartComponent? rootPart = null)
-    {
-        if (id is null
-            || !Resolve(id.Value, ref body, logMissing: false)
-            || body.RootContainer.ContainedEntity is null
-            || body is null // Shitmed Change
-            || body.RootContainer == default // Shitmed Change
-            || !Resolve(body.RootContainer.ContainedEntity.Value, ref rootPart))
-        {
-            yield break;
-        }
-
-        foreach (var child in GetBodyPartChildren(body.RootContainer.ContainedEntity.Value, rootPart))
-        {
-            yield return child;
-        }
-    }
-
-    public IEnumerable<(EntityUid Id, OrganComponent Component)> GetBodyOrgans(
-        EntityUid? bodyId,
-        BodyComponent? body = null)
-    {
-        if (bodyId is null || !Resolve(bodyId.Value, ref body, logMissing: false))
-            yield break;
-
-        foreach (var part in GetBodyChildren(bodyId, body))
-        {
-            foreach (var organ in GetPartOrgans(part.Id, part.Component))
-            {
-                yield return organ;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Returns all body part slots for this entity.
-    /// </summary>
-    /// <param name="bodyId"></param>
-    /// <param name="body"></param>
-    /// <returns></returns>
-    public IEnumerable<BodyPartSlot> GetBodyAllSlots(
-        EntityUid bodyId,
-        BodyComponent? body = null)
-    {
-        if (!Resolve(bodyId, ref body, logMissing: false)
-            || body.RootContainer.ContainedEntity is null)
-        {
-            yield break;
-        }
-
-        foreach (var slot in GetAllBodyPartSlots(body.RootContainer.ContainedEntity.Value))
-        {
-            yield return slot;
-        }
-    }
-
-    public virtual HashSet<EntityUid> GibBody(
-        EntityUid bodyId,
-        bool gibOrgans = false,
-        BodyComponent? body = null,
-        bool launchGibs = true,
-        Vector2? splatDirection = null,
-        float splatModifier = 1,
-        Angle splatCone = default,
-        SoundSpecifier? gibSoundOverride = null,
-        // Shitmed Change
-        GibType gib = GibType.Gib,
-        GibContentsOption contents = GibContentsOption.Drop)
-    {
-        var gibs = new HashSet<EntityUid>();
-
-        if (!Resolve(bodyId, ref body, logMissing: false))
-            return gibs;
-
-        var root = GetRootPartOrNull(bodyId, body);
-        if (root != null && TryComp(root.Value.Entity, out GibbableComponent? gibbable))
-        {
-            gibSoundOverride ??= gibbable.GibSound;
-        }
-        var parts = GetBodyChildren(bodyId, body).ToArray();
-        gibs.EnsureCapacity(parts.Length);
-        foreach (var part in parts)
-        {
-
-            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, gib, contents, ref gibs, // Shitmed Change
-                playAudio: false, launchGibs: true, launchDirection: splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
-                launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
-
-            if (!gibOrgans)
-                continue;
-
-            foreach (var organ in GetPartOrgans(part.Id, part.Component))
-            {
-                _gibbingSystem.TryGibEntityWithRef(bodyId, organ.Id, GibType.Drop, GibContentsOption.Skip,
-                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
-                    launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
-            }
-        }
-
-        var bodyTransform = Transform(bodyId);
-        if (TryComp<InventoryComponent>(bodyId, out var inventory))
-        {
-            foreach (var item in _inventory.GetHandOrInventoryEntities(bodyId))
-            {
-                SharedTransform.DropNextTo(item, (bodyId, bodyTransform));
-                gibs.Add(item);
-            }
-        }
-        _audioSystem.PlayPredicted(gibSoundOverride, bodyTransform.Coordinates, null);
-        return gibs;
-    }
-
-    // Shitmed Change Start
-
-    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) || !part.CanSever)
-                return gibs;
-
-            DropSlotContents((partId, part));
-            RemovePartChildren((partId, part), bodyEnt);
-            foreach (var organ in GetPartOrgans(partId, part))
-            {
-                _gibbingSystem.TryGibEntityWithRef(bodyEnt, organ.Id, GibType.Drop, GibContentsOption.Skip,
-                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
-                    launchImpulseVariance: GibletLaunchImpulseVariance, launchCone: splatCone);
-            }
-            var ev = new BodyPartDroppedEvent((partId, part));
-            RaiseLocalEvent(bodyEnt, ref ev);
-        }
-
-        _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;
-    }
-
-    public virtual bool BurnPart(EntityUid partId,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            return false;
-
-        if (part.Body is { } bodyEnt)
-        {
-            if (IsPartRoot(bodyEnt, partId, part: part))
-                return false;
-
-            var gibs = new HashSet<EntityUid>();
-            // Todo: Kill this in favor of husking.
-            // WWDP edit start
-            RemovePartChildren((partId, part), bodyEnt, dropChildren: false);
-            // WWDP edit end
-            _gibbingSystem.TryGibEntityWithRef(partId, partId, GibType.Gib, GibContentsOption.Gib, ref gibs,
-                playAudio: false, launchGibs: true, launchImpulse: GibletLaunchImpulse, launchImpulseVariance: GibletLaunchImpulseVariance);
-
-            if (HasComp<InventoryComponent>(partId))
-                foreach (var item in _inventory.GetHandOrInventoryEntities(partId))
-                    SharedTransform.AttachToGridOrMap(item);
-
-            QueueDel(partId);
-            return true;
-        }
-
-        return false;
-    }
-
-    private void OnProfileLoadFinished(EntityUid uid, BodyComponent component, ProfileLoadFinishedEvent args)
-    {
-        if (!HasComp<HumanoidAppearanceComponent>(uid)
-            || TerminatingOrDeleted(uid)
-            || !Initialized(uid)) // We do this last one for urists on test envs.
-            return;
-
-        foreach (var part in GetBodyChildren(uid, component))
-            EnsureComp<BodyPartAppearanceComponent>(part.Id);
-    }
-
-    private void OnStandAttempt(Entity<BodyComponent> ent, ref StandAttemptEvent args)
-    {
-        if (ent.Comp.LegEntities.Count < ent.Comp.RequiredLegs)
-            args.Cancel();
-    }
-
-    // WD EDIT START
-    private void OnUnbuckled(Entity<BodyComponent> ent, ref UnbuckledEvent args)
-    {
-        if (ent.Comp.LegEntities.Count == 0)
-            _standing.Down(ent.Owner, dropHeldItems:true);
-    }
-    // WD EDIT END
-
-    private void OnBeingEquippedAttempt(Entity<BodyComponent> ent, ref IsEquippingAttemptEvent args)
-    {
-        if (!TryComp(args.EquipTarget, out BodyComponent? targetBody)
-            || targetBody.Prototype == null
-            || HasComp<BorgChassisComponent>(args.EquipTarget))
-            return;
-
-        if (TryGetPartFromSlotContainer(args.Slot, out var bodyPart)
-            && bodyPart is not null)
-        {
-            var bodyPartString = bodyPart.Value.ToString().ToLower();
-            var prototype = Prototypes.Index(targetBody.Prototype.Value);
-            var hasPartConnection = prototype.Slots.Values.Any(slot =>
-                slot.Connections.Contains(bodyPartString));
-
-            if (hasPartConnection
-                && !GetBodyChildrenOfType(args.EquipTarget, bodyPart.Value).Any())
-            {
-                _popup.PopupClient(Loc.GetString("equip-part-missing-error",
-                    ("target", args.EquipTarget), ("part", bodyPartString)), args.Equipee, args.Equipee);
-                args.Cancel();
-            }
-        }
-    }
-
-    // Shitmed Change End
-}
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
deleted file mode 100644
index d2ce9ada8b6..00000000000
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Events;
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Part;
-using Robust.Shared.Containers;
-
-// Shitmed Change
-
-using Content.Shared.Damage;
-using Content.Shared._Shitmed.BodyEffects;
-using Content.Shared._Shitmed.Body.Organ;
-using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Network;
-
-namespace Content.Shared.Body.Systems;
-
-public partial class SharedBodySystem
-{
-    // Shitmed Change Start
-    [Dependency] private readonly IComponentFactory _componentFactory = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
-    [Dependency] private readonly INetManager _netManager = default!;
-
-    private void InitializeOrgans()
-    {
-        SubscribeLocalEvent<OrganComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<OrganComponent, OrganEnableChangedEvent>(OnOrganEnableChanged);
-    }
-
-    private void OnMapInit(Entity<OrganComponent> ent, ref MapInitEvent args)
-    {
-        if (ent.Comp.OnAdd is not null || ent.Comp.OnRemove is not null)
-            EnsureComp<OrganEffectComponent>(ent);
-    }
-
-    // Shitmed Change End
-
-    private void AddOrgan(
-        Entity<OrganComponent> organEnt,
-        EntityUid bodyUid,
-        EntityUid parentPartUid)
-    {
-        organEnt.Comp.Body = bodyUid;
-        var addedEv = new OrganAddedEvent(parentPartUid);
-        RaiseLocalEvent(organEnt, ref addedEv);
-
-        if (organEnt.Comp.Body is not null)
-        {
-            // Shitmed Change Start
-            var addedInBodyEv = new OrganAddedToBodyEvent(bodyUid, parentPartUid);
-            RaiseLocalEvent(organEnt, ref addedInBodyEv);
-            var organEnabledEv = new OrganEnableChangedEvent(true);
-            RaiseLocalEvent(organEnt, ref organEnabledEv);
-            AddFunctions(bodyUid, organEnt.Comp);
-        }
-        // Shitmed Change End
-
-        Dirty(organEnt, organEnt.Comp);
-    }
-
-    private void AddFunctions(EntityUid body, OrganComponent organ)
-    {
-        // TraitFunctions don't currently exist on the client.
-        if (!_netManager.IsServer)
-            return;
-
-        foreach (var function in organ.OnImplantFunctions)
-            function.OnPlayerSpawn(body, _componentFactory, EntityManager, _serializationManager);
-    }
-
-    private void RemoveOrgan(Entity<OrganComponent> organEnt, EntityUid parentPartUid)
-    {
-        var removedEv = new OrganRemovedEvent(parentPartUid);
-        RaiseLocalEvent(organEnt, ref removedEv);
-
-        if (organEnt.Comp.Body is { Valid: true } bodyUid)
-        {
-            // Shitmed Change Start
-            organEnt.Comp.OriginalBody = organEnt.Comp.Body;
-            var organDisabledEv = new OrganEnableChangedEvent(false);
-            RaiseLocalEvent(organEnt, ref organDisabledEv);
-            // Shitmed Change End
-            var removedInBodyEv = new OrganRemovedFromBodyEvent(bodyUid, parentPartUid);
-            RaiseLocalEvent(organEnt, ref removedInBodyEv);
-            RemoveFunctions(bodyUid, organEnt.Comp);
-        }
-
-        if (parentPartUid is { Valid: true }
-            && TryComp(parentPartUid, out DamageableComponent? damageable)
-            && damageable.TotalDamage > 200)
-            TrySetOrganUsed(organEnt, true, organEnt.Comp);
-
-        organEnt.Comp.Body = null;
-        Dirty(organEnt, organEnt.Comp);
-    }
-
-    private void RemoveFunctions(EntityUid body, OrganComponent organ)
-    {
-        // TraitFunctions don't currently exist on the client.
-        if (!_netManager.IsServer)
-            return;
-
-        foreach (var function in organ.OnRemoveFunctions)
-            function.OnPlayerSpawn(body, _componentFactory, EntityManager, _serializationManager);
-    }
-
-    /// <summary>
-    /// Creates the specified organ slot on the parent entity.
-    /// </summary>
-    private OrganSlot? CreateOrganSlot(Entity<BodyPartComponent?> parentEnt, string slotId)
-    {
-        if (!Resolve(parentEnt, ref parentEnt.Comp, logMissing: false))
-            return null;
-
-        Containers.EnsureContainer<ContainerSlot>(parentEnt, GetOrganContainerId(slotId));
-        var slot = new OrganSlot(slotId);
-        parentEnt.Comp.Organs.Add(slotId, slot);
-        return slot;
-    }
-
-    /// <summary>
-    /// Attempts to create the specified organ slot on the specified parent if it exists.
-    /// </summary>
-    public bool TryCreateOrganSlot(
-        EntityUid? parent,
-        string slotId,
-        [NotNullWhen(true)] out OrganSlot? slot,
-        BodyPartComponent? part = null)
-    {
-        slot = null;
-
-        if (parent is null || !Resolve(parent.Value, ref part, logMissing: false))
-        {
-            return false;
-        }
-
-        Containers.EnsureContainer<ContainerSlot>(parent.Value, GetOrganContainerId(slotId));
-        slot = new OrganSlot(slotId);
-
-        // Shitmed Change Start
-        if (!part.Organs.ContainsKey(slotId)
-            && !part.Organs.TryAdd(slotId, slot.Value))
-            return false;
-        Dirty(parent.Value, part); // WD EDIT
-
-        return true;
-        // Shitmed Change End
-    }
-
-    /// <summary>
-    /// Returns whether the slotId exists on the partId.
-    /// </summary>
-    public bool CanInsertOrgan(
-        EntityUid partId,
-        string slotId,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(partId, ref part) && part.Organs.ContainsKey(slotId);
-    }
-
-    /// <summary>
-    /// Returns whether the specified organ slot exists on the partId.
-    /// </summary>
-    public bool CanInsertOrgan(
-        EntityUid partId,
-        OrganSlot slot,
-        BodyPartComponent? part = null)
-    {
-        return CanInsertOrgan(partId, slot.Id, part);
-    }
-
-    public bool InsertOrgan(
-        EntityUid partId,
-        EntityUid organId,
-        string slotId,
-        BodyPartComponent? part = null,
-        OrganComponent? organ = null)
-    {
-        if (!Resolve(organId, ref organ, logMissing: false)
-            || !Resolve(partId, ref part, logMissing: false)
-            || !CanInsertOrgan(partId, slotId, part))
-        {
-            return false;
-        }
-
-        var containerId = GetOrganContainerId(slotId);
-
-        return Containers.TryGetContainer(partId, containerId, out var container)
-            && Containers.Insert(organId, container);
-    }
-
-    /// <summary>
-    /// Removes the organ if it is inside of a body part.
-    /// </summary>
-    public bool RemoveOrgan(EntityUid organId, OrganComponent? organ = null)
-    {
-        if (!Containers.TryGetContainingContainer((organId, null, null), out var container))
-            return false;
-
-        var parent = container.Owner;
-
-        return HasComp<BodyPartComponent>(parent)
-            && Containers.Remove(organId, container);
-    }
-
-    /// <summary>
-    /// Tries to add this organ to any matching slot on this body part.
-    /// </summary>
-    public bool AddOrganToFirstValidSlot(
-        EntityUid partId,
-        EntityUid organId,
-        BodyPartComponent? part = null,
-        OrganComponent? organ = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false)
-            || !Resolve(organId, ref organ, logMissing: false))
-        {
-            return false;
-        }
-
-        foreach (var slotId in part.Organs.Keys)
-        {
-            InsertOrgan(partId, organId, slotId, part, organ);
-            return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// Returns a list of Entity<<see cref="T"/>, <see cref="OrganComponent"/>>
-    /// for each organ of the body
-    /// </summary>
-    /// <typeparam name="T">The component that we want to return</typeparam>
-    /// <param name="entity">The body to check the organs of</param>
-    public List<Entity<T, OrganComponent>> GetBodyOrganEntityComps<T>(
-        Entity<BodyComponent?> entity)
-        where T : IComponent
-    {
-        if (!Resolve(entity, ref entity.Comp))
-            return new List<Entity<T, OrganComponent>>();
-
-        var query = GetEntityQuery<T>();
-        var list = new List<Entity<T, OrganComponent>>(3);
-        foreach (var organ in GetBodyOrgans(entity.Owner, entity.Comp))
-        {
-            if (query.TryGetComponent(organ.Id, out var comp))
-                list.Add((organ.Id, comp, organ.Component));
-        }
-
-        return list;
-    }
-
-    /// <summary>
-    ///     Tries to get a list of ValueTuples of <see cref="T"/> and OrganComponent on each organs
-    ///     in the given body.
-    /// </summary>
-    /// <param name="uid">The body entity id to check on.</param>
-    /// <param name="comps">The list of components.</param>
-    /// <param name="body">The body to check for organs on.</param>
-    /// <typeparam name="T">The component to check for.</typeparam>
-    /// <returns>Whether any were found.</returns>
-    public bool TryGetBodyOrganEntityComps<T>(
-        Entity<BodyComponent?> entity,
-        [NotNullWhen(true)] out List<Entity<T, OrganComponent>>? comps)
-        where T : IComponent
-    {
-        if (!Resolve(entity.Owner, ref entity.Comp))
-        {
-            comps = null;
-            return false;
-        }
-
-        comps = GetBodyOrganEntityComps<T>(entity);
-
-        if (comps.Count != 0)
-            return true;
-
-        comps = null;
-        return false;
-    }
-
-    // Shitmed Change Start
-
-    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;
-    }
-
-    private void OnOrganEnableChanged(Entity<OrganComponent> organEnt, ref OrganEnableChangedEvent args)
-    {
-        if (!organEnt.Comp.CanEnable && args.Enabled)
-            return;
-
-        organEnt.Comp.Enabled = args.Enabled;
-
-        if (args.Enabled)
-            EnableOrgan(organEnt);
-        else
-            DisableOrgan(organEnt);
-
-        if (organEnt.Comp.Body is { Valid: true } bodyEnt)
-            RaiseLocalEvent(organEnt, new OrganComponentsModifyEvent(bodyEnt, args.Enabled));
-
-        Dirty(organEnt, organEnt.Comp);
-    }
-
-    private void EnableOrgan(Entity<OrganComponent> organEnt)
-    {
-        if (!TryComp(organEnt.Comp.Body, out BodyComponent? body))
-            return;
-
-        // I hate having to hardcode these checks so much.
-        if (HasComp<EyesComponent>(organEnt))
-        {
-            var ev = new OrganEnabledEvent(organEnt);
-            RaiseLocalEvent(organEnt, ref ev);
-        }
-    }
-
-    private void DisableOrgan(Entity<OrganComponent> organEnt)
-    {
-        if (!TryComp(organEnt.Comp.Body, out BodyComponent? body))
-            return;
-
-        // I hate having to hardcode these checks so much.
-        if (HasComp<EyesComponent>(organEnt))
-        {
-            var ev = new OrganDisabledEvent(organEnt);
-            RaiseLocalEvent(organEnt, ref ev);
-        }
-    }
-
-    // Shitmed Change End
-}
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
deleted file mode 100644
index 847404ac4fe..00000000000
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ /dev/null
@@ -1,1159 +0,0 @@
-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.Buckle;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.Movement.Components;
-using Content.Shared.Standing;
-using Robust.Shared.Containers;
-using Robust.Shared.Utility;
-
-// Shitmed Change Start
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared._Shitmed.Body.Part;
-using Content.Shared._Shitmed.BodyEffects;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Humanoid;
-using Content.Shared.Inventory;
-using Content.Shared.Random;
-using Content.Shared.Traits.Assorted.Components;
-
-
-namespace Content.Shared.Body.Systems;
-
-public partial class SharedBodySystem
-{
-    [Dependency] private readonly RandomHelperSystem _randomHelper = default!; // Shitmed Change
-    [Dependency] private readonly InventorySystem _inventorySystem = default!; // Shitmed Change
-    [Dependency] private readonly SharedBuckleSystem _buckle = default!; //WD EDIT
-
-    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, EntInsertedIntoContainerMessage>(OnBodyPartInserted);
-        SubscribeLocalEvent<BodyPartComponent, EntRemovedFromContainerMessage>(OnBodyPartRemoved);
-
-        // Shitmed Change Start
-        SubscribeLocalEvent<BodyPartComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<BodyPartComponent, ComponentRemove>(OnBodyPartRemove);
-        SubscribeLocalEvent<BodyPartComponent, AmputateAttemptEvent>(OnAmputateAttempt);
-        SubscribeLocalEvent<BodyPartComponent, BodyPartEnableChangedEvent>(OnPartEnableChanged);
-    }
-
-    private void OnMapInit(Entity<BodyPartComponent> ent, ref MapInitEvent args)
-    {
-        if (ent.Comp.PartType == BodyPartType.Torso)
-        {
-            // For whatever reason this slot is initialized properly on the server, but not on the client.
-            // This seems to be an issue due to wiz-merge, on my old branch it was properly instantiating
-            // ItemInsertionSlot's container on both ends. It does show up properly on ItemSlotsComponent though.
-            _slots.AddItemSlot(ent, ent.Comp.ContainerName, ent.Comp.ItemInsertionSlot);
-
-            _slots.SetLock(ent.Owner, ent.Comp.ItemInsertionSlot, true); // WWDP prevent inserting items into torsos without surgery
-
-            Dirty(ent, ent.Comp);
-        }
-
-        if (ent.Comp.OnAdd is not null || ent.Comp.OnRemove is not null)
-            EnsureComp<BodyPartEffectComponent>(ent);
-
-        foreach (var connection in ent.Comp.Children.Keys)
-        {
-            Containers.EnsureContainer<ContainerSlot>(ent, GetPartSlotContainerId(connection));
-        }
-    }
-
-    private void OnBodyPartRemove(Entity<BodyPartComponent> ent, ref ComponentRemove args)
-    {
-        if (ent.Comp.PartType == BodyPartType.Torso)
-            _slots.RemoveItemSlot(ent, ent.Comp.ItemInsertionSlot);
-    }
-
-    private void OnPartEnableChanged(Entity<BodyPartComponent> partEnt, ref BodyPartEnableChangedEvent args)
-    {
-        if (!partEnt.Comp.CanEnable && args.Enabled)
-            return;
-
-        partEnt.Comp.Enabled = args.Enabled;
-
-        if (args.Enabled)
-        {
-            EnablePart(partEnt);
-            if (partEnt.Comp.Body is { Valid: true } bodyEnt)
-                RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(bodyEnt, true));
-        }
-        else
-        {
-            DisablePart(partEnt);
-            if (partEnt.Comp.Body is { Valid: true } bodyEnt)
-                RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(bodyEnt, false));
-        }
-
-        Dirty(partEnt, partEnt.Comp);
-    }
-
-    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);
-        }
-    }
-
-    /// <summary>
-    ///     Shitmed Change: This function handles dropping the items in an entity's slots if they lose all of a given part.
-    ///     Such as their hands, feet, head, etc.
-    /// </summary>
-    public void DropSlotContents(Entity<BodyPartComponent> partEnt)
-    {
-        if (partEnt.Comp.Body is not null
-            && TryComp<InventoryComponent>(partEnt.Comp.Body, out var inventory) // Prevent error for non-humanoids
-            && GetBodyPartCount(partEnt.Comp.Body.Value, partEnt.Comp.PartType) == 1
-            && TryGetPartSlotContainerName(partEnt.Comp.PartType, out var containerNames))
-        {
-            foreach (var containerName in containerNames)
-                _inventorySystem.DropSlotContents(partEnt.Comp.Body.Value, containerName, inventory);
-        }
-
-    }
-
-    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);
-        }
-    }
-
-    // TODO: Refactor this crap. I hate it so much.
-    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, bool dropChildren = true) // WWDP edit
-    {
-        if (!Resolve(bodyEnt, ref body, logMissing: false))
-            return;
-
-        if (partEnt.Comp.Children.Any())
-        {
-            foreach (var slotId in partEnt.Comp.Children.Keys)
-            {
-                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);
-                    // WWDP edit start
-                    if (dropChildren)
-                        DropPart((childEntity, childPart));
-                    else
-                        QueueDel(childEntity);
-                    // WWDP edit end
-                }
-            }
-
-            Dirty(bodyEnt, body);
-        }
-    }
-
-    protected virtual void DropPart(Entity<BodyPartComponent> partEnt)
-    {
-        DropSlotContents(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);
-            var droppedEvent = new BodyPartDroppedEvent(partEnt);
-            RaiseLocalEvent(body, ref droppedEvent);
-            SharedTransform.AttachToGridOrMap(partEnt, transform);
-            _randomHelper.RandomOffset(partEnt, 0.5f);
-        }
-
-    }
-
-    private void OnAmputateAttempt(Entity<BodyPartComponent> partEnt, ref AmputateAttemptEvent args) =>
-        DropPart(partEnt);
-
-    // Shitmed Change End
-    private void OnBodyPartInserted(Entity<BodyPartComponent> ent, ref EntInsertedIntoContainerMessage args)
-    {
-        // Body part inserted into another body part.
-        var insertedUid = args.Entity;
-        var slotId = args.Container.ID;
-
-        if (ent.Comp.Body is null)
-            return;
-
-        if (TryComp(insertedUid, out BodyPartComponent? part) && slotId.Contains(PartSlotContainerIdPrefix + GetSlotFromBodyPart(part))) // Shitmed Change
-        {
-            AddPart(ent.Comp.Body.Value, (insertedUid, part), slotId);
-            RecursiveBodyUpdate((insertedUid, part), ent.Comp.Body.Value);
-            CheckBodyPart((insertedUid, part), GetTargetBodyPart(part), false); // Shitmed Change
-        }
-
-        if (TryComp(insertedUid, out OrganComponent? organ) && slotId.Contains(OrganSlotContainerIdPrefix + organ.SlotId)) // Shitmed Change
-        {
-            AddOrgan((insertedUid, organ), ent.Comp.Body.Value, ent);
-        }
-    }
-
-    private void OnBodyPartRemoved(Entity<BodyPartComponent> ent, ref EntRemovedFromContainerMessage args)
-    {
-        // Body part removed from another body part.
-        var removedUid = args.Entity;
-        var slotId = args.Container.ID;
-
-        // Shitmed Change Start
-        if (TryComp(removedUid, out BodyPartComponent? part))
-        {
-            if (!slotId.Contains(PartSlotContainerIdPrefix + GetSlotFromBodyPart(part)))
-                return;
-
-            DebugTools.Assert(part.Body == ent.Comp.Body);
-
-            if (part.Body is not null)
-            {
-                CheckBodyPart((removedUid, part), GetTargetBodyPart(part), true);
-                RemovePart(part.Body.Value, (removedUid, part), slotId);
-                RecursiveBodyUpdate((removedUid, part), null);
-            }
-        }
-
-        if (TryComp(removedUid, out OrganComponent? organ))
-        {
-            if (!slotId.Contains(OrganSlotContainerIdPrefix + organ.SlotId))
-                return;
-
-            DebugTools.Assert(organ.Body == ent.Comp.Body);
-
-            RemoveOrgan((removedUid, organ), ent);
-        }
-        // Shitmed Change End
-    }
-
-    private void RecursiveBodyUpdate(Entity<BodyPartComponent> ent, EntityUid? bodyUid)
-    {
-        ent.Comp.Body = bodyUid;
-        Dirty(ent, ent.Comp);
-
-        foreach (var slotId in ent.Comp.Organs.Keys)
-        {
-            if (!Containers.TryGetContainer(ent, GetOrganContainerId(slotId), out var container))
-                continue;
-
-            foreach (var organ in container.ContainedEntities)
-            {
-                if (!TryComp(organ, out OrganComponent? organComp))
-                    continue;
-
-                Dirty(organ, organComp);
-
-                if (organComp.Body is { Valid: true } oldBodyUid)
-                {
-                    var removedEv = new OrganRemovedFromBodyEvent(oldBodyUid, ent);
-                    RaiseLocalEvent(organ, ref removedEv);
-                }
-
-                organComp.Body = bodyUid;
-                if (bodyUid is not null)
-                {
-                    var addedEv = new OrganAddedToBodyEvent(bodyUid.Value, ent);
-                    RaiseLocalEvent(organ, ref addedEv);
-                }
-            }
-        }
-
-        // 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))
-                continue;
-
-            foreach (var containedUid in container.ContainedEntities)
-            {
-                if (TryComp(containedUid, out BodyPartComponent? childPart))
-                    RecursiveBodyUpdate((containedUid, childPart), bodyUid);
-            }
-        }
-    }
-
-    protected virtual void AddPart(
-        Entity<BodyComponent?> bodyEnt,
-        Entity<BodyPartComponent> partEnt,
-        string slotId)
-    {
-        Dirty(partEnt, partEnt.Comp);
-        partEnt.Comp.Body = bodyEnt;
-
-        if (partEnt.Comp.Enabled && partEnt.Comp.Body is { Valid: true } body) // Shitmed Change
-            RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(body, true));
-
-        var ev = new BodyPartAddedEvent(slotId, partEnt);
-        RaiseLocalEvent(bodyEnt, ref ev);
-
-        AddLeg(partEnt, bodyEnt);
-    }
-
-    protected virtual void RemovePart(
-        Entity<BodyComponent?> bodyEnt,
-        Entity<BodyPartComponent> partEnt,
-        string slotId)
-    {
-        Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false);
-        Dirty(partEnt, partEnt.Comp);
-
-        // Shitmed Change Start
-        if (partEnt.Comp.Body is { Valid: true } body)
-            RaiseLocalEvent(partEnt, new BodyPartComponentsModifyEvent(body, false));
-        partEnt.Comp.ParentSlot = null;
-        // Shitmed Change End
-
-        var ev = new BodyPartRemovedEvent(slotId, partEnt);
-        RaiseLocalEvent(bodyEnt, ref ev);
-
-        RemoveLeg(partEnt, bodyEnt);
-        RemovePartEffect(partEnt, bodyEnt); // Shitmed Change
-        PartRemoveDamage(bodyEnt, partEnt);
-    }
-
-    private void AddLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?> bodyEnt)
-    {
-        if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
-            return;
-
-        if (legEnt.Comp.PartType == BodyPartType.Leg)
-        {
-            bodyEnt.Comp.LegEntities.Add(legEnt);
-            UpdateMovementSpeed(bodyEnt);
-            Dirty(bodyEnt, bodyEnt.Comp);
-        }
-    }
-
-    private void RemoveLeg(Entity<BodyPartComponent> legEnt, Entity<BodyComponent?> bodyEnt)
-    {
-        if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
-            return;
-
-        if (legEnt.Comp.PartType == BodyPartType.Leg)
-        {
-            bodyEnt.Comp.LegEntities.Remove(legEnt);
-            UpdateMovementSpeed(bodyEnt);
-            Dirty(bodyEnt, bodyEnt.Comp);
-            if (!_buckle.IsBuckled(bodyEnt)) // WD EDIT
-                Standing.Down(bodyEnt);
-            RaiseLocalEvent(bodyEnt, new DropHandItemsEvent(), false); // WD EDIT
-        }
-    }
-
-    private void PartRemoveDamage(Entity<BodyComponent?> bodyEnt, Entity<BodyPartComponent> partEnt)
-    {
-        if (!Resolve(bodyEnt, ref bodyEnt.Comp, logMissing: false))
-            return;
-
-        if (!_timing.ApplyingState
-            && partEnt.Comp.IsVital
-            && !GetBodyChildrenOfType(bodyEnt, partEnt.Comp.PartType, bodyEnt.Comp).Any()
-        )
-        {
-            var damage = new DamageSpecifier(Prototypes.Index<DamageTypePrototype>("Bloodloss"), partEnt.Comp.VitalDamage); // Shitmed Change
-            Damageable.TryChangeDamage(bodyEnt, damage, partMultiplier: 0f); // Shitmed Change
-        }
-    }
-
-    /// <summary>
-    /// Tries to get the parent body part to this if applicable.
-    /// Doesn't validate if it's a part of body system.
-    /// </summary>
-    public EntityUid? GetParentPartOrNull(EntityUid uid)
-    {
-        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
-            return null;
-
-        var parent = container.Owner;
-
-        if (!HasComp<BodyPartComponent>(parent))
-            return null;
-
-        return parent;
-    }
-
-    /// <summary>
-    /// Tries to get the parent body part and slot to this if applicable.
-    /// </summary>
-    public (EntityUid Parent, string Slot)? GetParentPartAndSlotOrNull(EntityUid uid)
-    {
-        if (!Containers.TryGetContainingContainer((uid, null, null), out var container))
-            return null;
-
-        var slotId = GetPartSlotContainerIdFromContainer(container.ID);
-
-        if (string.IsNullOrEmpty(slotId))
-            return null;
-
-        var parent = container.Owner;
-
-        if (!TryComp<BodyPartComponent>(parent, out var parentBody)
-            || !parentBody.Children.ContainsKey(slotId))
-            return null;
-
-        return (parent, slotId);
-    }
-
-    /// <summary>
-    /// Tries to get the relevant parent body part to this if it exists.
-    /// It won't exist if this is the root body part or if it's not in a body.
-    /// </summary>
-    public bool TryGetParentBodyPart(
-        EntityUid partUid,
-        [NotNullWhen(true)] out EntityUid? parentUid,
-        [NotNullWhen(true)] out BodyPartComponent? parentComponent)
-    {
-        DebugTools.Assert(HasComp<BodyPartComponent>(partUid));
-        parentUid = null;
-        parentComponent = null;
-
-        if (Containers.TryGetContainingContainer((partUid, null, null), out var container) &&
-            TryComp(container.Owner, out parentComponent))
-        {
-            parentUid = container.Owner;
-            return true;
-        }
-
-        return false;
-    }
-
-    #region Slots
-
-    /// <summary>
-    /// Creates a BodyPartSlot on the specified partUid.
-    /// </summary>
-    private BodyPartSlot? CreatePartSlot(
-        EntityUid partUid,
-        string slotId,
-        BodyPartType partType,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(partUid, ref part, logMissing: false))
-            return null;
-
-        Containers.EnsureContainer<ContainerSlot>(partUid, GetPartSlotContainerId(slotId));
-        var partSlot = new BodyPartSlot(slotId, partType);
-        part.Children.Add(slotId, partSlot);
-        Dirty(partUid, part);
-        return partSlot;
-    }
-
-    /// <summary>
-    /// Tries to create a BodyPartSlot on the specified partUid.
-    /// </summary>
-    /// <returns>false if not relevant or can't add it.</returns>
-    public bool TryCreatePartSlot(
-        EntityUid? partId,
-        string slotId,
-        BodyPartType partType,
-        [NotNullWhen(true)] out BodyPartSlot? slot,
-        BodyPartComponent? part = null)
-    {
-        slot = null;
-
-        if (partId is null
-            || !Resolve(partId.Value, ref part, logMissing: false))
-        {
-            return false;
-        }
-
-        Containers.EnsureContainer<ContainerSlot>(partId.Value, GetPartSlotContainerId(slotId));
-        slot = new BodyPartSlot(slotId, partType);
-
-        if (!part.Children.ContainsKey(slotId) // Shitmed Change
-            && !part.Children.TryAdd(slotId, slot.Value))
-            return false;
-
-        Dirty(partId.Value, part);
-        return true;
-    }
-
-    public bool TryCreatePartSlotAndAttach(
-        EntityUid parentId,
-        string slotId,
-        EntityUid childId,
-        BodyPartType partType,
-        BodyPartComponent? parent = null,
-        BodyPartComponent? child = null)
-    {
-        return TryCreatePartSlot(parentId, slotId, partType, out _, parent)
-               && AttachPart(parentId, slotId, childId, parent, child);
-    }
-
-    #endregion
-
-    #region RootPartManagement
-
-    /// <summary>
-    /// Returns true if the partId is the root body container for the specified bodyId.
-    /// </summary>
-    public bool IsPartRoot(
-        EntityUid bodyId,
-        EntityUid partId,
-        BodyComponent? body = null,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(partId, ref part)
-            && Resolve(bodyId, ref body)
-            && Containers.TryGetContainingContainer(bodyId, partId, out var container)
-            && container.ID == BodyRootContainerId;
-    }
-
-    /// <summary>
-    /// Returns true if we can attach the partId to the bodyId as the root entity.
-    /// </summary>
-    public bool CanAttachToRoot(
-        EntityUid bodyId,
-        EntityUid partId,
-        BodyComponent? body = null,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(bodyId, ref body)
-            && Resolve(partId, ref part)
-            && body.RootContainer.ContainedEntity is null
-            && bodyId != part.Body;
-    }
-
-    /// <summary>
-    /// Returns the root part of this body if it exists.
-    /// </summary>
-    public (EntityUid Entity, BodyPartComponent BodyPart)? GetRootPartOrNull(EntityUid bodyId, BodyComponent? body = null)
-    {
-        if (!Resolve(bodyId, ref body)
-            || body.RootContainer.ContainedEntity is null)
-        {
-            return null;
-        }
-
-        return (body.RootContainer.ContainedEntity.Value,
-            Comp<BodyPartComponent>(body.RootContainer.ContainedEntity.Value));
-    }
-
-    /// <summary>
-    /// Returns true if the partId can be attached to the parentId in the specified slot.
-    /// </summary>
-    public bool CanAttachPart(
-        EntityUid parentId,
-        BodyPartSlot slot,
-        EntityUid partId,
-        BodyPartComponent? parentPart = null,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(partId, ref part, logMissing: false)
-            && Resolve(parentId, ref parentPart, logMissing: false)
-            && CanAttachPart(parentId, slot.Id, partId, parentPart, part);
-    }
-
-    /// <summary>
-    /// Returns true if we can attach the specified partId to the parentId in the specified slot.
-    /// </summary>
-    public bool CanAttachPart(
-        EntityUid parentId,
-        string slotId,
-        EntityUid partId,
-        BodyPartComponent? parentPart = null,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(partId, ref part, logMissing: false)
-            && Resolve(parentId, ref parentPart, logMissing: false)
-            && parentPart.Children.TryGetValue(slotId, out var parentSlotData)
-            && part.PartType == parentSlotData.Type
-            && Containers.TryGetContainer(parentId, GetPartSlotContainerId(slotId), out var container)
-            && Containers.CanInsert(partId, container);
-    }
-
-    /// <summary>
-    /// Shitmed Change: 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);
-    }
-
-    public bool AttachPartToRoot(
-        EntityUid bodyId,
-        EntityUid partId,
-        BodyComponent? body = null,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(bodyId, ref body)
-            && Resolve(partId, ref part)
-            && CanAttachToRoot(bodyId, partId, body, part)
-            && Containers.Insert(partId, body.RootContainer);
-    }
-
-    #endregion
-
-    #region Attach/Detach
-
-    /// <summary>
-    /// Attaches a body part to the specified body part parent.
-    /// </summary>
-    public bool AttachPart(
-        EntityUid parentPartId,
-        string slotId,
-        EntityUid partId,
-        BodyPartComponent? parentPart = null,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(parentPartId, ref parentPart, logMissing: false)
-            && parentPart.Children.TryGetValue(slotId, out var slot)
-            && AttachPart(parentPartId, slot, partId, parentPart, part);
-    }
-
-    /// <summary>
-    /// Attaches a body part to the specified body part parent.
-    /// </summary>
-    public bool AttachPart(
-        EntityUid parentPartId,
-        BodyPartSlot slot,
-        EntityUid partId,
-        BodyPartComponent? parentPart = null,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(parentPartId, ref parentPart, logMissing: false)
-            || !Resolve(partId, ref part, logMissing: false)
-            || !CanAttachPart(parentPartId, slot.Id, partId, parentPart, part)
-            || !parentPart.Children.ContainsKey(slot.Id))
-        {
-            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;
-        }
-
-        part.ParentSlot = slot;
-
-        if (TryComp(parentPart.Body, out HumanoidAppearanceComponent? bodyAppearance)
-            && !HasComp<BodyPartAppearanceComponent>(partId)
-            && !TerminatingOrDeleted(parentPartId)
-            && !TerminatingOrDeleted(partId)) // Saw some exceptions involving these due to the spawn menu.
-            EnsureComp<BodyPartAppearanceComponent>(partId);
-
-        return Containers.Insert(partId, container);
-    }
-
-    #endregion
-
-    #region Misc
-
-    public void UpdateMovementSpeed(
-        EntityUid bodyId,
-        BodyComponent? body = null,
-        MovementSpeedModifierComponent? movement = null)
-    {
-        if (!Resolve(bodyId, ref body, ref movement, logMissing: false)
-            || body.RequiredLegs <= 0)
-        {
-            return;
-        }
-
-        var walkSpeed = 0f;
-        var sprintSpeed= 0f;
-        var acceleration = 0f;
-        // WWDP edit - minimal movement speed
-        var minspeed = body.MinimumMovementSpeed;
-
-        if (HasComp<LegsParalyzedComponent>(bodyId))
-        {
-            Movement.ChangeBaseSpeed(bodyId, minspeed, minspeed, MovementSpeedModifierComponent.DefaultAcceleration, movement);
-            return;
-        }
-
-        foreach (var legEntity in body.LegEntities)
-        {
-            if (!TryComp<MovementBodyPartComponent>(legEntity, out var legModifier))
-                continue;
-
-            walkSpeed += legModifier.WalkSpeed;
-            sprintSpeed += legModifier.SprintSpeed;
-            acceleration += legModifier.Acceleration;
-        }
-        walkSpeed = Math.Max(minspeed, walkSpeed / body.RequiredLegs);
-        sprintSpeed = Math.Max(minspeed, sprintSpeed / body.RequiredLegs);
-        // WWDP edit end
-        acceleration /= body.RequiredLegs;
-        Movement.ChangeBaseSpeed(bodyId, walkSpeed, sprintSpeed, acceleration, movement);
-    }
-
-    #endregion
-
-    #region Queries
-
-    /// <summary>
-    /// Get all organs for the specified body part.
-    /// </summary>
-    public IEnumerable<(EntityUid Id, OrganComponent Component)> GetPartOrgans(EntityUid partId, BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            yield break;
-
-        foreach (var slotId in part.Organs.Keys)
-        {
-            var containerSlotId = GetOrganContainerId(slotId);
-
-            if (!Containers.TryGetContainer(partId, containerSlotId, out var container))
-                continue;
-
-            foreach (var containedEnt in container.ContainedEntities)
-            {
-                if (!TryComp(containedEnt, out OrganComponent? organ))
-                    continue;
-
-                yield return (containedEnt, organ);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Gets all BaseContainers for body parts on this entity and its child entities.
-    /// </summary>
-    public IEnumerable<BaseContainer> GetPartContainers(EntityUid id, BodyPartComponent? part = null)
-    {
-        if (!Resolve(id, ref part, logMissing: false) ||
-            part.Children.Count == 0)
-        {
-            yield break;
-        }
-
-        foreach (var slotId in part.Children.Keys)
-        {
-            var containerSlotId = GetPartSlotContainerId(slotId);
-
-            if (!Containers.TryGetContainer(id, containerSlotId, out var container))
-                continue;
-
-            yield return container;
-
-            foreach (var ent in container.ContainedEntities)
-            {
-                foreach (var childContainer in GetPartContainers(ent))
-                {
-                    yield return childContainer;
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// Returns all body part components for this entity including itself.
-    /// </summary>
-    public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyPartChildren(
-        EntityUid partId,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            yield break;
-
-        yield return (partId, part);
-
-        foreach (var slotId in part.Children.Keys)
-        {
-            var containerSlotId = GetPartSlotContainerId(slotId);
-
-            if (Containers.TryGetContainer(partId, containerSlotId, out var container))
-            {
-                foreach (var containedEnt in container.ContainedEntities)
-                {
-                    if (!TryComp(containedEnt, out BodyPartComponent? childPart))
-                        continue;
-
-                    foreach (var value in GetBodyPartChildren(containedEnt, childPart))
-                    {
-                        yield return value;
-                    }
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// Returns all body part slots for this entity.
-    /// </summary>
-    public IEnumerable<BodyPartSlot> GetAllBodyPartSlots(
-        EntityUid partId,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            yield break;
-
-        foreach (var (slotId, slot) in part.Children)
-        {
-            yield return slot;
-
-            var containerSlotId = GetOrganContainerId(slotId);
-
-            if (Containers.TryGetContainer(partId, containerSlotId, out var container))
-            {
-                foreach (var containedEnt in container.ContainedEntities)
-                {
-                    if (!TryComp(containedEnt, out BodyPartComponent? childPart))
-                        continue;
-
-                    foreach (var subSlot in GetAllBodyPartSlots(containedEnt, childPart))
-                    {
-                        yield return subSlot;
-                    }
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// Returns true if the bodyId has any parts of this type.
-    /// </summary>
-    public bool BodyHasPartType(
-        EntityUid bodyId,
-        BodyPartType type,
-        BodyComponent? body = null)
-    {
-        return GetBodyChildrenOfType(bodyId, type, body).Any();
-    }
-
-    /// <summary>
-    /// Returns true if the parentId has the specified childId.
-    /// </summary>
-    public bool PartHasChild(
-        EntityUid parentId,
-        EntityUid childId,
-        BodyPartComponent? parent,
-        BodyPartComponent? child)
-    {
-        if (!Resolve(parentId, ref parent, logMissing: false)
-            || !Resolve(childId, ref child, logMissing: false))
-        {
-            return false;
-        }
-
-        foreach (var (foundId, _) in GetBodyPartChildren(parentId, parent))
-        {
-            if (foundId == childId)
-                return true;
-        }
-        return false;
-    }
-
-    /// <summary>
-    /// Returns true if the bodyId has the specified partId.
-    /// </summary>
-    public bool BodyHasChild(
-        EntityUid bodyId,
-        EntityUid partId,
-        BodyComponent? body = null,
-        BodyPartComponent? part = null)
-    {
-        return Resolve(bodyId, ref body, logMissing: false)
-            && body.RootContainer.ContainedEntity is not null
-            && Resolve(partId, ref part, logMissing: false)
-            && TryComp(body.RootContainer.ContainedEntity, out BodyPartComponent? rootPart)
-            && PartHasChild(body.RootContainer.ContainedEntity.Value, partId, rootPart, part);
-    }
-
-    public IEnumerable<(EntityUid Id, BodyPartComponent Component)> GetBodyChildrenOfType(
-        EntityUid bodyId,
-        BodyPartType type,
-        BodyComponent? body = null,
-        // Shitmed Change
-        BodyPartSymmetry? symmetry = null)
-    {
-        foreach (var part in GetBodyChildren(bodyId, body))
-        {
-            if (part.Component.PartType == type && (symmetry == null || part.Component.Symmetry == symmetry)) // Shitmed Change
-                yield return part;
-        }
-    }
-
-    /// <summary>
-    ///     Returns a list of ValueTuples of <see cref="T"/> and OrganComponent on each organ
-    ///     in the given part.
-    /// </summary>
-    /// <param name="uid">The part entity id to check on.</param>
-    /// <param name="part">The part to check for organs on.</param>
-    /// <typeparam name="T">The component to check for.</typeparam>
-    public List<(T Comp, OrganComponent Organ)> GetBodyPartOrganComponents<T>(
-        EntityUid uid,
-        BodyPartComponent? part = null)
-        where T : IComponent
-    {
-        if (!Resolve(uid, ref part))
-            return new List<(T Comp, OrganComponent Organ)>();
-
-        var query = GetEntityQuery<T>();
-        var list = new List<(T Comp, OrganComponent Organ)>();
-
-        foreach (var organ in GetPartOrgans(uid, part))
-        {
-            if (query.TryGetComponent(organ.Id, out var comp))
-                list.Add((comp, organ.Component));
-        }
-
-        return list;
-    }
-
-    /// <summary>
-    ///     Tries to get a list of ValueTuples of <see cref="T"/> and OrganComponent on each organs
-    ///     in the given part.
-    /// </summary>
-    /// <param name="uid">The part entity id to check on.</param>
-    /// <param name="comps">The list of components.</param>
-    /// <param name="part">The part to check for organs on.</param>
-    /// <typeparam name="T">The component to check for.</typeparam>
-    /// <returns>Whether any were found.</returns>
-    public bool TryGetBodyPartOrganComponents<T>(
-        EntityUid uid,
-        [NotNullWhen(true)] out List<(T Comp, OrganComponent Organ)>? comps,
-        BodyPartComponent? part = null)
-        where T : IComponent
-    {
-        if (!Resolve(uid, ref part))
-        {
-            comps = null;
-            return false;
-        }
-
-        comps = GetBodyPartOrganComponents<T>(uid, part);
-
-        if (comps.Count != 0)
-            return true;
-
-        comps = null;
-        return false;
-    }
-
-    // Shitmed Change Start
-    /// <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>
-    /// <param name="organs">The organs found on the body part.</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 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;
-    }
-
-    private bool TryGetPartSlotContainerName(BodyPartType partType, out HashSet<string> containerNames)
-    {
-        containerNames = partType switch
-        {
-            BodyPartType.Hand => new() { "gloves" },
-            BodyPartType.Foot => new() { "shoes" },
-            BodyPartType.Head => new() { "eyes", "ears", "head", "mask" },
-            _ => new()
-        };
-        return containerNames.Count > 0;
-    }
-
-    private bool TryGetPartFromSlotContainer(string slot, out BodyPartType? partType)
-    {
-        partType = slot switch
-        {
-            "gloves" => BodyPartType.Hand,
-            "shoes" => BodyPartType.Foot,
-            "eyes" or "ears" or "head" or "mask" => BodyPartType.Head,
-            _ => null
-        };
-        return partType is not null;
-    }
-
-    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;
-    }
-
-    public string GetSlotFromBodyPart(BodyPartComponent? part)
-    {
-        var slotName = "";
-
-        if (part is null)
-            return slotName;
-
-        if (part.SlotId != "")
-            slotName = part.SlotId;
-        else
-            slotName = part.PartType.ToString().ToLower();
-
-        if (part.Symmetry != BodyPartSymmetry.None)
-            return $"{part.Symmetry.ToString().ToLower()} {slotName}";
-        else
-            return slotName;
-    }
-
-    // Shitmed Change End
-
-    /// <summary>
-    /// Gets the parent body part and all immediate child body parts for the partId.
-    /// </summary>
-    public IEnumerable<EntityUid> GetBodyPartAdjacentParts(
-        EntityUid partId,
-        BodyPartComponent? part = null)
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            yield break;
-
-        if (TryGetParentBodyPart(partId, out var parentUid, out _))
-            yield return parentUid.Value;
-
-        foreach (var slotId in part.Children.Keys)
-        {
-            var container = Containers.GetContainer(partId, GetPartSlotContainerId(slotId));
-
-            foreach (var containedEnt in container.ContainedEntities)
-            {
-                yield return containedEnt;
-            }
-        }
-    }
-
-    public IEnumerable<(EntityUid AdjacentId, T Component)> GetBodyPartAdjacentPartsComponents<T>(
-        EntityUid partId,
-        BodyPartComponent? part = null)
-        where T : IComponent
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-            yield break;
-
-        var query = GetEntityQuery<T>();
-        foreach (var adjacentId in GetBodyPartAdjacentParts(partId, part))
-        {
-            if (query.TryGetComponent(adjacentId, out var component))
-                yield return (adjacentId, component);
-        }
-    }
-
-    public bool TryGetBodyPartAdjacentPartsComponents<T>(
-        EntityUid partId,
-        [NotNullWhen(true)] out List<(EntityUid AdjacentId, T Component)>? comps,
-        BodyPartComponent? part = null)
-        where T : IComponent
-    {
-        if (!Resolve(partId, ref part, logMissing: false))
-        {
-            comps = null;
-            return false;
-        }
-
-        var query = GetEntityQuery<T>();
-        comps = new List<(EntityUid AdjacentId, T Component)>();
-
-        foreach (var adjacentId in GetBodyPartAdjacentParts(partId, part))
-        {
-            if (query.TryGetComponent(adjacentId, out var component))
-                comps.Add((adjacentId, component));
-        }
-
-        if (comps.Count != 0)
-            return true;
-
-        comps = null;
-        return false;
-    }
-
-    #endregion
-}
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.cs b/Content.Shared/Body/Systems/SharedBodySystem.cs
deleted file mode 100644
index dddb6398005..00000000000
--- a/Content.Shared/Body/Systems/SharedBodySystem.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Standing;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared.Body.Systems;
-
-public abstract partial class SharedBodySystem : EntitySystem
-{
-    /*
-     * See the body partial for how this works.
-     */
-
-    /// <summary>
-    /// Container ID prefix for any body parts.
-    /// </summary>
-    public const string PartSlotContainerIdPrefix = "body_part_slot_";
-
-    /// <summary>
-    /// Container ID for the ContainerSlot on the body entity itself.
-    /// </summary>
-    public const string BodyRootContainerId = "body_root_part";
-
-    /// <summary>
-    /// Container ID prefix for any body organs.
-    /// </summary>
-    public const string OrganSlotContainerIdPrefix = "body_organ_slot_";
-
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] protected readonly IPrototypeManager Prototypes = default!;
-    [Dependency] protected readonly DamageableSystem Damageable = default!;
-    [Dependency] protected readonly MovementSpeedModifierSystem Movement = default!;
-    [Dependency] protected readonly SharedContainerSystem Containers = default!;
-    [Dependency] protected readonly SharedTransformSystem SharedTransform = default!;
-    [Dependency] protected readonly StandingStateSystem Standing = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        InitializeBody();
-        InitializeParts();
-        InitializeOrgans();
-        // Shitmed Change Start
-        // To try and mitigate the server load due to integrity checks, we set up a Job Queue.
-        InitializeIntegrityQueue();
-        InitializePartAppearances();
-        // Shitmed Change End
-    }
-
-    /// <summary>
-    /// Inverse of <see cref="GetPartSlotContainerId"/>
-    /// </summary>
-    protected static string? GetPartSlotContainerIdFromContainer(string containerSlotId)
-    {
-        // This is blursed
-        var slotIndex = containerSlotId.IndexOf(PartSlotContainerIdPrefix, StringComparison.Ordinal);
-
-        if (slotIndex < 0)
-            return null;
-
-        var slotId = containerSlotId.Remove(slotIndex, PartSlotContainerIdPrefix.Length);
-        return slotId;
-    }
-
-    /// <summary>
-    /// Gets the container Id for the specified slotId.
-    /// </summary>
-    public static string GetPartSlotContainerId(string slotId)
-    {
-        return PartSlotContainerIdPrefix + slotId;
-    }
-
-    /// <summary>
-    /// Gets the container Id for the specified slotId.
-    /// </summary>
-    public static string GetOrganContainerId(string slotId)
-    {
-        return OrganSlotContainerIdPrefix + slotId;
-    }
-}
diff --git a/Content.Shared/CCVar/CCVars.HeightSliders.cs b/Content.Shared/CCVar/CCVars.HeightSliders.cs
index c49ae5d5123..34c2d76f113 100644
--- a/Content.Shared/CCVar/CCVars.HeightSliders.cs
+++ b/Content.Shared/CCVar/CCVars.HeightSliders.cs
@@ -20,7 +20,7 @@ public sealed partial class CCVars
     ///     Whether height & width sliders adjust a player's bloodstream volume.
     /// </summary>
     /// <remarks>
-    ///     This can be configured more precisely by modifying BloodstreamAffectedByMassComponent.
+    ///     This can be configured more precisely by modifying BloodstreamComponent.
     /// </remarks>
     public static readonly CVarDef<bool> HeightAdjustModifiesBloodstream =
         CVarDef.Create("heightadjust.modifies_bloodstream", true, CVar.SERVERONLY);
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 3fdf1925c28..b57e532e9c1 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -475,20 +475,20 @@ public bool TryAddReagent(Entity<SolutionComponent> soln, ReagentId reagentId, F
     ///     Removes reagent from a container.
     /// </summary>
     /// <param name="targetUid"></param>
-    /// <param name="container">Solution container from which we are removing reagent</param>
+    /// <param name="container">Solution container from which we are removing reagent.</param>
     /// <param name="reagentQuantity">The reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
     {
         var (uid, comp) = soln;
         var solution = comp.Solution;
 
         var quant = solution.RemoveReagent(reagentQuantity);
         if (quant <= FixedPoint2.Zero)
-            return false;
+            return FixedPoint2.Zero;
 
         UpdateChemicals(soln);
-        return true;
+        return quant;
     }
 
     /// <summary>
@@ -498,8 +498,8 @@ public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagen
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="prototype">The Id of the reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
     {
         return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data));
     }
@@ -511,8 +511,8 @@ public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, Fixe
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="reagentId">The reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
     {
         return RemoveReagent(soln, new ReagentQuantity(reagentId, quantity));
     }
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index dba2ba03a3f..483f20ca126 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,8 +1,8 @@
 using System.Collections.Frozen;
 using System.Linq;
 using System.Text.Json.Serialization;
+using Content.Shared._White.Body.Prototypes;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Prototypes;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.EntityEffects;
@@ -14,7 +14,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
 
@@ -126,7 +125,7 @@ public sealed partial class ReagentPrototype : IPrototype, IInheritingPrototype
         public bool WorksOnTheDead;
 
         [DataField(serverOnly: true)]
-        public FrozenDictionary<ProtoId<MetabolismGroupPrototype>, ReagentEffectsEntry>? Metabolisms;
+        public FrozenDictionary<ProtoId<MetabolismStagePrototype>, ReagentEffectsEntry>? Metabolisms; // WD EDIT
 
         [DataField(serverOnly: true)]
         public Dictionary<ProtoId<ReactiveGroupPrototype>, ReactiveReagentEffectEntry>? ReactiveEffects;
@@ -194,7 +193,7 @@ public struct ReagentGuideEntry
     {
         public string ReagentPrototype;
 
-        public Dictionary<ProtoId<MetabolismGroupPrototype>, ReagentEffectsGuideEntry>? GuideEntries;
+        public Dictionary<ProtoId<MetabolismStagePrototype>, ReagentEffectsGuideEntry>? GuideEntries; // WD EDIT
 
         public List<string>? PlantMetabolisms = null;
 
@@ -230,8 +229,16 @@ public sealed partial class ReagentEffectsEntry
         ///     A list of effects to apply when these reagents are metabolized.
         /// </summary>
         [JsonPropertyName("effects")]
-        [DataField("effects", required: true)]
-        public EntityEffect[] Effects = default!;
+        // WD EDIT START
+        [DataField]
+        public EntityEffect[] Effects = Array.Empty<EntityEffect>();
+
+        /// <summary>
+        ///     Ratio of this reagent to metabolites for transfer to the next solution by a metabolizer
+        /// </summary>
+        [DataField]
+        public Dictionary<ProtoId<ReagentPrototype>, FixedPoint2> Metabolites = new();
+        // WD EDIT END
 
         public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEntitySystemManager entSys)
         {
@@ -240,23 +247,25 @@ public ReagentEffectsGuideEntry MakeGuideEntry(IPrototypeManager prototype, IEnt
                     .Select(x => x.GuidebookEffectDescription(prototype, entSys)) // hate.
                     .Where(x => x is not null)
                     .Select(x => x!)
-                    .ToArray());
+                    .ToArray(),
+                Metabolites); // WD EDIT
         }
     }
 
     [Serializable, NetSerializable]
-    public struct ReagentEffectsGuideEntry
+    // WD EDIT START
+    public struct ReagentEffectsGuideEntry(
+        FixedPoint2 metabolismRate,
+        string[] effectDescriptions,
+        Dictionary<ProtoId<ReagentPrototype>, FixedPoint2> metabolites)
     {
-        public FixedPoint2 MetabolismRate;
+        public FixedPoint2 MetabolismRate = metabolismRate;
 
-        public string[] EffectDescriptions;
+        public string[] EffectDescriptions = effectDescriptions;
 
-        public ReagentEffectsGuideEntry(FixedPoint2 metabolismRate, string[] effectDescriptions)
-        {
-            MetabolismRate = metabolismRate;
-            EffectDescriptions = effectDescriptions;
-        }
+        public Dictionary<ProtoId<ReagentPrototype>, FixedPoint2> Metabolites = metabolites;
     }
+    // WD EDIT END
 
     [DataDefinition]
     public sealed partial class ReactiveReagentEffectEntry
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 7e6dcc5b5da..1035048c83e 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -1,5 +1,5 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Body.Systems;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Climbing.Components;
 using Content.Shared.Climbing.Events;
@@ -524,7 +524,7 @@ private void OnGlassClimbed(EntityUid uid, GlassTableComponent component, ref Cl
         if (TryComp<PhysicsComponent>(args.Climber, out var physics) && physics.Mass <= component.MassLimit)
             return;
 
-        _damageableSystem.TryChangeDamage(args.Climber, component.ClimberDamage, origin: args.Climber);
+        _damageableSystem.TryChangeDamage(args.Climber, component.ClimberDamage, origin: args.Climber, bodyPartType: BodyPartType.FullLegs); // WD EDIT
         _damageableSystem.TryChangeDamage(uid, component.TableDamage, origin: args.Climber);
         _stunSystem.TryParalyze(args.Climber, TimeSpan.FromSeconds(component.StunTime), true);
 
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index ffcb52b4576..cf5e2c3e65b 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -36,11 +36,11 @@ public sealed partial class FoldableClothingComponent : Component
     /// Which layers does this hide when Unfolded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers> UnfoldedHideLayers = new();
+    public HashSet<Enum> UnfoldedHideLayers = new(); // WD EDIT
 
     /// <summary>
     /// Which layers does this hide when folded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers> FoldedHideLayers = new();
+    public HashSet<Enum> FoldedHideLayers = new(); // WD EDIT
 }
diff --git a/Content.Shared/Clothing/Components/HideLayerClothingComponent.cs b/Content.Shared/Clothing/Components/HideLayerClothingComponent.cs
index 304dd2a3e84..b4bd1f00471 100644
--- a/Content.Shared/Clothing/Components/HideLayerClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/HideLayerClothingComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class HideLayerClothingComponent : Component
     /// The appearance layer to hide.
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers> Slots = new();
+    public HashSet<Enum> Slots = new(); // WD EDIT
 
     /// <summary>
     /// The clothing layers to hide.
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 2d4c073e0c6..4557b8c9a5d 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -33,7 +31,6 @@ public override void Initialize()
         SubscribeLocalEvent<ClothingComponent, GotUnequippedEvent>(OnGotUnequipped);
         SubscribeLocalEvent<ClothingComponent, ItemMaskToggledEvent>(OnMaskToggled);
         SubscribeLocalEvent<ClothingComponent, GettingPickedUpAttemptEvent>(OnPickedUp);
-        SubscribeLocalEvent<HumanoidAppearanceComponent, BodyPartAddedEvent>(OnPartAttachedToBody, after: [typeof(SharedBodySystem)]);
 
         SubscribeLocalEvent<ClothingComponent, ClothingEquipDoAfterEvent>(OnEquipDoAfter);
         SubscribeLocalEvent<ClothingComponent, ClothingUnequipDoAfterEvent>(OnUnequipDoAfter);
@@ -94,9 +91,9 @@ private void QuickEquip(
         }
     }
 
-    private void ToggleVisualLayers(EntityUid equipee, HashSet<HumanoidVisualLayers> layers, HashSet<HumanoidVisualLayers> appearanceLayers, bool force = false)
+    private void ToggleVisualLayers(EntityUid equipee, HashSet<Enum> layers, HashSet<Enum> appearanceLayers, bool force = false) // WD EDIT
     {
-        foreach (HumanoidVisualLayers layer in layers)
+        foreach (Enum layer in layers) // WD EDIT
         {
             if (!force && !appearanceLayers.Contains(layer))
                 continue;
@@ -200,20 +197,6 @@ private void OnPickedUp(Entity<ClothingComponent> ent, ref GettingPickedUpAttemp
         args.Cancel();
     }
 
-    // Yes, this is exclusive C# just so that high heels selected from loadouts still hide the feet layers
-    // after Shitmed (SharedBodySystem.PartAppearance) initializes the feet parts setting their layer visibility to true.
-    private void OnPartAttachedToBody(Entity<HumanoidAppearanceComponent> ent, ref BodyPartAddedEvent args)
-    {
-        var enumerator = _invSystem.GetSlotEnumerator(ent.Owner);
-        while (enumerator.NextItem(out var item))
-        {
-            if (!TryComp<HideLayerClothingComponent>(item, out var comp))
-                continue;
-
-            CheckEquipmentForLayerHide(item, ent.Owner);
-        }
-    }
-
     private void OnEquipDoAfter(Entity<ClothingComponent> ent, ref ClothingEquipDoAfterEvent args)
     {
         if (args.Handled || args.Cancelled || args.Target is not { } target)
diff --git a/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs
index 95557be2498..7444b2c3efa 100644
--- a/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs
+++ b/Content.Shared/Clothing/Loadouts/Systems/SharedLoadoutSystem.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Shared.Body.Systems;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.Loadouts.Prototypes;
 using Content.Shared.Customization.Systems;
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
index e034458197f..6329b15dad3 100644
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Chemistry.Hypospray.Events;
 using Content.Shared.Climbing.Components;
@@ -68,7 +69,7 @@ private void BeforeGunShotEvent(Entity<ClumsyComponent> ent, ref SelfBeforeGunSh
             return;
 
         if (ent.Comp.GunShootFailDamage != null)
-            _damageable.TryChangeDamage(ent, ent.Comp.GunShootFailDamage, origin: ent);
+            _damageable.TryChangeDamage(ent, ent.Comp.GunShootFailDamage, origin: ent, bodyPartType: BodyPartType.Hands); // WD EDIT
 
         _stun.TryParalyze(ent, ent.Comp.GunShootFailStunTime, true);
 
@@ -137,7 +138,7 @@ public void HitHeadClumsy(Entity<ClumsyComponent> target, EntityUid table)
         {
             stunTime = bonkComp.BonkTime;
             if (bonkComp.BonkDamage != null)
-                _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true);
+                _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true, bodyPartType:BodyPartType.Head); // WD EDIT
         }
 
         _stun.TryParalyze(target, stunTime, true);
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index f8b0192cd51..b0beaeceab6 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -481,14 +481,10 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff,
             if (TryComp<HandsComponent>(target, out var hands) && hands.Count <= component.CuffedHandCount)
                 return false;
 
-            // Shitmed Change Start
-            EnsureComp<HandcuffComponent>(handcuff, out var handcuffsComp);
-            handcuffsComp.Used = true;
-            Dirty(handcuff, handcuffsComp);
             // Success!
             _hands.TryDrop(user, handcuff);
-            var result = _container.Insert(handcuff, component.Container);
-            // Shitmed Change End
+
+            _container.Insert(handcuff, component.Container);
 
             UpdateHeldItems(target, handcuff, component);
             return true;
diff --git a/Content.Shared/Damage/Components/DamageContactsComponent.cs b/Content.Shared/Damage/Components/DamageContactsComponent.cs
index 4ae88db8d72..a888d173446 100644
--- a/Content.Shared/Damage/Components/DamageContactsComponent.cs
+++ b/Content.Shared/Damage/Components/DamageContactsComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
@@ -17,4 +18,12 @@ public sealed partial class DamageContactsComponent : Component
     /// </summary>
     [DataField("ignoreWhitelist")]
     public EntityWhitelist? IgnoreWhitelist;
+
+    // WD EDIT START
+    /// <summary>
+    /// The body part that will be damaged.
+    /// </summary>
+    [DataField]
+    public BodyPartType BodyPartType = BodyPartType.All;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs
index 5f6bd7d9972..7f5dcf5e08f 100644
--- a/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs
+++ b/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
@@ -44,4 +45,12 @@ public sealed partial class DamageOnAttackedComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool IsDamageActive = true;
+
+    // WD EDIT START
+    /// <summary>
+    /// The body part that will be damaged
+    /// </summary>
+    [DataField]
+    public BodyPartType BodyPartType = BodyPartType.Hands;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs
index 9581d204966..ba85dc1f0e4 100644
--- a/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs
+++ b/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 
@@ -26,4 +27,12 @@ public sealed partial class DamageOnAttackedProtectionComponent : Component, ICl
     /// </summary>
     [DataField]
     public SlotFlags Slots { get; set; } = SlotFlags.WITHOUT_POCKET;
+
+    // WD EDIT START
+    /// <summary>
+    /// The part of the body that will be protected from damage.
+    /// </summary>
+    [DataField]
+    public BodyPartType BodyPartType = BodyPartType.Hands;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Damage/Components/DamageOnInteractComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractComponent.cs
index ab411474fac..a9bc7841b0b 100644
--- a/Content.Shared/Damage/Components/DamageOnInteractComponent.cs
+++ b/Content.Shared/Damage/Components/DamageOnInteractComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -47,6 +48,12 @@ public sealed partial class DamageOnInteractComponent : Component
     public bool IsDamageActive = true;
 
     // WD EDIT START
+    /// <summary>
+    /// The body part that will be damaged
+    /// </summary>
+    [DataField]
+    public BodyPartType BodyPartType = BodyPartType.Hands;
+
     /// <summary>
     /// Entities that do not take damage when interacted
     /// </summary>
diff --git a/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs
index f57c3d22c17..d277c2beb8e 100644
--- a/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs
+++ b/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Inventory;
 using Robust.Shared.GameStates;
 
@@ -26,4 +27,12 @@ public sealed partial class DamageOnInteractProtectionComponent : Component, ICl
     /// </summary>
     [DataField]
     public SlotFlags Slots { get; set; } = SlotFlags.GLOVES;
+
+    // WD EDIT START
+    /// <summary>
+    /// The part of the body that will be protected from damage.
+    /// </summary>
+    [DataField]
+    public BodyPartType BodyPartType = BodyPartType.Hands;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs
index 4fb5ab1a639..415192a9b90 100644
--- a/Content.Shared/Damage/Components/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Wounds.Systems;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
@@ -17,7 +18,7 @@ namespace Content.Shared.Damage
     /// </remarks>
     [RegisterComponent]
     [NetworkedComponent]
-    [Access(typeof(DamageableSystem), Other = AccessPermissions.ReadExecute)]
+    [Access(typeof(DamageableSystem), typeof(SharedWoundSystem), Other = AccessPermissions.ReadExecute)] // WD EDIT: WoundSystem
     public sealed partial class DamageableComponent : Component
     {
         /// <summary>
diff --git a/Content.Shared/Damage/Components/DamagedByContactComponent.cs b/Content.Shared/Damage/Components/DamagedByContactComponent.cs
index bc86f1f5e2a..d270b08056d 100644
--- a/Content.Shared/Damage/Components/DamagedByContactComponent.cs
+++ b/Content.Shared/Damage/Components/DamagedByContactComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
@@ -11,4 +12,9 @@ public sealed partial class DamagedByContactComponent : Component
 
     [ViewVariables]
     public DamageSpecifier? Damage;
+
+    // WD EDIT START
+    [ViewVariables]
+    public BodyPartType BodyPartType;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Damage/Components/PassiveDamageComponent.cs b/Content.Shared/Damage/Components/PassiveDamageComponent.cs
index fbc4f493d31..303cce948fb 100644
--- a/Content.Shared/Damage/Components/PassiveDamageComponent.cs
+++ b/Content.Shared/Damage/Components/PassiveDamageComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Mobs;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
@@ -37,4 +38,12 @@ public sealed partial class PassiveDamageComponent : Component
 
     [DataField("nextDamage", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public TimeSpan NextDamage = TimeSpan.Zero;
+
+    // WD EDIT START
+    /// <summary>
+    /// The body part that will be damaged
+    /// </summary>
+    [DataField]
+    public BodyPartType BodyPartType = BodyPartType.All;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Damage/DamageSpecifier.cs b/Content.Shared/Damage/DamageSpecifier.cs
index 7f505b807f7..c160625bba5 100644
--- a/Content.Shared/Damage/DamageSpecifier.cs
+++ b/Content.Shared/Damage/DamageSpecifier.cs
@@ -308,6 +308,28 @@ public void GetDamagePerGroup(IPrototypeManager protoManager, Dictionary<string,
             }
         }
 
+        // WD EDIT START
+        /// <summary>
+        ///     This adds the damage values of some other <see cref="DamageSpecifier"/> to the current one without
+        ///     adding any new damage types. This operation ensures that damage values are non-negative.
+        /// </summary>
+        public void ApplyDamage(DamageSpecifier other)
+        {
+            foreach (var (type, value) in other.DamageDict)
+                if (DamageDict.TryGetValue(type, out var existing))
+                    DamageDict[type] = FixedPoint2.Max(FixedPoint2.Zero, existing + value);
+        }
+
+        public void MakePositiveDamage()
+        {
+            foreach (var (type, value) in DamageDict)
+            {
+                if (value < 0)
+                    DamageDict[type] = FixedPoint2.Zero;
+            }
+        }
+        // WD EDIT END
+
         #region Operators
         public static DamageSpecifier operator *(DamageSpecifier damageSpec, FixedPoint2 factor)
         {
diff --git a/Content.Shared/Damage/Prototypes/DamageTypePrototype.cs b/Content.Shared/Damage/Prototypes/DamageTypePrototype.cs
index a1ae23ef676..5703be24a29 100644
--- a/Content.Shared/Damage/Prototypes/DamageTypePrototype.cs
+++ b/Content.Shared/Damage/Prototypes/DamageTypePrototype.cs
@@ -28,5 +28,10 @@ public sealed partial class DamageTypePrototype : IPrototype
         /// </summary>
         [DataField("armorFlatPrice")]
         public double ArmorPriceFlat { get; set; }
+
+        // WD EDIT START
+        [DataField]
+        public EntProtoId? Wound { get; set; }
+        // WD EDIT END
     }
 }
diff --git a/Content.Shared/Damage/Systems/DamageContactsSystem.cs b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
index 3cc73a87c59..6bcbbdab292 100644
--- a/Content.Shared/Damage/Systems/DamageContactsSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageContactsSystem.cs
@@ -34,7 +34,7 @@ public override void Update(float frameTime)
             damaged.NextSecond = _timing.CurTime + TimeSpan.FromSeconds(1);
 
             if (damaged.Damage != null)
-                _damageable.TryChangeDamage(ent, damaged.Damage, interruptsDoAfters: false);
+                _damageable.TryChangeDamage(ent, damaged.Damage, interruptsDoAfters: false, bodyPartType:damaged.BodyPartType); // WD EDIT
         }
     }
 
@@ -70,5 +70,6 @@ private void OnEntityEnter(EntityUid uid, DamageContactsComponent component, ref
 
         var damagedByContact = EnsureComp<DamagedByContactComponent>(otherUid);
         damagedByContact.Damage = component.Damage;
+        damagedByContact.BodyPartType = component.BodyPartType; // WD EDIT
     }
 }
diff --git a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs
index 29de43fba4a..1a280b7a0c9 100644
--- a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs
@@ -67,13 +67,13 @@ private void OnAttacked(Entity<DamageOnAttackedComponent> entity, ref AttackedEv
             }
 
             // if comp is NOT NULL that means they have damage protection!
-            if (protectiveEntity.Comp != null)
+            if (protectiveEntity.Comp != null && protectiveEntity.Comp.BodyPartType.HasFlag(entity.Comp.BodyPartType)) // WD EDIT
             {
                 totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection);
             }
         }
 
-        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage, entity.Comp.IgnoreResistances, origin: entity);
+        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage, entity.Comp.IgnoreResistances, origin: entity, bodyPartType: entity.Comp.BodyPartType); // WD EDIT
 
         if (totalDamage != null && totalDamage.AnyPositive())
         {
diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
index 33b9af3ef80..06231366c9f 100644
--- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -55,13 +55,13 @@ private void OnHandInteract(Entity<DamageOnInteractComponent> entity, ref Intera
 
             // if protectiveComp isn't null after all that, it means the user has protection,
             // so let's calculate how much they resist
-            if (protectiveEntity.Comp != null)
+            if (protectiveEntity.Comp != null && protectiveEntity.Comp.BodyPartType.HasFlag(entity.Comp.BodyPartType)) // WD EDIT
             {
                 totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection);
             }
         }
 
-        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage,  origin: args.Target);
+        totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage,  origin: args.Target, bodyPartType: entity.Comp.BodyPartType); // WD EDIT
 
         if (totalDamage != null && totalDamage.AnyPositive())
         {
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index dcb099f7875..817bf1ff829 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -1,7 +1,9 @@
 using System.Linq;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
+using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Radiation.Events;
@@ -11,10 +13,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-// Shitmed Change
-using Content.Shared.Body.Systems;
-using Content.Shared._Shitmed.Targeting;
-
 namespace Content.Shared.Damage
 {
     public sealed class DamageableSystem : EntitySystem
@@ -22,11 +20,11 @@ public sealed class DamageableSystem : EntitySystem
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly INetManager _netMan = default!;
-        [Dependency] private readonly SharedBodySystem _body = default!; // Shitmed Change
         [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
 
         private EntityQuery<AppearanceComponent> _appearanceQuery;
         private EntityQuery<DamageableComponent> _damageableQuery;
+        private EntityQuery<MindContainerComponent> _mindContainerQuery;
 
         public override void Initialize()
         {
@@ -38,6 +36,7 @@ public override void Initialize()
 
             _appearanceQuery = GetEntityQuery<AppearanceComponent>();
             _damageableQuery = GetEntityQuery<DamageableComponent>();
+            _mindContainerQuery = GetEntityQuery<MindContainerComponent>();
         }
 
         /// <summary>
@@ -99,9 +98,10 @@ public void SetDamage(EntityUid uid, DamageableComponent damageable, DamageSpeci
         ///     The damage changed event is used by other systems, such as damage thresholds.
         /// </remarks>
         public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSpecifier? damageDelta = null,
-            bool interruptsDoAfters = true, EntityUid? origin = null, bool? canSever = null) // Shitmed Change
+            bool interruptsDoAfters = true, EntityUid? origin = null)
         {
             component.Damage.GetDamagePerGroup(_prototypeManager, component.DamagePerGroup);
+            component.Damage.MakePositiveDamage(); // WD EDIT
             component.TotalDamage = component.Damage.GetTotal();
             Dirty(uid, component);
 
@@ -110,7 +110,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, canSever ?? true)); // Shitmed Change
+            RaiseLocalEvent(uid, new DamageChangedEvent(component, damageDelta, interruptsDoAfters, origin));
         }
 
         /// <summary>
@@ -126,38 +126,32 @@ 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,
-            // Shitmed Change
-            bool? canSever = true, bool? canEvade = false, float? partMultiplier = 1.00f, TargetBodyPart? targetPart = null, bool doPartDamage = true)
+            bool interruptsDoAfters = true, DamageableComponent? damageable = null, EntityUid? origin = null, BodyPartType bodyPartType = BodyPartType.All)
         {
-            if (!uid.HasValue || !_damageableQuery.Resolve(uid.Value, ref damageable, false))
-            {
-                // TODO BODY SYSTEM pass damage onto body system
+            // WD EDIT START
+            if (!uid.HasValue)
                 return null;
-            }
 
             if (damage.Empty)
-            {
                 return damage;
-            }
+            // WD EDIT END
 
-            var before = new BeforeDamageChangedEvent(damage, origin, targetPart, canEvade ?? false); // Shitmed Change
+            var before = new BeforeDamageChangedEvent(damage, origin);
             RaiseLocalEvent(uid.Value, ref before);
 
             if (before.Cancelled)
                 return null;
 
-            // Shitmed Change Start
-            if (doPartDamage)
-            {
-                var partDamage = new TryChangePartDamageEvent(damage, origin, targetPart, ignoreResistances, canSever ?? true, canEvade ?? false, partMultiplier ?? 1.00f);
-                RaiseLocalEvent(uid.Value, ref partDamage);
+            // WD EDIT START
+            var beforeCommit = new BeforeDamageCommitEvent(damage, ignoreResistances, bodyPartType);
+            RaiseLocalEvent(uid.Value, ref beforeCommit);
 
-                if (partDamage.Evaded || partDamage.Cancelled)
-                    return null;
-            }
+            if (beforeCommit.Handled)
+                return beforeCommit.Damage;
 
-            // Shitmed Change End
+            if (!_damageableQuery.Resolve(uid.Value, ref damageable, false))
+                return null;
+            // WD EDIT END
 
             // Apply resistances
             if (!ignoreResistances)
@@ -167,17 +161,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);
                 }
 
-                // From Solidus: If you are reading this, I owe you a more comprehensive refactor of this entire system.
-                if (damageable.DamageModifierSets.Count > 0)
-                    foreach (var enumerableModifierSet in damageable.DamageModifierSets)
-                        if (_prototypeManager.TryIndex<DamageModifierSetPrototype>(enumerableModifierSet, out var enumerableModifier))
-                            damage = DamageSpecifier.ApplyModifierSet(damage, enumerableModifier);
-
-                var ev = new DamageModifyEvent(damage, origin, targetPart); // Shitmed Change
+                var ev = new DamageModifyEvent(damage, origin);
                 RaiseLocalEvent(uid.Value, ev);
                 damage = ev.Damage;
 
@@ -209,7 +196,7 @@ public void DamageChanged(EntityUid uid, DamageableComponent component, DamageSp
             }
 
             if (delta.DamageDict.Count > 0)
-                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin, canSever); // Shitmed Change
+                DamageChanged(uid.Value, damageable, delta, interruptsDoAfters, origin);
 
             return delta;
         }
@@ -236,19 +223,6 @@ public void SetAllDamage(EntityUid uid, DamageableComponent component, FixedPoin
             // Setting damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an
             // empty damage delta.
             DamageChanged(uid, component, new DamageSpecifier());
-
-            // Shitmed Change Start
-            if (HasComp<TargetingComponent>(uid))
-            {
-                foreach (var (part, _) in _body.GetBodyChildren(uid))
-                {
-                    if (!TryComp(part, out DamageableComponent? damageComp))
-                        continue;
-
-                    SetAllDamage(part, damageComp, newValue);
-                }
-            }
-            // Shitmed Change End
         }
 
         /// <summary>
@@ -269,22 +243,9 @@ public void ChangeAllDamage(EntityUid uid, DamageableComponent component, FixedP
             // Changing damage does not count as 'dealing' damage, even if it is set to a larger value, so we pass an
             // empty damage delta.
             DamageChanged(uid, component, new DamageSpecifier());
-
-            // Shitmed Change Start
-            if (!HasComp<TargetingComponent>(uid))
-                return;
-
-            foreach (var (part, _) in _body.GetBodyChildren(uid))
-            {
-                if (!TryComp(part, out DamageableComponent? damageComp))
-                    continue;
-
-                ChangeAllDamage(part, damageComp, addedValue);
-            }
-            // Shitmed Change End
         }
 
-        public void SetDamageModifierSetId(EntityUid uid, string? damageModifierSetId, DamageableComponent? comp = null)
+        public void SetDamageModifierSetId(EntityUid uid, string damageModifierSetId, DamageableComponent? comp = null)
         {
             if (!_damageableQuery.Resolve(uid, ref comp))
                 return;
@@ -356,27 +317,7 @@ 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,
-        TargetBodyPart? TargetPart = null, // Shitmed Change
-        bool CanEvade = false, // Lavaland Change
-        bool Cancelled = false);
-
-    /// <summary>
-    ///     Shitmed Change: Raised on parts before damage is done so we can cancel the damage if they evade.
-    /// </summary>
-    [ByRefEvent]
-    public record struct TryChangePartDamageEvent(
-        DamageSpecifier Damage,
-        EntityUid? Origin = null,
-        TargetBodyPart? TargetPart = null,
-        bool IgnoreResistances = false,
-        bool CanSever = true,
-        bool CanEvade = false,
-        float PartMultiplier = 1.00f,
-        bool Evaded = false,
-        bool Cancelled = false);
+    public record struct BeforeDamageChangedEvent(DamageSpecifier Damage, EntityUid? Origin = null, bool Cancelled = false);
 
     /// <summary>
     ///     Raised on an entity when damage is about to be dealt,
@@ -389,17 +330,18 @@ 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; // Shitmed Change
+        public BodyPartType BodyPartType; // WD EDIT
 
-        public DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null, TargetBodyPart? targetPart = null) // Shitmed Change
+        public DamageModifyEvent(DamageSpecifier damage, EntityUid? origin = null, BodyPartType bodyPartType = BodyPartType.None) // WD EDIT
         {
             OriginalDamage = damage;
             Damage = damage;
             Origin = origin;
-            TargetPart = targetPart; // Shitmed Change
+            BodyPartType = bodyPartType; // WD EDIT
         }
     }
 
@@ -438,17 +380,12 @@ public sealed class DamageChangedEvent : EntityEventArgs
         /// </summary>
         public readonly EntityUid? Origin;
 
-        /// <summary>
-        ///     Shitmed Change: Can this damage event sever parts?
-        /// </summary>
-        public readonly bool CanSever;
-
-        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin, bool canSever = true) // Shitmed Change
+        public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damageDelta, bool interruptsDoAfters, EntityUid? origin)
         {
             Damageable = damageable;
             DamageDelta = damageDelta;
             Origin = origin;
-            CanSever = canSever; // Shitmed Change
+
             if (DamageDelta == null)
                 return;
 
@@ -463,4 +400,18 @@ public DamageChangedEvent(DamageableComponent damageable, DamageSpecifier? damag
             InterruptsDoAfters = interruptsDoAfters && DamageIncreased;
         }
     }
+
+    // WD EDIT START
+    /// <summary>
+    /// Raised before damage is applied to a Damageable.
+    /// </summary>
+    [ByRefEvent]
+    public sealed class BeforeDamageCommitEvent(DamageSpecifier damage, bool ignoreResistances, BodyPartType bodyPartType) : HandledEntityEventArgs
+    {
+        public DamageSpecifier Damage = damage;
+
+        public readonly bool IgnoreResistances = ignoreResistances;
+        public readonly BodyPartType BodyPartType = bodyPartType;
+    }
+    // WD EDIT END
 }
diff --git a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
index e750863e243..9262de7ee72 100644
--- a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
+++ b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
@@ -47,7 +47,7 @@ public override void Update(float frameTime)
             foreach (var allowedState in comp.AllowedStates)
             {
                 if(allowedState == mobState.CurrentState)
-                    _damageable.TryChangeDamage(uid, comp.Damage, true, false, damage);
+                    _damageable.TryChangeDamage(uid, comp.Damage, true, false, damage, bodyPartType: comp.BodyPartType); // WD EDIT
             }
         }
     }
diff --git a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
index 0ed206d5d3b..9b235dffa41 100644
--- a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs
@@ -106,7 +106,7 @@ private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDo
             }
 
             var modifiedDamage = _damageable.TryChangeDamage(args.Target, GetDamage(uid, component, args.Component.Thrower),
-                component.IgnoreResistances, origin: args.Component.Thrower, targetPart: args.TargetPart);
+                component.IgnoreResistances, origin: args.Component.Thrower, bodyPartType: args.BodyPartType); // WD EDIT
 
             // Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
             if (modifiedDamage != null)
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
index 1fc61e3f032..20e29ef4341 100644
--- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Rejuvenate;
 using Content.Shared.Slippery;
 using Content.Shared.StatusEffect;
-using Content.Shared.Body.Systems; // Shitmed Change
 
 namespace Content.Shared.Damage.Systems;
 
@@ -10,8 +9,6 @@ public abstract class SharedGodmodeSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
 
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!; // Shitmed Change
-
     public override void Initialize()
     {
         base.Initialize();
@@ -52,10 +49,7 @@ public virtual void EnableGodmode(EntityUid uid, GodmodeComponent? godmode = nul
         }
 
         // Rejuv to cover other stuff
-        
         RaiseLocalEvent(uid, new RejuvenateEvent());
-        foreach (var (id, _) in _bodySystem.GetBodyChildren(uid)) // Shitmed Change
-            EnableGodmode(id);
     }
 
     public virtual void DisableGodmode(EntityUid uid, GodmodeComponent? godmode = null)
@@ -69,9 +63,6 @@ public virtual void DisableGodmode(EntityUid uid, GodmodeComponent? godmode = nu
         }
 
         RemComp<GodmodeComponent>(uid);
-
-        foreach (var (id, _) in _bodySystem.GetBodyChildren(uid)) // Shitmed Change
-            DisableGodmode(id);
     }
 
     /// <summary>
@@ -90,4 +81,4 @@ public bool ToggleGodmode(EntityUid uid)
         EnableGodmode(uid, godmode);
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/DeviceNetwork/Components/NetworkConfiguratorComponent.cs b/Content.Shared/DeviceNetwork/Components/NetworkConfiguratorComponent.cs
index 05567c71dcd..27c74a9640a 100644
--- a/Content.Shared/DeviceNetwork/Components/NetworkConfiguratorComponent.cs
+++ b/Content.Shared/DeviceNetwork/Components/NetworkConfiguratorComponent.cs
@@ -56,7 +56,4 @@ public sealed partial class NetworkConfiguratorComponent : Component
 
     [DataField]
     public SoundSpecifier SoundSwitchMode = new SoundPathSpecifier("/Audio/Machines/quickbeep.ogg");
-
-    [DataField]
-    public bool ShowLabel = true; // Shitmed - Starlight Abductors Change
 }
diff --git a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index a650ef72f80..1d5e90202d2 100644
--- a/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Disposal.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
index e4a98a9ffed..4f77a271b37 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
@@ -1,14 +1,9 @@
 using Content.Shared.Gravity;
 using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Physics;
 using Robust.Shared.Utility;
 
-// Shitmed Change
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared.Silicons.StationAi;
-
 namespace Content.Shared.DoAfter;
 
 public abstract partial class SharedDoAfterSystem : EntitySystem
@@ -16,7 +11,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
     [Dependency] private readonly IDynamicTypeFactory _factory = default!;
     [Dependency] private readonly SharedGravitySystem _gravity = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
 
     private DoAfter[] _doAfters = Array.Empty<DoAfter>();
 
@@ -176,7 +170,7 @@ private bool ShouldCancel(DoAfter doAfter,
         if (args.BreakOnMove && !(!args.BreakOnWeightlessMove && _gravity.IsWeightless(args.User, xform: userXform)))
         {
             // Whether the user has moved too much from their original position.
-            if (!_transform.InRange(userXform.Coordinates, doAfter.UserPosition, args.MovementThreshold))
+            if (!userXform.Coordinates.InRange(EntityManager, _transform, doAfter.UserPosition, args.MovementThreshold))
                 return true;
 
             // Whether the distance between the user and target(if any) has changed too much.
@@ -223,26 +217,19 @@ private bool ShouldCancel(DoAfter doAfter,
         if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))
             return true;
 
-        // Check if the do-after requires hands to perform at first
-        // For example, you need hands to strip clothes off of someone
-        // This does not mean their hand needs to be empty.
         if (args.NeedHand)
         {
             if (!handsQuery.TryGetComponent(args.User, out var hands) || hands.Count == 0)
                 return true;
 
-            // If an item was in the user's hand to begin with,
-            // check if the user is no longer holding the item.
-            if (args.BreakOnDropItem && doAfter.InitialItem != null && !_hands.IsHolding((args.User, hands), doAfter.InitialItem))
-                    return true;
-
-            // If the user changes which hand is active at all, interrupt the do-after
-            if (args.BreakOnHandChange && hands.ActiveHand?.Name != doAfter.InitialHand)
+            if (args.BreakOnHandChange && (hands.ActiveHand?.Name != doAfter.InitialHand
+                                           || hands.ActiveHandEntity != doAfter.InitialItem))
+            {
                 return true;
+            }
         }
 
-        var hasNoSpecificComponents = !HasComp<StationAiOverlayComponent>(args.User) && !HasComp<AbductorScientistComponent>(args.User); // Shitmed Change
-        if (args.RequireCanInteract && !_actionBlocker.CanInteract(args.User, args.Target) && hasNoSpecificComponents) // Shitmed Change
+        if (args.RequireCanInteract && !_actionBlocker.CanInteract(args.User, args.Target))
             return true;
 
 
diff --git a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
index 9753756933b..4d73eb30f53 100644
--- a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
+++ b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs
@@ -1,7 +1,7 @@
 using System.Linq;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Alert;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
@@ -262,7 +262,7 @@ public bool TryEnsnare(EntityUid target, EntityUid ensnare, EnsnaringComponent c
         // Need to insert before free legs check.
         Container.Insert(ensnare, ensnareable.Container);
 
-        var legs = _body.GetBodyChildrenOfType(target, BodyPartType.Leg).Count();
+        var legs = _body.GetBodyParts(target, BodyPartType.Leg).Count(); // WD EDIT
         var ensnaredLegs = (2 * ensnareable.Container.ContainedEntities.Count);
         var freeLegs = legs - ensnaredLegs;
 
diff --git a/Content.Shared/Eye/VisibilityFlags.cs b/Content.Shared/Eye/VisibilityFlags.cs
index d483e39c6ec..7905c07a76f 100644
--- a/Content.Shared/Eye/VisibilityFlags.cs
+++ b/Content.Shared/Eye/VisibilityFlags.cs
@@ -14,6 +14,5 @@ public enum VisibilityFlags : int
         Ethereal = 1 << 3,
         TelegnosticProjection = 5,
         AGhost = 1 << 5, // WD EDIT
-        Abductor = 1 << 10, // I HATE BITWISE OPERATIONS!! GRAAAAH
     }
 }
diff --git a/Content.Shared/FixedPoint/FixedPoint2.cs b/Content.Shared/FixedPoint/FixedPoint2.cs
index 33a9d25bc27..4f77c04e0cf 100644
--- a/Content.Shared/FixedPoint/FixedPoint2.cs
+++ b/Content.Shared/FixedPoint/FixedPoint2.cs
@@ -237,7 +237,7 @@ public static int Sign(FixedPoint2 value)
 
         public static FixedPoint2 Abs(FixedPoint2 a)
         {
-            return FixedPoint2.New(Math.Abs(a.Value));
+            return FromCents(Math.Abs(a.Value)); // WD EDIT: no multiply value by 100
         }
 
         public static FixedPoint2 Dist(FixedPoint2 a, FixedPoint2 b)
diff --git a/Content.Shared/Friends/Systems/PettableFriendSystem.cs b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
index ba18160cff7..00a4ddd155c 100644
--- a/Content.Shared/Friends/Systems/PettableFriendSystem.cs
+++ b/Content.Shared/Friends/Systems/PettableFriendSystem.cs
@@ -5,7 +5,6 @@
 using Content.Shared.NPC.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Timing;
-using Content.Shared._Shitmed.Spawners.EntitySystems; // Shitmed Change
 
 namespace Content.Shared.Friends.Systems;
 
@@ -27,7 +26,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<PettableFriendComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<PettableFriendComponent, GotRehydratedEvent>(OnRehydrated);
-        SubscribeLocalEvent<PettableFriendComponent, SpawnerSpawnedEvent>(OnSpawned); // Shitmed Change
     }
 
     private void OnUseInHand(Entity<PettableFriendComponent> ent, ref UseInHandEvent args)
@@ -61,13 +59,4 @@ private void OnRehydrated(Entity<PettableFriendComponent> ent, ref GotRehydrated
 
         _factionException.IgnoreEntities(args.Target, comp.Ignored);
     }
-
-    // Shitmed Change
-    private void OnSpawned(Entity<PettableFriendComponent> ent, ref SpawnerSpawnedEvent args)
-    {
-        if (!TryComp<FactionExceptionComponent>(ent, out var comp))
-            return;
-
-        _factionException.IgnoreEntities(args.Entity, comp.Ignored);
-    }
 }
diff --git a/Content.Shared/Gibbing/Events/GibbingEvents.cs b/Content.Shared/Gibbing/Events/GibbingEvents.cs
deleted file mode 100644
index 949b10eab9a..00000000000
--- a/Content.Shared/Gibbing/Events/GibbingEvents.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Gibbing.Events;
-
-
-
-/// <summary>
-/// Called just before we actually gib the target entity
-/// </summary>
-/// <param name="Target">The entity being gibed</param>
-/// <param name="GibType">What type of gibbing is occuring</param>
-/// <param name="AllowedContainers">Containers we are allow to gib</param>
-/// <param name="ExcludedContainers">Containers we are allow not allowed to gib</param>
-[ByRefEvent] public record struct AttemptEntityContentsGibEvent(
-    EntityUid Target,
-    GibContentsOption GibType,
-    List<string>? AllowedContainers,
-    List<string>? ExcludedContainers
-    );
-
-
-/// <summary>
-/// Called just before we actually gib the target entity
-/// </summary>
-/// <param name="Target">The entity being gibed</param>
-/// <param name="GibletCount">how many giblets to spawn</param>
-/// <param name="GibType">What type of gibbing is occuring</param>
-[ByRefEvent] public record struct AttemptEntityGibEvent(EntityUid Target, int GibletCount, GibType GibType);
-
-/// <summary>
-/// Called immediately after we gib the target entity
-/// </summary>
-/// <param name="Target">The entity being gibbed</param>
-/// <param name="DroppedEntities">Any entities that are spilled out (if any)</param>
-[ByRefEvent] public record struct EntityGibbedEvent(EntityUid Target, List<EntityUid> DroppedEntities);
-
-[Serializable, NetSerializable]
-public enum GibType : byte
-{
-    Skip,
-    Drop,
-    Gib,
-}
-
-public enum GibContentsOption : byte
-{
-    Skip,
-    Drop,
-    Gib
-}
diff --git a/Content.Shared/Gibbing/Systems/GibbingSystem.cs b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
deleted file mode 100644
index 1871152d424..00000000000
--- a/Content.Shared/Gibbing/Systems/GibbingSystem.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Numerics;
-using Content.Shared.Gibbing.Components;
-using Content.Shared.Gibbing.Events;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Gibbing.Systems;
-
-public sealed class GibbingSystem : EntitySystem
-{
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    //TODO: (future optimization) implement a system that "caps" giblet entities by deleting the oldest ones once we reach a certain limit, customizable via CVAR
-
-    /// <summary>
-    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
-    /// work on the target and any entities it contains (depending on gibContentsOption)
-    /// </summary>
-    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
-    /// <param name="gibbable">Target entity/comp we wish to gib</param>
-    /// <param name="gibType">What type of gibing are we performing</param>
-    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
-    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
-    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
-    /// <param name="playAudio">Should we play audio</param>
-    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
-    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
-    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
-    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
-    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
-    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
-    /// /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
-    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
-    /// <returns>True if successful, false if not</returns>
-    public bool TryGibEntity(EntityUid outerEntity, Entity<GibbableComponent?> gibbable, GibType gibType,
-        GibContentsOption gibContentsOption,
-        out HashSet<EntityUid> droppedEntities, bool launchGibs = true,
-        Vector2 launchDirection = default, float launchImpulse = 0f, float launchImpulseVariance = 0f,
-        Angle launchCone = default,
-        float randomSpreadMod = 1.0f, bool playAudio = true, List<string>? allowedContainers = null,
-        List<string>? excludedContainers = null, bool logMissingGibable = false)
-    {
-        droppedEntities = new();
-        return TryGibEntityWithRef(outerEntity, gibbable, gibType, gibContentsOption, ref droppedEntities,
-            launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone, randomSpreadMod, playAudio,
-            allowedContainers, excludedContainers, logMissingGibable);
-    }
-
-
-    /// <summary>
-    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
-    /// work on the target and any entities it contains (depending on gibContentsOption)
-    /// </summary>
-    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
-    /// <param name="gibbable">Target entity/comp we wish to gib</param>
-    /// <param name="gibType">What type of gibing are we performing</param>
-    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
-    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
-    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
-    /// <param name="playAudio">Should we play audio</param>
-    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
-    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
-    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
-    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
-    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
-    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
-    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
-    /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
-    /// <returns>True if successful, false if not</returns>
-    public bool TryGibEntityWithRef(
-        EntityUid outerEntity,
-        Entity<GibbableComponent?> gibbable,
-        GibType gibType,
-        GibContentsOption gibContentsOption,
-        ref HashSet<EntityUid> droppedEntities,
-        bool launchGibs = true,
-        Vector2? launchDirection = null,
-        float launchImpulse = 0f,
-        float launchImpulseVariance = 0f,
-        Angle launchCone = default,
-        float randomSpreadMod = 1.0f,
-        bool playAudio = true,
-        List<string>? allowedContainers = null,
-        List<string>? excludedContainers = null,
-        bool logMissingGibable = false)
-    {
-        if (!Resolve(gibbable, ref gibbable.Comp, logMissing: false))
-        {
-            DropEntity(gibbable, Transform(outerEntity), randomSpreadMod, ref droppedEntities,
-                launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-            if (logMissingGibable)
-            {
-                Log.Warning($"{ToPrettyString(gibbable)} does not have a GibbableComponent! " +
-                            $"This is not required but may cause issues contained items to not be dropped.");
-            }
-
-            return false;
-        }
-
-        if (gibType == GibType.Skip && gibContentsOption == GibContentsOption.Skip)
-            return true;
-        if (launchGibs)
-        {
-            randomSpreadMod = 0;
-        }
-
-        var parentXform = Transform(outerEntity);
-        HashSet<BaseContainer> validContainers = new();
-        var gibContentsAttempt =
-            new AttemptEntityContentsGibEvent(gibbable, gibContentsOption, allowedContainers, excludedContainers);
-        RaiseLocalEvent(gibbable, ref gibContentsAttempt);
-
-        foreach (var container in _containerSystem.GetAllContainers(gibbable))
-        {
-            var valid = true;
-            if (allowedContainers != null)
-                valid = allowedContainers.Contains(container.ID);
-            if (excludedContainers != null)
-                valid = valid && !excludedContainers.Contains(container.ID);
-            if (valid)
-                validContainers.Add(container);
-        }
-
-        switch (gibContentsOption)
-        {
-            case GibContentsOption.Skip:
-                break;
-            case GibContentsOption.Drop:
-            {
-                foreach (var container in validContainers)
-                {
-                    var entities = container.ContainedEntities.ToList();
-                    foreach(var ent in entities)
-                    {
-                        DropEntity(new Entity<GibbableComponent?>(ent, null), parentXform, randomSpreadMod,
-                            ref droppedEntities, launchGibs,
-                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                    }
-                }
-
-                break;
-            }
-            case GibContentsOption.Gib:
-            {
-                foreach (var container in validContainers)
-                {
-                    var entities = container.ContainedEntities.ToList();
-                    foreach(var ent in entities)
-                    {
-                        GibEntity(new Entity<GibbableComponent?>(ent, null), parentXform, randomSpreadMod,
-                            ref droppedEntities, launchGibs,
-                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                    }
-                }
-
-                break;
-            }
-        }
-
-        switch (gibType)
-        {
-            case GibType.Skip:
-                break;
-            case GibType.Drop:
-            {
-                DropEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, launchGibs,
-                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                break;
-            }
-            case GibType.Gib:
-            {
-                GibEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, launchGibs,
-                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
-                break;
-            }
-        }
-
-        if (playAudio)
-        {
-            _audioSystem.PlayPredicted(gibbable.Comp.GibSound, parentXform.Coordinates, null);
-        }
-
-        if (gibType == GibType.Gib)
-            QueueDel(gibbable);
-        return true;
-    }
-
-    private void DropEntity(Entity<GibbableComponent?> gibbable, TransformComponent parentXform, float randomSpreadMod,
-        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
-        float scatterImpulseVariance, Angle scatterCone)
-    {
-        var gibCount = 0;
-        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
-        {
-            gibCount = gibbable.Comp.GibCount;
-        }
-
-        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
-        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
-        switch (gibAttemptEvent.GibType)
-        {
-            case GibType.Skip:
-                return;
-            case GibType.Gib:
-                GibEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, flingEntity, scatterDirection,
-                    scatterImpulse, scatterImpulseVariance, scatterCone, deleteTarget: false);
-                return;
-        }
-
-        _transformSystem.AttachToGridOrMap(gibbable);
-        _transformSystem.SetCoordinates(gibbable, parentXform.Coordinates);
-        _transformSystem.SetWorldRotation(gibbable, _random.NextAngle());
-        droppedEntities.Add(gibbable);
-        if (flingEntity)
-        {
-            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
-        }
-
-        var gibbedEvent = new EntityGibbedEvent(gibbable, new List<EntityUid> {gibbable});
-        RaiseLocalEvent(gibbable, ref gibbedEvent);
-    }
-
-    private List<EntityUid> GibEntity(Entity<GibbableComponent?> gibbable, TransformComponent parentXform,
-        float randomSpreadMod,
-        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
-        float scatterImpulseVariance, Angle scatterCone, bool deleteTarget = true)
-    {
-        var localGibs = new List<EntityUid>();
-        var gibCount = 0;
-        var gibProtoCount = 0;
-        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
-        {
-            gibCount = gibbable.Comp.GibCount;
-            gibProtoCount = gibbable.Comp.GibPrototypes.Count;
-        }
-
-        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
-        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
-        switch (gibAttemptEvent.GibType)
-        {
-            case GibType.Skip:
-                return localGibs;
-            case GibType.Drop:
-                DropEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, flingEntity,
-                    scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
-                localGibs.Add(gibbable);
-                return localGibs;
-        }
-
-        if (gibbable.Comp != null && gibProtoCount > 0)
-        {
-            if (flingEntity)
-            {
-                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
-                {
-                    if (!TryCreateRandomGiblet(gibbable.Comp, parentXform.Coordinates, false, out var giblet,
-                            randomSpreadMod))
-                        continue;
-                    FlingDroppedEntity(giblet.Value, scatterDirection, scatterImpulse, scatterImpulseVariance,
-                        scatterCone);
-                    droppedEntities.Add(giblet.Value);
-                }
-            }
-            else
-            {
-                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
-                {
-                    if (TryCreateRandomGiblet(gibbable.Comp, parentXform.Coordinates, false, out var giblet,
-                            randomSpreadMod))
-                        droppedEntities.Add(giblet.Value);
-                }
-            }
-        }
-
-        _transformSystem.AttachToGridOrMap(gibbable, Transform(gibbable));
-        if (flingEntity)
-        {
-            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
-        }
-
-        var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
-        RaiseLocalEvent(gibbable, ref gibbedEvent);
-        if (deleteTarget)
-            QueueDel(gibbable);
-        return localGibs;
-    }
-
-
-    public bool TryCreateRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
-        float randomSpreadModifier = 1.0f, bool playSound = true)
-    {
-        gibletEntity = null;
-        return Resolve(gibbable, ref gibbable.Comp) && TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates,
-            playSound, out gibletEntity, randomSpreadModifier);
-    }
-
-    public bool TryCreateAndFlingRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
-        Vector2 scatterDirection, float force, float scatterImpulseVariance, Angle scatterCone = default,
-        bool playSound = true)
-    {
-        gibletEntity = null;
-        if (!Resolve(gibbable, ref gibbable.Comp) ||
-            !TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates, playSound, out gibletEntity))
-            return false;
-        FlingDroppedEntity(gibletEntity.Value, scatterDirection, force, scatterImpulseVariance, scatterCone);
-        return true;
-    }
-
-    private void FlingDroppedEntity(EntityUid target, Vector2? direction, float impulse, float impulseVariance,
-        Angle scatterConeAngle)
-    {
-        var scatterAngle = direction?.ToAngle() ?? _random.NextAngle();
-        var scatterVector = _random.NextAngle(scatterAngle - scatterConeAngle / 2, scatterAngle + scatterConeAngle / 2)
-            .ToVec() * (impulse + _random.NextFloat(impulseVariance));
-        _physicsSystem.ApplyLinearImpulse(target, scatterVector);
-    }
-
-    private bool TryCreateRandomGiblet(GibbableComponent gibbable, EntityCoordinates coords,
-        bool playSound, [NotNullWhen(true)] out EntityUid? gibletEntity, float? randomSpreadModifier = null)
-    {
-        gibletEntity = null;
-        if (gibbable.GibPrototypes.Count == 0)
-            return false;
-        gibletEntity = Spawn(gibbable.GibPrototypes[_random.Next(0, gibbable.GibPrototypes.Count)],
-            randomSpreadModifier == null
-                ? coords
-                : coords.Offset(_random.NextVector2(gibbable.GibScatterRange * randomSpreadModifier.Value)));
-        if (playSound)
-            _audioSystem.PlayPredicted(gibbable.GibSound, coords, null);
-        _transformSystem.SetWorldRotation(gibletEntity.Value, _random.NextAngle());
-        return true;
-    }
-}
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index 3147606a71d..aa95a1b8fa6 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -22,7 +22,7 @@ public sealed partial class HandsComponent : Component
     [ViewVariables]
     public EntityUid? ActiveHandEntity => ActiveHand?.HeldEntity;
 
-    [ViewVariables]
+    [DataField] // WD EDIT
     public Dictionary<string, Hand> Hands = new();
 
     public int Count => Hands.Count;
@@ -89,14 +89,16 @@ public sealed partial class HandsComponent : Component
     public bool CanBeStripped = true;
 }
 
-[Serializable, NetSerializable]
-public sealed class Hand //TODO: This should definitely be a struct - Jezi
+[DataDefinition, Serializable, NetSerializable] // WD EDIT
+public sealed partial class Hand // WD EDIT
 {
-    [ViewVariables]
-    public string Name { get; }
+    // WD EDIT START
+    [DataField]
+    public string Name { get; set; }
 
-    [ViewVariables]
-    public HandLocation Location { get; }
+    [DataField]
+    public HandLocation Location { get; set; }
+    // WD EDIT END
 
     /// <summary>
     ///     The container used to hold the contents of this hand. Nullable because the client must get the containers via <see cref="ContainerManagerComponent"/>,
@@ -139,6 +141,7 @@ public HandsComponentState(HandsComponent handComp)
 /// </summary>
 /// <seealso cref="HandUILocation"/>
 /// <seealso cref="HandLocationExt"/>
+[Serializable, NetSerializable] // WD EDIT
 public enum HandLocation : byte
 {
     Left,
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index fa6ce655656..abdfe1eb1ef 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -33,6 +33,8 @@ public override void Initialize()
         InitializeDrop();
         InitializePickup();
         InitializeRelay();
+
+        SubscribeLocalEvent<HandsComponent, ComponentInit>(OnInit); // WD EDIT
     }
 
     public override void Shutdown()
@@ -41,6 +43,14 @@ public override void Shutdown()
         CommandBinds.Unregister<SharedHandsSystem>();
     }
 
+    // WD EDIT START
+    private void OnInit(EntityUid uid, HandsComponent component, ComponentInit args)
+    {
+        foreach (var hand in component.Hands.Values)
+            SetupHand((uid, component), hand);
+    }
+    // WD EDIT END
+
     public virtual void AddHand(EntityUid uid, string handName, HandLocation handLocation, HandsComponent? handsComp = null)
     {
         if (!Resolve(uid, ref handsComp, false))
@@ -49,18 +59,13 @@ public virtual void AddHand(EntityUid uid, string handName, HandLocation handLoc
         if (handsComp.Hands.ContainsKey(handName))
             return;
 
-        var container = ContainerSystem.EnsureContainer<ContainerSlot>(uid, handName);
-        container.OccludesLight = false;
-
-        var newHand = new Hand(handName, handLocation, container);
+        // WD EDIT START
+        var newHand = new Hand(handName, handLocation);
         handsComp.Hands.Add(handName, newHand);
-        AddToSortedHands(handsComp, handName, handLocation); // Shitmed Change
-
-        if (handsComp.ActiveHand == null)
-            SetActiveHand(uid, newHand, handsComp);
 
+        SetupHand((uid, handsComp), newHand);
         RaiseLocalEvent(uid, new HandCountChangedEvent(uid));
-        Dirty(uid, handsComp);
+        // WD EDIT END
     }
 
     public virtual void RemoveHand(EntityUid uid, string handName, HandsComponent? handsComp = null)
@@ -326,23 +331,19 @@ public int CountFreeableHands(Entity<HandsComponent> hands)
         return freeable;
     }
 
-    /// <summary>
-    /// Shitmed Change: This function checks when adding a hand for symmetries to determine where to add it in the sorted hands array.
-    /// </summary>
-    /// <param name="handsComp">The hands component that we're modifying.</param>
-    /// <param name="handName">The name of the hand we're adding.</param>
-    /// <param name="handLocation">The location/symmetry of the hand we're adding.</param>
-    public virtual void AddToSortedHands(HandsComponent handsComp, string handName, HandLocation handLocation)
+    // WD EDIT START
+    private void SetupHand(Entity<HandsComponent> entHand, Hand hand)
     {
-        var index = handLocation == HandLocation.Right
-            ? 0
-            : handLocation == HandLocation.Left
-                ? handsComp.SortedHands.Count
-                : handsComp.SortedHands.FindIndex(name => handsComp.Hands[name].Location == HandLocation.Right);
+        var container = ContainerSystem.EnsureContainer<ContainerSlot>(entHand, hand.Name);
+        container.OccludesLight = false;
+
+        entHand.Comp.SortedHands.Add(hand.Name);
+        hand.Container = container;
 
-        if (index == -1)
-            index = handsComp.SortedHands.Count;
+        if (entHand.Comp.ActiveHand == null)
+            SetActiveHand(entHand, hand, entHand.Comp);
 
-        handsComp.SortedHands.Insert(index, handName);
+        Dirty(entHand);
     }
+    // WD EDIT END
 }
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index 2483a8873ce..4dd1e5455d9 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -19,11 +19,8 @@ public sealed partial class HumanoidAppearanceComponent : Component
     [DataField, AutoNetworkedField]
     public MarkingSet MarkingSet = new();
 
-    [DataField]
-    public Dictionary<HumanoidVisualLayers, HumanoidSpeciesSpriteLayer> BaseLayers = new();
-
     [DataField, AutoNetworkedField]
-    public HashSet<HumanoidVisualLayers> PermanentlyHidden = new();
+    public HashSet<Enum> PermanentlyHidden = new(); // WD EDIT
 
     // Couldn't these be somewhere else?
 
@@ -45,15 +42,6 @@ public sealed partial class HumanoidAppearanceComponent : Component
     [DataField, AutoNetworkedField]
     public string CustomSpecieName = "";
 
-    /// <summary>
-    ///     Any custom base layers this humanoid might have. See:
-    ///     limb transplants (potentially), robotic arms, etc.
-    ///     Stored on the server, this is merged in the client into
-    ///     all layer settings.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new();
-
     /// <summary>
     ///     Current species. Dictates things like base body sprites,
     ///     base humanoid to spawn, etc.
@@ -78,7 +66,7 @@ public sealed partial class HumanoidAppearanceComponent : Component
     ///     on this humanoid layer, and any markings that sit above it.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public HashSet<HumanoidVisualLayers> HiddenLayers = new();
+    public HashSet<Enum> HiddenLayers = new(); // WD EDIT
 
     [DataField, AutoNetworkedField]
     public Sex Sex = Sex.Male;
@@ -102,7 +90,7 @@ public sealed partial class HumanoidAppearanceComponent : Component
     ///     Which layers of this humanoid that should be hidden on equipping a corresponding item..
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers> HideLayersOnEquip = [HumanoidVisualLayers.Hair];
+    public HashSet<Enum> HideLayersOnEquip = [HumanoidVisualLayers.Hair]; // WD EDIT
 
     /// <summary>
     /// DeltaV - let paradox anomaly be cloned
@@ -133,27 +121,3 @@ public sealed partial class HumanoidAppearanceComponent : Component
     public ProtoId<TTSVoicePrototype> Voice { get; set; } = SharedHumanoidAppearanceSystem.DefaultVoice;
     // WD EDIT END
 }
-
-[DataDefinition]
-[Serializable, NetSerializable]
-public readonly partial struct CustomBaseLayerInfo
-{
-    public CustomBaseLayerInfo(string? id, Color? color = null)
-    {
-        DebugTools.Assert(id == null || IoCManager.Resolve<IPrototypeManager>().HasIndex<HumanoidSpeciesSpriteLayer>(id));
-        Id = id;
-        Color = color;
-    }
-
-    /// <summary>
-    ///     ID of this custom base layer. Must be a <see cref="HumanoidSpeciesSpriteLayer"/>.
-    /// </summary>
-    [DataField]
-    public ProtoId<HumanoidSpeciesSpriteLayer>? Id { get; init; }
-
-    /// <summary>
-    ///     Color of this custom base layer. Null implies skin colour if the corresponding <see cref="HumanoidSpeciesSpriteLayer"/> is set to match skin.
-    /// </summary>
-    [DataField]
-    public Color? Color { get; init; }
-}
diff --git a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
index de5509f9321..c1ccce66fc8 100644
--- a/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
+++ b/Content.Shared/Humanoid/HumanoidVisualLayersExtension.cs
@@ -1,28 +1,9 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
+using Content.Shared._White.Body.Components;
 
 namespace Content.Shared.Humanoid
 {
     public static class HumanoidVisualLayersExtension
     {
-        public static bool HasSexMorph(HumanoidVisualLayers layer)
-        {
-            return layer switch
-            {
-                HumanoidVisualLayers.Chest => true,
-                HumanoidVisualLayers.Head => true,
-                _ => false
-            };
-        }
-
-        public static string GetSexMorph(HumanoidVisualLayers layer, Sex sex, string id)
-        {
-            if (!HasSexMorph(layer) || sex == Sex.Unsexed)
-                return id;
-
-            return $"{id}{sex}";
-        }
-
         /// <summary>
         ///     Sublayers. Any other layers that may visually depend on this layer existing.
         ///     For example, the head has layers such as eyes, hair, etc. depending on it.
@@ -30,7 +11,7 @@ public static string GetSexMorph(HumanoidVisualLayers layer, Sex sex, string id)
         /// <param name="layer"></param>
         /// <returns>Enumerable of layers that depend on that given layer. Empty, otherwise.</returns>
         /// <remarks>This could eventually be replaced by a body system implementation.</remarks>
-        public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers layer)
+        public static IEnumerable<Enum> Sublayers(HumanoidVisualLayers layer) // WD EDIT
         {
             switch (layer)
             {
@@ -80,72 +61,5 @@ public static IEnumerable<HumanoidVisualLayers> Sublayers(HumanoidVisualLayers l
                     yield break;
             }
         }
-
-        public static HumanoidVisualLayers? ToHumanoidLayers(this BodyPartComponent part)
-        {
-            switch (part.PartType)
-            {
-                case BodyPartType.Other:
-                    break;
-                case BodyPartType.Torso:
-                    return HumanoidVisualLayers.Chest;
-                case BodyPartType.Tail:
-                    return HumanoidVisualLayers.Tail;
-                case BodyPartType.Head:
-                    // use the Sublayers method to hide the rest of the parts,
-                    // if that's what you're looking for
-                    return HumanoidVisualLayers.Head;
-                case BodyPartType.Arm:
-                    switch (part.Symmetry)
-                    {
-                        case BodyPartSymmetry.None:
-                            break;
-                        case BodyPartSymmetry.Left:
-                            return HumanoidVisualLayers.LArm;
-                        case BodyPartSymmetry.Right:
-                            return HumanoidVisualLayers.RArm;
-                    }
-
-                    break;
-                case BodyPartType.Hand:
-                    switch (part.Symmetry)
-                    {
-                        case BodyPartSymmetry.None:
-                            break;
-                        case BodyPartSymmetry.Left:
-                            return HumanoidVisualLayers.LHand;
-                        case BodyPartSymmetry.Right:
-                            return HumanoidVisualLayers.RHand;
-                    }
-
-                    break;
-                case BodyPartType.Leg:
-                    switch (part.Symmetry)
-                    {
-                        case BodyPartSymmetry.None:
-                            break;
-                        case BodyPartSymmetry.Left:
-                            return HumanoidVisualLayers.LLeg;
-                        case BodyPartSymmetry.Right:
-                            return HumanoidVisualLayers.RLeg;
-                    }
-
-                    break;
-                case BodyPartType.Foot:
-                    switch (part.Symmetry)
-                    {
-                        case BodyPartSymmetry.None:
-                            break;
-                        case BodyPartSymmetry.Left:
-                            return HumanoidVisualLayers.LFoot;
-                        case BodyPartSymmetry.Right:
-                            return HumanoidVisualLayers.RFoot;
-                    }
-
-                    break;
-            }
-
-            return null;
-        }
     }
 }
diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
index d3337465d62..67254d33776 100644
--- a/Content.Shared/Humanoid/Markings/MarkingCategories.cs
+++ b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
@@ -13,6 +13,7 @@ public enum MarkingCategories : byte
         HeadSide,
         Snout,
         Chest,
+        Groin, // WD EDIT
         RightArm,
         RightHand,
         LeftArm,
diff --git a/Content.Shared/Humanoid/Markings/MarkingColoring.cs b/Content.Shared/Humanoid/Markings/MarkingColoring.cs
index a13481debfc..479db6cbfb4 100644
--- a/Content.Shared/Humanoid/Markings/MarkingColoring.cs
+++ b/Content.Shared/Humanoid/Markings/MarkingColoring.cs
@@ -54,12 +54,7 @@ MarkingSet markingSet
             for (var i = 0; i < prototype.Sprites.Count; i++)
             {
                 // Getting layer name
-                string? name = prototype.Sprites[i] switch
-                {
-                    SpriteSpecifier.Rsi rsi => rsi.RsiState,
-                    SpriteSpecifier.Texture texture => texture.TexturePath.Filename,
-                    _ => null
-                };
+                string? name = prototype.Sprites[i].State; // WD EDIT
                 if (name == null)
                 {
                     colors.Add(defaultColor);
diff --git a/Content.Shared/Humanoid/Markings/MarkingManager.cs b/Content.Shared/Humanoid/Markings/MarkingManager.cs
index 6ccb63fc42e..a081873967c 100644
--- a/Content.Shared/Humanoid/Markings/MarkingManager.cs
+++ b/Content.Shared/Humanoid/Markings/MarkingManager.cs
@@ -33,6 +33,11 @@ private void CachePrototypes()
 
             foreach (var prototype in _prototypeManager.EnumeratePrototypes<MarkingPrototype>())
             {
+                // WD EDIT START
+                foreach (var layerInfo in prototype.Sprites)
+                    layerInfo.MarkingId = prototype.ID;
+                // WD EDIT END
+
                 _index.Add(prototype);
                 markingDict[prototype.MarkingCategory].Add(prototype.ID, prototype);
             }
@@ -214,22 +219,21 @@ public bool CanBeApplied(string species, Sex sex, MarkingPrototype prototype, IP
             return true;
         }
 
-        public bool MustMatchSkin(string species, HumanoidVisualLayers layer, out float alpha, IPrototypeManager? prototypeManager = null)
+        public bool MustMatchSkin(string species, MarkingCategories categories, out float alpha, IPrototypeManager? prototypeManager = null) // WD EDIT
         {
             IoCManager.Resolve(ref prototypeManager);
             var speciesProto = prototypeManager.Index<SpeciesPrototype>(species);
-            if (
-                !prototypeManager.TryIndex(speciesProto.BodyTypes.First(), out BodyTypePrototype? baseBodyType) || // WD EDIT
-                !baseBodyType.Sprites.TryGetValue(layer, out var spriteName) || // WD EDIT
-                !prototypeManager.TryIndex(spriteName, out HumanoidSpeciesSpriteLayer? sprite) ||
-                !sprite.MarkingsMatchSkin
-            )
+            // WD EDIT START
+            if (!prototypeManager.TryIndex(speciesProto.MarkingPoints, out MarkingPointsPrototype? markingPoints)
+                || !markingPoints.Points.TryGetValue(categories, out var points)
+                || !points.MatchSkin)
             {
                 alpha = 1f;
                 return false;
             }
+            // WD EDIT END
 
-            alpha = sprite.LayerAlpha;
+            alpha = points.LayerAlpha; // WD EDIT
             return true;
         }
 
diff --git a/Content.Shared/Humanoid/Markings/MarkingPoints.cs b/Content.Shared/Humanoid/Markings/MarkingPoints.cs
index c83eb17fdad..3faf1a2c704 100644
--- a/Content.Shared/Humanoid/Markings/MarkingPoints.cs
+++ b/Content.Shared/Humanoid/Markings/MarkingPoints.cs
@@ -16,6 +16,14 @@ public sealed partial class MarkingPoints
     [DataField("defaultMarkings", customTypeSerializer:typeof(PrototypeIdListSerializer<MarkingPrototype>))]
     public List<string> DefaultMarkings = new();
 
+    // WD EDIT START: The marking code is cancer. But I'm too lazy to edit it, and it will cause a lot of problems with upstreams in the future. But sooner or later, this thing will need to be rewritten.
+    [DataField]
+    public bool MatchSkin;
+
+    [DataField]
+    public float LayerAlpha = 1.0f;
+    // WD EDIT END
+
     public static Dictionary<MarkingCategories, MarkingPoints> CloneMarkingPointDictionary(Dictionary<MarkingCategories, MarkingPoints> self)
     {
         var clone = new Dictionary<MarkingCategories, MarkingPoints>();
@@ -26,7 +34,11 @@ public static Dictionary<MarkingCategories, MarkingPoints> CloneMarkingPointDict
             {
                 Points = points.Points,
                 Required = points.Required,
-                DefaultMarkings = points.DefaultMarkings
+                DefaultMarkings = points.DefaultMarkings,
+                // WD EDIT START
+                MatchSkin = points.MatchSkin,
+                LayerAlpha = points.LayerAlpha
+                // WD EDIT END
             };
         }
 
diff --git a/Content.Shared/Humanoid/Markings/MarkingPrototype.cs b/Content.Shared/Humanoid/Markings/MarkingPrototype.cs
index 0710a1136e4..26368b4d8c2 100644
--- a/Content.Shared/Humanoid/Markings/MarkingPrototype.cs
+++ b/Content.Shared/Humanoid/Markings/MarkingPrototype.cs
@@ -1,4 +1,6 @@
+using Content.Shared._White.Body.Components;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Humanoid.Markings
@@ -11,9 +13,6 @@ public sealed partial class MarkingPrototype : IPrototype
 
         public string Name { get; private set; } = default!;
 
-        [DataField("bodyPart", required: true)]
-        public HumanoidVisualLayers BodyPart { get; private set; }
-
         [DataField("markingCategory", required: true)]
         public MarkingCategories MarkingCategory { get; private set; }
 
@@ -38,18 +37,65 @@ public sealed partial class MarkingPrototype : IPrototype
         [DataField]
         public MarkingColors Coloring { get; private set; } = new();
 
-        [DataField]
-        public Dictionary<string, string>? Shaders { get; private set; }
-
         [DataField]
         public string PreviewDirection { get; private set; } = "South";
 
         [DataField("sprites", required: true)]
-        public List<SpriteSpecifier> Sprites { get; private set; } = default!;
+        public List<MarkingLayerInfo> Sprites { get; private set; } = default!; // WD EDIT
 
         public Marking AsMarking()
         {
             return new Marking(ID, Sprites.Count);
         }
     }
+
+    // WD EDIT START
+    [DataDefinition, Serializable, NetSerializable]
+    public sealed partial class MarkingLayerInfo
+    {
+        public MarkingLayerInfo(MarkingLayerInfo other)
+        {
+            BodyPart = other.BodyPart;
+            Color = other.Color;
+            Layer = other.Layer;
+            MarkingId = other.MarkingId;
+            Organ = other.Organ;
+            ReplacementBodyPart = other.ReplacementBodyPart;
+            Shader = other.Shader;
+            Sprite = other.Sprite;
+            State = other.State;
+            Visible = other.Visible;
+        }
+
+        [DataField]
+        public BodyPartType BodyPart = BodyPartType.None;
+
+        [DataField]
+        public Color Color = Color.White;
+
+        [DataField(required:true)]
+        public Enum Layer { get; private set; } = null!;
+
+        [DataField]
+        public string MarkingId = string.Empty;
+
+        [DataField]
+        public OrganType Organ = OrganType.None;
+
+        [DataField]
+        public EntProtoId? ReplacementBodyPart;
+
+        [DataField]
+        public string? Shader;
+
+        [DataField]
+        public ResPath Sprite;
+
+        [DataField]
+        public string State = string.Empty;
+
+        [DataField]
+        public bool Visible = true;
+    }
+    // WD EDIT END
 }
diff --git a/Content.Shared/Humanoid/Markings/MarkingsSet.cs b/Content.Shared/Humanoid/Markings/MarkingsSet.cs
index 740e3a81050..b6a643d709f 100644
--- a/Content.Shared/Humanoid/Markings/MarkingsSet.cs
+++ b/Content.Shared/Humanoid/Markings/MarkingsSet.cs
@@ -189,7 +189,7 @@ public void EnsureSpecies(string species, Color? skinColor, MarkingManager? mark
                 foreach (var marking in list)
                 {
                     if (markingManager.TryGetMarking(marking, out var prototype) &&
-                        markingManager.MustMatchSkin(species, prototype.BodyPart, out var alpha, prototypeManager))
+                        markingManager.MustMatchSkin(species, prototype.MarkingCategory, out var alpha, prototypeManager)) // WD EDIT
                     {
                         marking.SetColor(skinColor.Value.WithAlpha(alpha));
                     }
diff --git a/Content.Shared/Humanoid/Prototypes/HumanoidProfilePrototype.cs b/Content.Shared/Humanoid/Prototypes/HumanoidProfilePrototype.cs
index bd023e2d21f..f7ed5f6a811 100644
--- a/Content.Shared/Humanoid/Prototypes/HumanoidProfilePrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/HumanoidProfilePrototype.cs
@@ -9,9 +9,6 @@ public sealed partial class HumanoidProfilePrototype : IPrototype
     [IdDataField]
     public string ID { get; private set; } = default!;
 
-    [DataField("customBaseLayers")]
-    public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers = new();
-
     [DataField("profile")]
     public HumanoidCharacterProfile Profile { get; private set; } = new();
 }
diff --git a/Content.Shared/Humanoid/Prototypes/HumanoidSpritePrototypes.cs b/Content.Shared/Humanoid/Prototypes/HumanoidSpritePrototypes.cs
deleted file mode 100644
index 47daae63ee1..00000000000
--- a/Content.Shared/Humanoid/Prototypes/HumanoidSpritePrototypes.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.Humanoid.Prototypes;
-
-/// <summary>
-///     Humanoid species sprite layer. This is what defines the base layer of
-///     a humanoid species sprite, and also defines how markings can appear over
-///     that sprite (or at least, the layer this sprite is on).
-/// </summary>
-[Prototype("humanoidBaseSprite")]
-public sealed partial class HumanoidSpeciesSpriteLayer : IPrototype
-{
-    [IdDataField]
-    public string ID { get; private set; } = default!;
-    /// <summary>
-    ///     The base sprite for this sprite layer. This is what
-    ///     will replace the empty layer tagged by the enum
-    ///     tied to this layer.
-    ///
-    ///     If this is null, no sprite will be displayed, and the
-    ///     layer will be invisible until otherwise set.
-    /// </summary>
-    [DataField("baseSprite")]
-    public SpriteSpecifier? BaseSprite { get; private set; }
-
-    /// <summary>
-    ///     The alpha of this layer. Ensures that
-    ///     this layer will start with this percentage
-    ///     of alpha.
-    /// </summary>
-    [DataField("layerAlpha")]
-    public float LayerAlpha { get; private set; } = 1.0f;
-
-    /// <summary>
-    ///     If this sprite layer should allow markings or not.
-    /// </summary>
-    [DataField("allowsMarkings")]
-    public bool AllowsMarkings { get; private set; } = true;
-
-    /// <summary>
-    ///     If this layer should always match the
-    ///     skin tone in a character profile.
-    /// </summary>
-    [DataField("matchSkin")]
-    public bool MatchSkin { get; private set; } = true;
-
-    /// <summary>
-    ///     If any markings that go on this layer should
-    ///     match the skin tone of this part, including
-    ///     alpha.
-    /// </summary>
-    [DataField("markingsMatchSkin")]
-    public bool MarkingsMatchSkin { get; private set; }
-}
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index b21d565d9aa..a7e9a6901d6 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Humanoid.Prototypes;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
@@ -41,14 +42,6 @@ public sealed partial class SpeciesPrototype : IPrototype
     // sprite layout, and leave this null. Keep in mind that this will disable
     // sprite accessories.
 
-    // WD EDIT START
-    /// <summary>
-    ///     Default body type for this species.
-    /// </summary>
-    [DataField(required: true)]
-    public List<string> BodyTypes { get; } = default!;
-    // WD EDIT END
-
     /// <summary>
     ///     Default skin tone for this species. This applies for non-human skin tones.
     /// </summary>
@@ -192,6 +185,14 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// </summary>
     [DataField]
     public int BonusTraitPoints;
+
+    // WD EDIT START
+    /// <summary>
+    ///     Default body type for this species.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<BodyTypePrototype>> BodyTypes { get; } = new() { "Normal", };
+    // WD EDIT END
 }
 
 public enum SpeciesNaming : byte
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index d9862b51628..bb90dbd71e8 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -7,7 +7,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
-using Content.Shared._Shitmed.Humanoid.Events; // Shitmed Change
 using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
 using Content.Shared.HeightAdjust;
@@ -24,8 +23,10 @@
 using YamlDotNet.RepresentationModel;
 using Content.Shared._EE.GenderChange;
 using Content.Shared._White.Bark.Systems;
- 
- namespace Content.Shared.Humanoid;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+
+namespace Content.Shared.Humanoid;
 
 /// <summary>
 ///     HumanoidSystem. Primarily deals with the appearance and visual data
@@ -45,7 +46,10 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     [Dependency] private readonly ISerializationManager _serManager = default!;
     [Dependency] private readonly HeightAdjustSystem _heightAdjust = default!;
     [Dependency] private readonly ISharedPlayerManager _sharedPlayerManager = default!;
-    [Dependency] private readonly SharedBarkSystem _barkSystem = default!; // WWDP EDIT
+     // WD EDIT SRART
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly SharedBarkSystem _bark = default!;
+    // wd EDIT END
 
     [ValidatePrototypeId<SpeciesPrototype>]
     public const string DefaultSpecies = "Human";
@@ -61,7 +65,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
 
     // WD EDIT START
     [ValidatePrototypeId<BodyTypePrototype>]
-    public const string DefaultBodyType = "HumanNormal";
+    public const string DefaultBodyType = "Normal";
 
     public const string DefaultVoice = "Aidar";
     public const string DefaultBarkVoice = "Txt1";
@@ -123,10 +127,6 @@ private void OnInit(EntityUid uid, HumanoidAppearanceComponent humanoid, Compone
             return;
         }
 
-        // Do this first, because profiles currently do not support custom base layers
-        foreach (var (layer, info) in startingSet.CustomBaseLayers)
-            humanoid.CustomBaseLayers.Add(layer, info);
-
         LoadProfile(uid, startingSet.Profile, humanoid, false, false);
     }
 
@@ -161,7 +161,7 @@ private void OnExamined(EntityUid uid, HumanoidAppearanceComponent component, Ex
     /// <param name="layer">Layer to toggle visibility for</param>
     /// <param name="humanoid">Humanoid component of the entity</param>
     public void SetLayerVisibility(EntityUid uid,
-        HumanoidVisualLayers layer,
+        Enum layer, // WD EDIT
         bool visible,
         bool permanent = false,
         HumanoidAppearanceComponent? humanoid = null)
@@ -183,7 +183,7 @@ public void SetLayerVisibility(EntityUid uid,
     /// <param name="visible">The visibility state of the layers given</param>
     /// <param name="permanent">If this is a permanent change, or temporary. Permanent layers are stored in their own hash set.</param>
     /// <param name="humanoid">Humanoid component of the entity</param>
-    public void SetLayersVisibility(EntityUid uid, IEnumerable<HumanoidVisualLayers> layers, bool visible, bool permanent = false,
+    public void SetLayersVisibility(EntityUid uid, IEnumerable<Enum> layers, bool visible, bool permanent = false, // WD EDIT
         HumanoidAppearanceComponent? humanoid = null)
     {
         if (!Resolve(uid, ref humanoid))
@@ -201,7 +201,7 @@ public void SetLayersVisibility(EntityUid uid, IEnumerable<HumanoidVisualLayers>
     protected virtual void SetLayerVisibility(
         EntityUid uid,
         HumanoidAppearanceComponent humanoid,
-        HumanoidVisualLayers layer,
+        Enum layer, // WD EDIT
         bool visible,
         bool permanent,
         ref bool dirty)
@@ -245,8 +245,7 @@ public void SetSpecies(EntityUid uid, string species, bool sync = true, Humanoid
     }
 
     /// <summary>
-    ///     Sets the skin color of this humanoid mob. Will only affect base layers that are not custom,
-    ///     custom base layers should use <see cref="SetBaseLayerColor"/> instead.
+    ///     Sets the skin color of this humanoid mob.
     /// </summary>
     /// <param name="uid">The humanoid mob's UID.</param>
     /// <param name="skinColor">Skin color to set on the humanoid mob.</param>
@@ -266,50 +265,7 @@ public virtual void SetSkinColor(EntityUid uid, Color skinColor, bool sync = tru
 
         humanoid.SkinColor = skinColor;
 
-        if (sync)
-            Dirty(uid, humanoid);
-    }
-
-    /// <summary>
-    ///     Sets the base layer ID of this humanoid mob. A humanoid mob's 'base layer' is
-    ///     the skin sprite that is applied to the mob's sprite upon appearance refresh.
-    /// </summary>
-    /// <param name="uid">The humanoid mob's UID.</param>
-    /// <param name="layer">The layer to target on this humanoid mob.</param>
-    /// <param name="id">The ID of the sprite to use. See <see cref="HumanoidSpeciesSpriteLayer"/>.</param>
-    /// <param name="sync">Whether to synchronize this to the humanoid mob, or not.</param>
-    /// <param name="humanoid">Humanoid component of the entity</param>
-    public void SetBaseLayerId(EntityUid uid, HumanoidVisualLayers layer, string? id, bool sync = true,
-        HumanoidAppearanceComponent? humanoid = null)
-    {
-        if (!Resolve(uid, ref humanoid))
-            return;
-
-        if (humanoid.CustomBaseLayers.TryGetValue(layer, out var info))
-            humanoid.CustomBaseLayers[layer] = info with { Id = id };
-        else
-            humanoid.CustomBaseLayers[layer] = new(id);
-
-        if (sync)
-            Dirty(uid, humanoid);
-    }
-
-    /// <summary>
-    ///     Sets the color of this humanoid mob's base layer. See <see cref="SetBaseLayerId"/> for a
-    ///     description of how base layers work.
-    /// </summary>
-    /// <param name="uid">The humanoid mob's UID.</param>
-    /// <param name="layer">The layer to target on this humanoid mob.</param>
-    /// <param name="color">The color to set this base layer to.</param>
-    public void SetBaseLayerColor(EntityUid uid, HumanoidVisualLayers layer, Color? color, bool sync = true, HumanoidAppearanceComponent? humanoid = null)
-    {
-        if (!Resolve(uid, ref humanoid))
-            return;
-
-        if (humanoid.CustomBaseLayers.TryGetValue(layer, out var info))
-            humanoid.CustomBaseLayers[layer] = info with { Color = color };
-        else
-            humanoid.CustomBaseLayers[layer] = new(null, color);
+        _body.SetBodyColor(uid, skinColor, sync); // WD EDIT
 
         if (sync)
             Dirty(uid, humanoid);
@@ -363,7 +319,7 @@ public void SetTTSVoice(
     }
 
     /// <summary>
-    ///     Set a humanoid mob's body tupe. This will change their base sprites.
+    ///     Set a humanoid mob's body type. This will change their base sprites.
     /// </summary>
     /// <param name="uid">The humanoid mob's UID.</param>
     /// <param name="bodyType">The body type to set the mob to. Will return if the body type prototype was invalid.</param>
@@ -378,11 +334,32 @@ public void SetBodyType(
         if (!Resolve(uid, ref humanoid))
             return;
 
-        var speciesPrototype = _proto.Index<SpeciesPrototype>(humanoid.Species);
-        if (speciesPrototype.BodyTypes.Contains(bodyType))
-            humanoid.BodyType = bodyType;
-        else
-            humanoid.BodyType = speciesPrototype.BodyTypes.First();
+        var speciesPrototype = _proto.Index(humanoid.Species);
+        humanoid.BodyType = speciesPrototype.BodyTypes.Contains(bodyType) ? bodyType : speciesPrototype.BodyTypes.First();
+
+        if (sync)
+            Dirty(uid, humanoid);
+    }
+
+    /// <summary>
+    ///     Sets the eye color of this humanoid mob.
+    /// </summary>
+    /// <param name="uid">The humanoid mob's UID.</param>
+    /// <param name="eyeColor">Eyes color to set on the humanoid mob.</param>
+    /// <param name="sync">Whether to immediately synchronize this to the humanoid mob, or not.</param>
+    /// <param name="humanoid">Humanoid component of the entity</param>
+    public void SetEyeColor(
+        EntityUid uid,
+        Color eyeColor,
+        bool sync = true,
+        HumanoidAppearanceComponent? humanoid = null)
+    {
+        if (!Resolve(uid, ref humanoid))
+            return;
+
+        humanoid.EyeColor = eyeColor;
+
+        _body.SetBodyOrganColor(uid, eyeColor, OrganType.Eyes, sync); // WD EDIT
 
         if (sync)
             Dirty(uid, humanoid);
@@ -469,7 +446,7 @@ public virtual void LoadProfile(EntityUid uid,
         SetSex(uid, profile.Sex, false, humanoid);
         SetTTSVoice(uid, profile.Voice, false, humanoid); // WD EDIT
         SetBodyType(uid, profile.BodyType, false, humanoid); // WD EDIT
-        _barkSystem.ApplyBark(uid, profile.BarkVoice, profile.BarkSettings); // WD EDIT
+        _bark.ApplyBark(uid, profile.BarkVoice, profile.BarkSettings); // WD EDIT
 
         humanoid.Gender = profile.Gender;
         if (TryComp<GrammarComponent>(uid, out var grammar))
@@ -482,7 +459,7 @@ public virtual void LoadProfile(EntityUid uid,
 
         humanoid.CustomSpecieName = profile.Customspeciename;
 
-        humanoid.EyeColor = profile.Appearance.EyeColor;
+        SetEyeColor(uid, profile.Appearance.EyeColor, false, humanoid); // WD EDIT
         var ev = new EyeColorInitEvent();
         RaiseLocalEvent(uid, ref ev);
 
@@ -504,7 +481,12 @@ public virtual void LoadProfile(EntityUid uid,
 
         humanoid.LastProfileLoaded = profile; //But traits can also modify the profile so we need to set it again.
         Dirty(uid, humanoid);
-        RaiseLocalEvent(uid, new ProfileLoadFinishedEvent());
+
+        // WD EDIT START
+        _body.SetupBodyAppearance((uid, null, null, humanoid));
+        humanoid.ClientOldMarkings.Clear();
+        humanoid.ClientOldMarkings = new (humanoid.MarkingSet);
+        // WD EDIT END
     }
 
     public void SetMarkings(EntityUid uid, HumanoidCharacterProfile profile, HumanoidAppearanceComponent humanoid)
@@ -525,9 +507,9 @@ public void SetMarkings(EntityUid uid, HumanoidCharacterProfile profile, Humanoi
 
         // Hair/facial hair - this may eventually be deprecated.
         // We need to ensure hair before applying it or coloring can try depend on markings that can be invalid
-        var hairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.Hair, out var hairAlpha, _proto)
+        var hairColor = _markingManager.MustMatchSkin(profile.Species, MarkingCategories.Hair, out var hairAlpha, _proto) // WD EDIT
             ? profile.Appearance.SkinColor.WithAlpha(hairAlpha) : profile.Appearance.HairColor;
-        var facialHairColor = _markingManager.MustMatchSkin(profile.Species, HumanoidVisualLayers.FacialHair, out var facialHairAlpha, _proto)
+        var facialHairColor = _markingManager.MustMatchSkin(profile.Species, MarkingCategories.FacialHair, out var facialHairAlpha, _proto) // WD EDIT
             ? profile.Appearance.SkinColor.WithAlpha(facialHairAlpha) : profile.Appearance.FacialHairColor;
 
         if (_markingManager.Markings.TryGetValue(profile.Appearance.HairStyleId, out var hairPrototype) &&
diff --git a/Content.Shared/Humanoid/SharedHumanoidMarkingModifierSystem.cs b/Content.Shared/Humanoid/SharedHumanoidMarkingModifierSystem.cs
index 0af53b5b3c4..e136a6a0faa 100644
--- a/Content.Shared/Humanoid/SharedHumanoidMarkingModifierSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidMarkingModifierSystem.cs
@@ -22,21 +22,6 @@ public HumanoidMarkingModifierMarkingSetMessage(MarkingSet set, bool resendState
     }
 }
 
-[Serializable, NetSerializable]
-public sealed class HumanoidMarkingModifierBaseLayersSetMessage : BoundUserInterfaceMessage
-{
-    public HumanoidMarkingModifierBaseLayersSetMessage(HumanoidVisualLayers layer, CustomBaseLayerInfo? info, bool resendState)
-    {
-        Layer = layer;
-        Info = info;
-        ResendState = resendState;
-    }
-
-    public HumanoidVisualLayers Layer { get; }
-    public CustomBaseLayerInfo? Info { get; }
-    public bool ResendState { get; }
-}
-
 [Serializable, NetSerializable]
 public sealed class HumanoidMarkingModifierState : BoundUserInterfaceState
 {
@@ -47,7 +32,7 @@ public HumanoidMarkingModifierState(
         string bodyType, // WD EDIT
         Sex sex,
         Color skinColor,
-        Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> customBaseLayers
+        Color eyeColor // WD EDIT
     )
     {
         MarkingSet = markingSet;
@@ -55,7 +40,7 @@ Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> customBaseLayers
         BodyType = bodyType; // WD EDIT
         Sex = sex;
         SkinColor = skinColor;
-        CustomBaseLayers = customBaseLayers;
+        EyeColor = eyeColor; // WD EDIT
     }
 
     public MarkingSet MarkingSet { get; }
@@ -66,5 +51,4 @@ Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> customBaseLayers
     public Color EyeColor { get; }
     public Color? HairColor { get; }
     public Color? FacialHairColor { get; }
-    public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers { get; }
 }
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index f817e084030..7b9fd0ec2c5 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -71,16 +71,6 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ToggleCrawlingUnder = "ToggleCrawlingUnder";
         public static readonly BoundKeyFunction ToggleCombatMode = "ToggleCombatMode"; // WD EDIT
         public static readonly BoundKeyFunction LookUp = "LookUp"; // WD EDIT
-        public static readonly BoundKeyFunction TargetHead = "TargetHead";
-        public static readonly BoundKeyFunction TargetTorso = "TargetTorso";
-        public static readonly BoundKeyFunction TargetLeftArm = "TargetLeftArm";
-        public static readonly BoundKeyFunction TargetLeftHand = "TargetLeftHand";
-        public static readonly BoundKeyFunction TargetRightArm = "TargetRightArm";
-        public static readonly BoundKeyFunction TargetRightHand = "TargetRightHand";
-        public static readonly BoundKeyFunction TargetLeftLeg = "TargetLeftLeg";
-        public static readonly BoundKeyFunction TargetLeftFoot = "TargetLeftFoot";
-        public static readonly BoundKeyFunction TargetRightLeg = "TargetRightLeg";
-        public static readonly BoundKeyFunction TargetRightFoot = "TargetRightFoot";
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";
         public static readonly BoundKeyFunction ArcadeLeft = "ArcadeLeft";
@@ -98,6 +88,23 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ShuttleRotateRight = "ShuttleRotateRight";
         public static readonly BoundKeyFunction ShuttleBrake = "ShuttleBrake";
 
+        // WD EDIT START
+        public static readonly BoundKeyFunction TargetDollHead = "TargetDollHead";
+        public static readonly BoundKeyFunction TargetDollChest = "TargetDollChest";
+        public static readonly BoundKeyFunction TargetDollGroin = "TargetDollGroin";
+        public static readonly BoundKeyFunction TargetDollRightArm = "TargetDollRightArm";
+        public static readonly BoundKeyFunction TargetDollRightHand = "TargetDollRightHand";
+        public static readonly BoundKeyFunction TargetDollLeftArm = "TargetDollLeftArm";
+        public static readonly BoundKeyFunction TargetDollLeftHand = "TargetDollLeftHand";
+        public static readonly BoundKeyFunction TargetDollRightLeg = "TargetDollRightLeg";
+        public static readonly BoundKeyFunction TargetDollRightFoot = "TargetDollRightFoot";
+        public static readonly BoundKeyFunction TargetDollLeftLeg = "TargetDollLeftLeg";
+        public static readonly BoundKeyFunction TargetDollLeftFoot = "TargetDollLeftFoot";
+        public static readonly BoundKeyFunction TargetDollTail = "TargetDollTail";
+        public static readonly BoundKeyFunction TargetDollEyes = "TargetDollEyes";
+        public static readonly BoundKeyFunction TargetDollMouth = "TargetDollMouth";
+        // WD EDIT END
+
         public static readonly BoundKeyFunction Hotbar0 = "Hotbar0";
         public static readonly BoundKeyFunction Hotbar1 = "Hotbar1";
         public static readonly BoundKeyFunction Hotbar2 = "Hotbar2";
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 6df9163eb87..6b671a190f9 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -155,7 +155,7 @@ private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev
             if (!_actionBlockerSystem.CanInteract(ev.Actor, ev.Target))
             {
                 // We permit ghosts to open uis unless explicitly blocked
-                if (ev.Message is not OpenBoundInterfaceMessage || !HasComp<GhostComponent>(ev.Actor) || uiComp?.BlockSpectators == true || _tagSystem.HasTag(ev.Actor, "CantInteract")) // Shitmed Change
+                if (ev.Message is not OpenBoundInterfaceMessage || !HasComp<GhostComponent>(ev.Actor) || uiComp?.BlockSpectators == true)
                 {
                     ev.Cancel();
                     return;
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 8b059f29762..6a4755d5e0f 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -1,21 +1,19 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Random;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-// Shitmed Change
-using Content.Shared.Random;
-
 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!; // Shitmed Change
+    [Dependency] private readonly RandomHelperSystem _randomHelper = default!;
 
     private void InitializeSlots()
     {
@@ -198,7 +196,6 @@ private IEnumerable<string> ListViewVariablesSlots(EntityUid uid, InventoryCompo
         }
     }
 
-
     /// <summary>
     /// Change the inventory template ID an entity is using. The new template must be compatible.
     /// </summary>
@@ -236,12 +233,12 @@ public struct InventorySlotEnumerator
         private int _nextIdx = 0;
         public static InventorySlotEnumerator Empty = new(Array.Empty<SlotDefinition>(), Array.Empty<ContainerSlot>());
 
-        public InventorySlotEnumerator(InventoryComponent inventory, SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(InventoryComponent inventory,  SlotFlags flags = SlotFlags.All)
             : this(inventory.Slots, inventory.Containers, flags)
         {
         }
 
-        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers, SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers,  SlotFlags flags = SlotFlags.All)
         {
             DebugTools.Assert(flags != SlotFlags.NONE);
             DebugTools.AssertEqual(slots.Length, containers.Length);
@@ -314,7 +311,6 @@ public bool NextItem(out EntityUid item, [NotNullWhen(true)] out SlotDefinition?
         }
     }
 
-    // Shitmed Change Start
     public void DropSlotContents(EntityUid uid, string slotName, InventoryComponent? inventory = null)
     {
         if (!Resolve(uid, ref inventory))
@@ -339,5 +335,4 @@ public void DropSlotContents(EntityUid uid, string slotName, InventoryComponent?
 
         Dirty(uid, inventory);
     }
-    // Shitmed Change End
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Inventory/InventoryTemplatePrototype.cs b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
index 10f890f51f4..e54462c0b4b 100644
--- a/Content.Shared/Inventory/InventoryTemplatePrototype.cs
+++ b/Content.Shared/Inventory/InventoryTemplatePrototype.cs
@@ -70,9 +70,4 @@ public sealed partial class SlotDefinition
     ///     Entity blacklist for CanEquip checks, on spawn only.
     /// </summary>
     [DataField("spawnBlacklist")] public EntityWhitelist? SpawnBlacklist = null;
-
-    /// <summary>
-    ///     Is this slot disabled? Could be due to severing or other reasons.
-    /// </summary>
-    [DataField] public bool Disabled;
 }
diff --git a/Content.Shared/IoC/SharedContentIoC.cs b/Content.Shared/IoC/SharedContentIoC.cs
index 873401eef66..4f79e2ec4a0 100644
--- a/Content.Shared/IoC/SharedContentIoC.cs
+++ b/Content.Shared/IoC/SharedContentIoC.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Humanoid.Markings;
+using Content.Shared._White.Random;
+using Content.Shared.Humanoid.Markings;
 using Content.Shared.Localizations;
 using Content.Shared.Tag;
 using Content.Shared.Whitelist;
@@ -13,5 +14,6 @@ public static void Register()
         IoCManager.Register<ContentLocalizationManager, ContentLocalizationManager>();
         IoCManager.Register<TagSystem>();
         IoCManager.Register<EntityWhitelistSystem>();
+        IoCManager.Register<PredictedRandomManager>(); // WD EDIT
     }
 }
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 5554cd5d669..d04a2ad2f3e 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -1,8 +1,7 @@
 using System.Numerics;
 using Content.Shared._Goobstation.Religion;
+using Content.Shared._White.Gibbing;
 using Content.Shared.Actions;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
 using Content.Shared.Charges.Components;
 using Content.Shared.Charges.Systems;
 using Content.Shared.Chat;
@@ -56,7 +55,6 @@ public abstract class SharedMagicSystem : EntitySystem
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedDoorSystem _door = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
@@ -70,6 +68,7 @@ public abstract class SharedMagicSystem : EntitySystem
     [Dependency] private readonly SharedStunSystem _stun = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
     [Dependency] private readonly SharedChargesSystem _charges = default!;
+    [Dependency] private readonly SharedGibbingSystem _gibbing = default!; // WD EDIT
 
     private static readonly ProtoId<TagPrototype> InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell";
 
@@ -413,10 +412,7 @@ private void OnSmiteSpell(SmiteSpellEvent ev)
 
         _physics.ApplyLinearImpulse(ev.Target, impulseVector);
 
-        if (!TryComp<BodyComponent>(ev.Target, out var body))
-            return;
-
-        _body.GibBody(ev.Target, true, body);
+        _gibbing.GibBody(ev.Target, true); // WD EDIT
     }
 
     // End Touch Spells
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index cb2fbac55c4..c2da7914a3d 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -1,7 +1,7 @@
 using System.Linq;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Audio;
-using Content.Shared.Body.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.Emag.Components;
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index 891129a2ddc..247342f46a2 100644
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Medical.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
diff --git a/Content.Shared/Medical/HealingDoAfterEvent.cs b/Content.Shared/Medical/HealingDoAfterEvent.cs
index 96f61a1d679..8adfcdf622d 100644
--- a/Content.Shared/Medical/HealingDoAfterEvent.cs
+++ b/Content.Shared/Medical/HealingDoAfterEvent.cs
@@ -1,9 +1,20 @@
-using Content.Shared.DoAfter;
+using Content.Shared._White.Body.Components;
+using Content.Shared.DoAfter;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Medical;
 
+// WD EDITED
 [Serializable, NetSerializable]
-public sealed partial class HealingDoAfterEvent : SimpleDoAfterEvent
+public sealed partial class HealingDoAfterEvent : DoAfterEvent
 {
+    [DataField]
+    public BodyPartType BodyPartType;
+
+    public HealingDoAfterEvent(BodyPartType bodyPartType)
+    {
+        BodyPartType = bodyPartType;
+    }
+
+    public override DoAfterEvent Clone() => this;
 }
diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
index 6bd49886ecc..f66e8689ec4 100644
--- a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
+++ b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
@@ -1,4 +1,3 @@
-using Content.Shared._Shitmed.Targeting; // Shitmed Change
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.MedicalScanner;
@@ -15,27 +14,13 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
     public bool? ScanMode;
     public bool? Bleeding;
     public bool? Unrevivable;
-    public Dictionary<TargetBodyPart, TargetIntegrity>? Body; // Shitmed Change
-    public NetEntity? Part; // Shitmed Change
-    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable, Dictionary<TargetBodyPart, TargetIntegrity>? body, NetEntity? part = null) // Shitmed Change
+    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable)
     {
         TargetEntity = targetEntity;
         Temperature = temperature;
         BloodLevel = bloodLevel;
         ScanMode = scanMode;
         Bleeding = bleeding;
-        Body = body; // Shitmed Change
-        Part = part; // Shitmed Change
         Unrevivable = unrevivable;
     }
 }
-
-// Shitmed Change Start
-[Serializable, NetSerializable]
-public sealed class HealthAnalyzerPartMessage(NetEntity? owner, TargetBodyPart? bodyPart) : BoundUserInterfaceMessage
-{
-    public readonly NetEntity? Owner = owner;
-    public readonly TargetBodyPart? BodyPart = bodyPart;
-
-}
-// Shitmed Change End
\ No newline at end of file
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index 06cefe9b04b..db7a30e0cf7 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -563,9 +563,3 @@ public HashSet<Entity<MindComponent>> GetAliveHumans(EntityUid? exclude = null,
 /// <param name="Dead"></param>
 [ByRefEvent]
 public record struct GetCharactedDeadIcEvent(bool? Dead);
-
-/// <summary>
-///     Shitmed Change: Raised on an entity to notify that an objective has been added to the mind.
-/// </summary>
-/// <param name="Objective"></param>
-public record struct ObjectiveAddedEvent(EntityUid Objective);
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
index 8aa86629bbd..5928b3871ff 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.StateMachine.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Database;
 using Content.Shared.Mobs.Components;
-using Content.Shared.Body.Organ;
-using Content.Shared._Shitmed.Body.Organ; // Shitmed Change
+
 namespace Content.Shared.Mobs.Systems;
 
 public partial class MobStateSystem
@@ -104,9 +103,6 @@ private void ChangeState(EntityUid target, MobStateComponent component, MobState
         if (oldState == newState || !component.AllowedStates.Contains(newState))
             return;
 
-        if (oldState == MobState.Dead && HasComp<DebrainedComponent>(target))
-            return;
-
         OnExitState(target, component, oldState);
         component.CurrentState = newState;
         OnEnterState(target, component, newState);
diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
index 3f944369d3a..1858fe1616f 100644
--- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
+++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs
@@ -121,7 +121,7 @@ public bool TryGetThresholdForState(EntityUid target, MobState mobState,
         MobThresholdsComponent? thresholdComponent = null)
     {
         threshold = null;
-        if (!Resolve(target, ref thresholdComponent))
+        if (!Resolve(target, ref thresholdComponent, false)) // WD EDIT: TODO
             return false;
 
         foreach (var pair in thresholdComponent.Thresholds)
diff --git a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
index 9341168ba3e..5fd271b3f63 100644
--- a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
+++ b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Morgue.Components;
 using Content.Shared.Standing;
 using Content.Shared.Storage.Components;
diff --git a/Content.Shared/Movement/Events/MoveInputEvent.cs b/Content.Shared/Movement/Events/MoveInputEvent.cs
index 56fcc8dd193..93aace7fc0d 100644
--- a/Content.Shared/Movement/Events/MoveInputEvent.cs
+++ b/Content.Shared/Movement/Events/MoveInputEvent.cs
@@ -13,18 +13,13 @@ public readonly struct MoveInputEvent
 {
     public readonly Entity<InputMoverComponent> Entity;
     public readonly MoveButtons OldMovement;
-    public readonly Direction Dir; // Shitmed Change
-    public readonly bool State; // Shitmed Change
 
     public bool HasDirectionalMovement => (Entity.Comp.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None;
 
-    public MoveInputEvent(Entity<InputMoverComponent> entity, MoveButtons oldMovement, Direction dir, bool state) // Shitmed Change
+    public MoveInputEvent(Entity<InputMoverComponent> entity, MoveButtons oldMovement)
     {
         Entity = entity;
         OldMovement = oldMovement;
-        // Shitmed Change
-        Dir = dir;
-        State = state;
     }
 }
 
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index a4c5eac9beb..126d8bf7c75 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -14,7 +14,6 @@
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Robust.Shared.Maths; // Shitmed Change
 
 namespace Content.Shared.Movement.Systems
 {
@@ -95,12 +94,7 @@ protected void SetMoveInput(Entity<InputMoverComponent> entity, MoveButtons butt
 
             // Relay the fact we had any movement event.
             // TODO: Ideally we'd do these in a tick instead of out of sim.
-            // Shitmed Change Start
-            Vector2 vector2 = DirVecForButtons(buttons);
-            Vector2i vector2i = new Vector2i((int) vector2.X, (int) vector2.Y);
-            Direction dir = (vector2i == Vector2i.Zero) ? Direction.Invalid : vector2i.AsDirection();
-            var moveEvent = new MoveInputEvent(entity, buttons, dir, buttons != 0);
-            // Shitmed Change End
+            var moveEvent = new MoveInputEvent(entity, entity.Comp.HeldMoveButtons);
             entity.Comp.HeldMoveButtons = buttons;
             RaiseLocalEvent(entity, ref moveEvent);
             Dirty(entity, entity.Comp);
@@ -125,14 +119,10 @@ private void OnMoverHandleState(Entity<InputMoverComponent> entity, ref Componen
             // Reset
             entity.Comp.LastInputTick = GameTick.Zero;
             entity.Comp.LastInputSubTick = 0;
-             // Shitmed Change Start
-            Vector2 vector2 = DirVecForButtons(entity.Comp.HeldMoveButtons);
-            Vector2i vector2i = new Vector2i((int) vector2.X, (int) vector2.Y);
-            Direction dir = (vector2i == Vector2i.Zero) ? Direction.Invalid : vector2i.AsDirection();
-            // Shitmed Change End
+
             if (entity.Comp.HeldMoveButtons != state.HeldMoveButtons)
             {
-                var moveEvent = new MoveInputEvent(entity, entity.Comp.HeldMoveButtons, dir, state.HeldMoveButtons != 0); // Shitmed Change
+                var moveEvent = new MoveInputEvent(entity, entity.Comp.HeldMoveButtons);
                 entity.Comp.HeldMoveButtons = state.HeldMoveButtons;
                 RaiseLocalEvent(entity.Owner, ref moveEvent);
 
@@ -181,17 +171,9 @@ public void ResetCamera(EntityUid uid)
                 return;
             }
 
-            // Shitmed Change Start
-            var xform = XformQuery.GetComponent(uid);
-            if (TryComp(uid, out RelayInputMoverComponent? relay)
-                 && TryComp(relay.RelayEntity, out TransformComponent? relayXform)
-                 && MoverQuery.TryGetComponent(relay.RelayEntity, out var relayMover))
-                xform = relayXform;
-
             // If we updated parent then cancel the accumulator and force it now.
-            if (!TryUpdateRelative(mover, xform) && mover.TargetRelativeRotation.Equals(Angle.Zero))
+            if (!TryUpdateRelative(mover, XformQuery.GetComponent(uid)) && mover.TargetRelativeRotation.Equals(Angle.Zero))
                 return;
-            // Shitmed Change End
 
             mover.LerpTarget = TimeSpan.Zero;
             mover.TargetRelativeRotation = Angle.Zero;
@@ -358,12 +340,6 @@ private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bo
             if (!MoverQuery.TryGetComponent(entity, out var moverComp))
                 return;
 
-            // Shitmed Change Start
-            var moverEntity = new Entity<InputMoverComponent>(entity, moverComp);
-            var moveEvent = new MoveInputEvent(moverEntity, moverComp.HeldMoveButtons, dir, state);
-            RaiseLocalEvent(entity, ref moveEvent);
-            // Shitmed Change End
-
             // For stuff like "Moving out of locker" or the likes
             // We'll relay a movement input to the parent.
             if (_container.IsEntityInContainer(entity) &&
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 9024f148656..3809cd49f60 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -130,12 +130,10 @@ protected void HandleMobMovement(
         var canMove = mover.CanMove;
         if (RelayTargetQuery.TryGetComponent(uid, out var relayTarget))
         {
-            if (_mobState.IsIncapacitated(relayTarget.Source) ||
-                TryComp<SleepingComponent>(relayTarget.Source, out _) ||
-                // Shitmed Change
-                !PhysicsQuery.TryGetComponent(relayTarget.Source, out var relayedPhysicsComponent) ||
-                !MoverQuery.TryGetComponent(relayTarget.Source, out var relayedMover) ||
-                !XformQuery.TryGetComponent(relayTarget.Source, out var relayedXform))
+            if (_mobState.IsDead(relayTarget.Source)
+                || TryComp<SleepingComponent>(relayTarget.Source, out _)
+                || !MoverQuery.TryGetComponent(relayTarget.Source, out var relayedMover)
+                || _mobState.IsCritical(relayTarget.Source) && !_configManager.GetCVar(CCVars.AllowMovementWhileCrit))
             {
                 canMove = false;
             }
@@ -145,32 +143,19 @@ protected void HandleMobMovement(
                 mover.RelativeEntity = relayedMover.RelativeEntity;
                 mover.RelativeRotation = relayedMover.RelativeRotation;
                 mover.TargetRelativeRotation = relayedMover.TargetRelativeRotation;
-                HandleMobMovement(relayTarget.Source, relayedMover, relayTarget.Source, relayedPhysicsComponent, relayedXform, frameTime);
             }
         }
 
         // Update relative movement
-        // Shitmed Change Start
-        else
+        if (mover.LerpTarget < Timing.CurTime)
         {
-            if (mover.LerpTarget < Timing.CurTime)
+            if (TryUpdateRelative(mover, xform))
             {
-                if (TryComp(uid, out RelayInputMoverComponent? relay)
-                    && TryComp(relay.RelayEntity, out TransformComponent? relayXform))
-                {
-                    if (TryUpdateRelative(mover, relayXform))
-                        Dirty(uid, mover);
-                }
-                else
-                {
-                    if (TryUpdateRelative(mover, xform))
-                        Dirty(uid, mover);
-                }
+                Dirty(uid, mover);
             }
-
-            LerpRotation(uid, mover, frameTime);
         }
-        // Shitmed Change End
+
+        LerpRotation(uid, mover, frameTime);
 
         if (!canMove
             || physicsComponent.BodyStatus != BodyStatus.OnGround && !CanMoveInAirQuery.HasComponent(uid)
diff --git a/Content.Shared/Nyanotrasen/Kitchen/SharedDeepfryerSystem.cs b/Content.Shared/Nyanotrasen/Kitchen/SharedDeepfryerSystem.cs
index e12d57d7075..afb47e3a6e4 100644
--- a/Content.Shared/Nyanotrasen/Kitchen/SharedDeepfryerSystem.cs
+++ b/Content.Shared/Nyanotrasen/Kitchen/SharedDeepfryerSystem.cs
@@ -1,10 +1,10 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.DragDrop;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
 using Content.Shared.Nyanotrasen.Kitchen.Components;
 using Content.Shared.Item;
-using Content.Shared.Body.Components;
 
 namespace Content.Shared.Nyanotrasen.Kitchen;
 
@@ -28,7 +28,7 @@ public virtual bool CanInsert(EntityUid uid, EntityUid entity)
         var storable = HasComp<ItemComponent>(entity);
         if (!storable && !HasComp<BodyComponent>(entity))
             return false;
-            
+
         return physics.CanCollide || storable;
     }
 }
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index ab68537ff59..1c24e298e0e 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 using Content.Shared._White.Bark;
 using Content.Shared._White.Bark.Systems;
+using Content.Shared._White.Humanoid.Prototypes;
 using Content.Shared._White.TTS;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing.Loadouts.Prototypes;
@@ -98,7 +99,7 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
 
     // WD EDIT START
     [DataField]
-    public string BodyType { get; set; } = SharedHumanoidAppearanceSystem.DefaultBodyType;
+    public ProtoId<BodyTypePrototype> BodyType { get; set; } = SharedHumanoidAppearanceSystem.DefaultBodyType;
 
     [DataField]
     public string Voice { get; set; } = SharedHumanoidAppearanceSystem.DefaultVoice;
diff --git a/Content.Shared/Projectiles/EmbedEvent.cs b/Content.Shared/Projectiles/EmbedEvent.cs
index 8041724d8ea..6ce27ab1834 100644
--- a/Content.Shared/Projectiles/EmbedEvent.cs
+++ b/Content.Shared/Projectiles/EmbedEvent.cs
@@ -1,4 +1,4 @@
-using Content.Shared._Shitmed.Targeting;
+using Content.Shared._White.Body.Components;
 
 namespace Content.Shared.Projectiles;
 
@@ -6,7 +6,7 @@ namespace Content.Shared.Projectiles;
 /// Raised directed on an entity when it embeds in another entity.
 /// </summary>
 [ByRefEvent]
-public readonly record struct EmbedEvent(EntityUid? Shooter, EntityUid Embedded, TargetBodyPart? BodyPart);
+public readonly record struct EmbedEvent(EntityUid? Shooter, EntityUid Embedded, BodyPartType BodyPartType); // WD EDIT
 
 /// <summary>
 /// Raised on an entity when it stops embedding in another entity.
diff --git a/Content.Shared/Projectiles/EmbedPassiveDamageComponent.cs b/Content.Shared/Projectiles/EmbedPassiveDamageComponent.cs
index 06df595b6db..ac0986f2baa 100644
--- a/Content.Shared/Projectiles/EmbedPassiveDamageComponent.cs
+++ b/Content.Shared/Projectiles/EmbedPassiveDamageComponent.cs
@@ -1,8 +1,8 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Components;
-using Content.Shared._Shitmed.Targeting;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.GameStates;
 
@@ -32,12 +32,6 @@ public sealed partial class EmbedPassiveDamageComponent : Component
     [ViewVariables(VVAccess.ReadOnly)]
     public MobStateComponent? EmbeddedMobState = null;
 
-    /// <summary>
-    ///   The body part to apply damage to.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public TargetBodyPart? EmbeddedBodyPart = null;
-
     /// <summary>
     ///   Damage per interval dealt to the entity every interval.
     ///   If this is set manually, DamageMultiplier will be ignored.
@@ -54,4 +48,12 @@ public sealed partial class EmbedPassiveDamageComponent : Component
 
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan NextDamage = TimeSpan.Zero;
+
+    // WD EDIT START
+    /// <summary>
+    /// The body part that will be damaged
+    /// </summary>
+    [ViewVariables]
+    public BodyPartType BodyPartType = BodyPartType.All;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Projectiles/EmbedPassiveDamageSystem.cs b/Content.Shared/Projectiles/EmbedPassiveDamageSystem.cs
index 7368d379114..31b4f279eb1 100644
--- a/Content.Shared/Projectiles/EmbedPassiveDamageSystem.cs
+++ b/Content.Shared/Projectiles/EmbedPassiveDamageSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Events;
@@ -60,8 +61,8 @@ private void OnEmbed(EntityUid uid, EmbedPassiveDamageComponent component, Embed
         component.Embedded = args.Embedded;
         component.EmbeddedDamageable = damageable;
         component.EmbeddedMobState = mobState;
-        component.EmbeddedBodyPart = args.BodyPart;
         component.NextDamage = _timing.CurTime + TimeSpan.FromSeconds(1f);
+        component.BodyPartType = args.BodyPartType; // WD EDIT
 
         _activeEmbeds.Add(component);
         Dirty(uid, component);
@@ -72,8 +73,8 @@ private void OnRemoveEmbed(EntityUid uid, EmbedPassiveDamageComponent component,
         component.Embedded = null;
         component.EmbeddedDamageable = null;
         component.EmbeddedMobState = null;
-        component.EmbeddedBodyPart = null;
         component.NextDamage = TimeSpan.Zero;
+        component.BodyPartType = BodyPartType.None; // WD EDIT
 
         _activeEmbeds.Remove(component);
         Dirty(uid, component);
@@ -129,7 +130,7 @@ public override void Update(float frameTime)
                 continue;
 
             ent.NextDamage = curTime + TimeSpan.FromSeconds(1f);
-            _damageable.TryChangeDamage(ent.Embedded, ent.Damage, false, false, ent.EmbeddedDamageable, targetPart: ent.EmbeddedBodyPart);
+            _damageable.TryChangeDamage(ent.Embedded, ent.Damage, false, false, ent.EmbeddedDamageable, bodyPartType: ent.BodyPartType); // WD EDIT
         }
     }
 }
diff --git a/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs b/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
index d25feb7a838..5dfd0639101 100644
--- a/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
+++ b/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
@@ -1,4 +1,3 @@
-using Content.Shared._Shitmed.Targeting;
 using System.Numerics;
 using Content.Shared.Damage;
 using Robust.Shared.Audio;
@@ -68,12 +67,6 @@ public sealed partial class EmbeddableProjectileComponent : Component
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
     public TimeSpan? AutoRemoveTime = null;
 
-    /// <summary>
-    ///   The body part of the target this embeddable is attached to.
-    /// </summary>
-    [ViewVariables, AutoNetworkedField]
-    public TargetBodyPart? TargetBodyPart = null;
-
     // WD EDIT START
     [DataField]
     public DamageSpecifier Damage = new();
diff --git a/Content.Shared/Projectiles/ProjectileComponent.cs b/Content.Shared/Projectiles/ProjectileComponent.cs
index 64ed7e11a77..14f66da9db9 100644
--- a/Content.Shared/Projectiles/ProjectileComponent.cs
+++ b/Content.Shared/Projectiles/ProjectileComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
@@ -120,4 +121,9 @@ public sealed partial class ProjectileComponent : Component
     [NonSerialized]
     public List<EntityUid> IgnoredEntities = new();
     // Goobstation end
+
+    // WD EDIT START
+    [ViewVariables(VVAccess.ReadWrite)]
+    public BodyPartType BodyPartType = BodyPartType.All;
+    // WD EDIT END
 }
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 5d483f6b4dc..44462fcdf0b 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Examine;
@@ -7,7 +8,6 @@
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared._White.Penetrated;
 using Content.Shared._White.Projectile;
 using Content.Shared.Item.ItemToggle;
@@ -121,7 +121,7 @@ private void OnEmbedThrowDoHit(EntityUid uid, EmbeddableProjectileComponent comp
             // || _standing.IsDown(args.Target)) // WD EDIT
             return;
 
-        TryEmbed(uid, args.Target, null, component, args.TargetPart);
+        TryEmbed(uid, args.Target, null, component, bodyPartType: args.BodyPartType); // WD EDIT
     }
 
     private void OnEmbedProjectileHit(EntityUid uid, EmbeddableProjectileComponent component, ref ProjectileHitEvent args)
@@ -129,7 +129,7 @@ private void OnEmbedProjectileHit(EntityUid uid, EmbeddableProjectileComponent c
         if (!(args.Target is { }) // || _standing.IsDown(args.Target) // WD EDIT
             || !TryComp(uid, out ProjectileComponent? projectile)
             || projectile.Weapon is null
-            || !TryEmbed(uid, args.Target, args.Shooter, component))
+            || !TryEmbed(uid, args.Target, args.Shooter, component, bodyPartType: args.BodyPartType))
             return;
 
         // Raise a specific event for projectiles.
@@ -137,7 +137,7 @@ private void OnEmbedProjectileHit(EntityUid uid, EmbeddableProjectileComponent c
         RaiseLocalEvent(uid, ref ev);
     }
 
-    public bool TryEmbed(EntityUid uid, EntityUid target, EntityUid? user, EmbeddableProjectileComponent component, TargetBodyPart? targetPart = null, bool raiseEvent = true) // WD EDIT: raiseEvent
+    public bool TryEmbed(EntityUid uid, EntityUid target, EntityUid? user, EmbeddableProjectileComponent component, bool raiseEvent = true, BodyPartType bodyPartType = BodyPartType.None) // WD EDIT
     {
         // WD EDIT START
         if (!TryComp<PhysicsComponent>(uid, out var physics)
@@ -179,9 +179,8 @@ public bool TryEmbed(EntityUid uid, EntityUid target, EntityUid? user, Embeddabl
 
         _audio.PlayPredicted(component.Sound, uid, null);
 
-        component.TargetBodyPart = targetPart;
         component.EmbeddedIntoUid = target;
-        var ev = new EmbedEvent(user, target, targetPart);
+        var ev = new EmbedEvent(user, target, bodyPartType); // WD EDIT
         RaiseLocalEvent(uid, ref ev);
 
         if (component.AutoRemoveDuration != 0)
@@ -195,7 +194,6 @@ public void UnEmbed(EntityUid uid, EmbeddableProjectileComponent component, Enti
     {
         component.AutoRemoveTime = null;
         component.EmbeddedIntoUid = null;
-        component.TargetBodyPart = null;
         RemCompDeferred<ActiveEmbeddableProjectileComponent>(uid);
 
         var ev = new RemoveEmbedEvent(remover);
@@ -252,6 +250,17 @@ public void SetShooter(EntityUid id, ProjectileComponent component, EntityUid sh
         Dirty(id, component);
     }
 
+    // WD EDIT START
+    public void SetBodyPartType(Entity<ProjectileComponent> projectile, BodyPartType bodyPartType)
+    {
+        if (projectile.Comp.BodyPartType == bodyPartType)
+            return;
+
+        projectile.Comp.BodyPartType = bodyPartType;
+        Dirty(projectile);
+    }
+    // WD EDIT END
+
     private void OnExamined(EntityUid uid, EmbeddableProjectileComponent component, ExaminedEvent args)
     {
         if (!(component.EmbeddedIntoUid is { } target))
@@ -259,17 +268,7 @@ private void OnExamined(EntityUid uid, EmbeddableProjectileComponent component,
 
         var targetIdentity = Identity.Entity(target, EntityManager);
 
-        var loc = component.TargetBodyPart == null
-            ? Loc.GetString("throwing-examine-embedded",
-            ("embedded", uid),
-            ("target", targetIdentity))
-            : Loc.GetString("throwing-examine-embedded-part",
-            ("embedded", uid),
-            ("target", targetIdentity),
-            ("targetName", Name(targetIdentity)), // WWDP
-            ("targetPart", Loc.GetString($"body-part-{component.TargetBodyPart.ToString()}")));
-
-        args.PushMarkup(loc);
+        args.PushMarkup(Loc.GetString("throwing-examine-embedded", ("embedded", uid), ("target", targetIdentity)));
     }
 
     // WD EDIT START
@@ -321,7 +320,7 @@ public record struct ProjectileReflectAttemptEvent(EntityUid ProjUid, Projectile
 /// Raised when a projectile hits an entity
 /// </summary>
 [ByRefEvent]
-public record struct ProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, EntityUid? Shooter = null);
+public record struct ProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, EntityUid? Shooter = null, BodyPartType BodyPartType = BodyPartType.None); // WD EDIT
 
 /// <summary>
 /// Raised after a projectile has dealt it's damage.
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 7bc00ff7f3f..af217d8c805 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -202,17 +202,10 @@ private void OnAiBuiCheck(Entity<StationAiWhitelistComponent> ent, ref BoundUser
     private void OnAiInRange(Entity<StationAiOverlayComponent> ent, ref InRangeOverrideEvent args)
     {
         args.Handled = true;
-
-        // Shitmed - Starlight Abductors Change Start
-        var target = args.Target;
-        if (ent.Comp.AllowCrossGrid && TryComp(ent, out RelayInputMoverComponent? relay))
-            target = relay.RelayEntity;
-        // Shitmed Change End
-
-        var targetXform = Transform(target);
+        var targetXform = Transform(args.Target);
 
         // No cross-grid
-        if (targetXform.GridUid != Transform(args.User).GridUid && !ent.Comp.AllowCrossGrid) // Shitmed Change
+        if (targetXform.GridUid != Transform(args.User).GridUid)
         {
             return;
         }
diff --git a/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs b/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
index 2150659cd0a..8416d44d5a1 100644
--- a/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
+++ b/Content.Shared/Silicons/StationAi/StationAiOverlayComponent.cs
@@ -5,12 +5,5 @@ namespace Content.Shared.Silicons.StationAi;
 /// <summary>
 /// Handles the static overlay for station AI.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] // Shitmed Change - Starlight Abductors
-public sealed partial class StationAiOverlayComponent : Component
-{
-    /// <summary>
-    ///     Shitmed Change - Starlight Abductors: Whether the station AI overlay should be allowed to cross grids.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool AllowCrossGrid = true; // WD edit
-}
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StationAiOverlayComponent : Component;
diff --git a/Content.Shared/Species/Systems/GibActionSystem.cs b/Content.Shared/Species/Systems/GibActionSystem.cs
index bd7cb6baffa..9ddf20985c0 100644
--- a/Content.Shared/Species/Systems/GibActionSystem.cs
+++ b/Content.Shared/Species/Systems/GibActionSystem.cs
@@ -1,6 +1,6 @@
+using Content.Shared._White.Gibbing;
 using Content.Shared.Species.Components;
 using Content.Shared.Actions;
-using Content.Shared.Body.Systems;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Popups;
@@ -12,9 +12,9 @@ namespace Content.Shared.Species;
 public sealed partial class GibActionSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedGibbingSystem _gibbing = default!; // WD EDIT
 
     public override void Initialize()
     {
@@ -26,7 +26,7 @@ public override void Initialize()
 
     private void OnMobStateChanged(EntityUid uid, GibActionComponent comp, MobStateChangedEvent args)
     {
-        // When the mob changes state, check if they're dead and give them the action if so. 
+        // When the mob changes state, check if they're dead and give them the action if so.
         if (!TryComp<MobStateComponent>(uid, out var mobState))
             return;
 
@@ -47,15 +47,15 @@ private void OnMobStateChanged(EntityUid uid, GibActionComponent comp, MobStateC
         // If they aren't given the action, remove it.
         _actionsSystem.RemoveAction(uid, comp.ActionEntity);
     }
-    
+
     private void OnGibAction(EntityUid uid, GibActionComponent comp, GibActionEvent args)
     {
         // When they use the action, gib them.
         _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
-        _bodySystem.GibBody(uid, true);
+        _gibbing.GibBody(uid, true); // WD EDIT
     }
-       
 
 
-    public sealed partial class GibActionEvent : InstantActionEvent { } 
+
+    public sealed partial class GibActionEvent : InstantActionEvent { }
 }
diff --git a/Content.Shared/Standing/SharedLayingDownSystem.cs b/Content.Shared/Standing/SharedLayingDownSystem.cs
index 1d16fa836e1..c3c4686403e 100644
--- a/Content.Shared/Standing/SharedLayingDownSystem.cs
+++ b/Content.Shared/Standing/SharedLayingDownSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared._White.Body.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.CCVar;
 using Content.Shared.DoAfter;
@@ -6,8 +7,6 @@
 using Content.Shared.Input;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Body.Components;
-using Content.Shared._Shitmed.Body.Organ;
 using Content.Shared.Standing;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
@@ -158,9 +157,6 @@ public bool TryStandUp(EntityUid uid,
             || standingState.CurrentState is not StandingState.Lying
             || !_mobState.IsAlive(uid)
             || TerminatingOrDeleted(uid)
-            || !TryComp<BodyComponent>(uid, out var body)
-            || body.LegEntities.Count < body.RequiredLegs
-            || HasComp<DebrainedComponent>(uid)
             || HasComp<LegsParalyzedComponent>(uid) // WWDP
             || TryComp<MovementSpeedModifierComponent>(uid, out var movement) && movement.CurrentWalkSpeed == 0)
             return false;
diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs
index 55e06cb2343..d50be3d0d85 100644
--- a/Content.Shared/Standing/StandingStateSystem.cs
+++ b/Content.Shared/Standing/StandingStateSystem.cs
@@ -73,9 +73,6 @@ public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true
         if (dropHeldItems && hands != null)
             RaiseLocalEvent(uid, new DropHandItemsEvent(), false);
 
-        if (TryComp(uid, out BuckleComponent? buckle) && buckle.Buckled && !_buckle.TryUnbuckle(uid, uid, buckle))
-            return false;
-
         var msg = new DownAttemptEvent();
         RaiseLocalEvent(uid, msg, false);
 
diff --git a/Content.Shared/Stealth/Components/StealthComponent.cs b/Content.Shared/Stealth/Components/StealthComponent.cs
index cc78bf912bb..32ab3cd42d1 100644
--- a/Content.Shared/Stealth/Components/StealthComponent.cs
+++ b/Content.Shared/Stealth/Components/StealthComponent.cs
@@ -80,12 +80,12 @@ public sealed class StealthComponentState : ComponentState
     public readonly float Visibility;
     public readonly TimeSpan? LastUpdated;
     public readonly bool Enabled;
-    public readonly float MaxVisibility; // Shitmed Change
+    public readonly float MaxVisibility;
     public StealthComponentState(float stealthLevel, TimeSpan? lastUpdated, bool enabled, float maxVisibility)
     {
         Visibility = stealthLevel;
         LastUpdated = lastUpdated;
         Enabled = enabled;
-        MaxVisibility = maxVisibility; // Shitmed Change
+        MaxVisibility = maxVisibility;
     }
 }
diff --git a/Content.Shared/Stealth/SharedStealthSystem.cs b/Content.Shared/Stealth/SharedStealthSystem.cs
index 775014d6ae2..a3c75bea7d8 100644
--- a/Content.Shared/Stealth/SharedStealthSystem.cs
+++ b/Content.Shared/Stealth/SharedStealthSystem.cs
@@ -105,7 +105,7 @@ protected virtual void OnInit(EntityUid uid, StealthComponent component, Compone
 
     private void OnStealthGetState(EntityUid uid, StealthComponent component, ref ComponentGetState args)
     {
-        args.State = new StealthComponentState(component.LastVisibility, component.LastUpdated, component.Enabled, component.MaxVisibility); // Shitmed Change
+        args.State = new StealthComponentState(component.LastVisibility, component.LastUpdated, component.Enabled, component.MaxVisibility);
     }
 
     private void OnStealthHandleState(EntityUid uid, StealthComponent component, ref ComponentHandleState args)
@@ -116,7 +116,7 @@ private void OnStealthHandleState(EntityUid uid, StealthComponent component, ref
         SetEnabled(uid, cast.Enabled, component);
         component.LastVisibility = cast.Visibility;
         component.LastUpdated = cast.LastUpdated;
-        component.MaxVisibility = cast.MaxVisibility; // Shitmed Change
+        component.MaxVisibility = cast.MaxVisibility;
     }
 
     private void OnMove(EntityUid uid, StealthOnMoveComponent component, ref MoveEventProxy args) // WD EDIT
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index b4947102deb..ad44ab57bd4 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Shared.Body.Components;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Destructible;
 using Content.Shared.Foldable;
 using Content.Shared.Hands.Components;
diff --git a/Content.Shared/Throwing/ThrowEvents.cs b/Content.Shared/Throwing/ThrowEvents.cs
index 5174cceb8ab..9874775cf6c 100644
--- a/Content.Shared/Throwing/ThrowEvents.cs
+++ b/Content.Shared/Throwing/ThrowEvents.cs
@@ -1,4 +1,5 @@
-using Content.Shared._Shitmed.Targeting;
+using Content.Shared._White.Body.Components;
+
 
 namespace Content.Shared.Throwing
 {
@@ -16,15 +17,15 @@ public abstract class ThrowEvent : HandledEntityEventArgs
         public readonly EntityUid Thrown;
         public readonly EntityUid Target;
         public ThrownItemComponent Component;
-        public TargetBodyPart? TargetPart;
+        public BodyPartType BodyPartType; // WD EDIT
 
-        public ThrowEvent(EntityUid? user, EntityUid thrown, EntityUid target, ThrownItemComponent component, TargetBodyPart? targetPart) //Nyano - Summary: User added.
+        public ThrowEvent(EntityUid? user, EntityUid thrown, EntityUid target, ThrownItemComponent component, BodyPartType bodyPartType) // WD EDIT
         {
             User = user; //Nyano - Summary: User added.
             Thrown = thrown;
             Target = target;
             Component = component;
-            TargetPart = targetPart;
+            BodyPartType = bodyPartType; // WD EDIT
         }
     }
 
@@ -33,7 +34,7 @@ public ThrowEvent(EntityUid? user, EntityUid thrown, EntityUid target, ThrownIte
     /// </summary>
     public sealed class ThrowHitByEvent : ThrowEvent
     {
-        public ThrowHitByEvent(EntityUid? user, EntityUid thrown, EntityUid target, ThrownItemComponent component, TargetBodyPart? targetPart) : base(user, thrown, target, component, targetPart) //Nyano - Summary: User added.
+        public ThrowHitByEvent(EntityUid? user, EntityUid thrown, EntityUid target, ThrownItemComponent component, BodyPartType bodyPartType) : base(user, thrown, target, component, bodyPartType) // WD EDIT
         {
         }
     }
@@ -43,7 +44,7 @@ public ThrowHitByEvent(EntityUid? user, EntityUid thrown, EntityUid target, Thro
     /// </summary>
     public sealed class ThrowDoHitEvent : ThrowEvent
     {
-        public ThrowDoHitEvent(EntityUid thrown, EntityUid target, ThrownItemComponent component, TargetBodyPart? targetPart) : base(null, thrown, target, component, targetPart) //Nyano - Summary: User added.
+        public ThrowDoHitEvent(EntityUid thrown, EntityUid target, ThrownItemComponent component, BodyPartType bodyPartType) : base(null, thrown, target, component, bodyPartType) // WD EDIT
         {
         }
     }
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index a0952a5d9cf..fc9443954ba 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
-using Content.Shared._Shitmed.Targeting;
+using Content.Shared._White.TargetDoll;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Systems;
 using Content.Shared.Database;
 using Content.Shared.Gravity;
 using Content.Shared.Physics;
@@ -25,7 +24,7 @@ public sealed class ThrownItemSystem : EntitySystem
         [Dependency] private readonly FixtureSystem _fixtures = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
         [Dependency] private readonly SharedGravitySystem _gravity = default!;
-        [Dependency] private readonly SharedBodySystem _body = default!;
+        [Dependency] private readonly SharedTargetDollSystem _targetDoll = default!; // WD EDIT
 
         private const string ThrowingFixture = "throw-fixture";
 
@@ -150,17 +149,11 @@ public void ThrowCollideInteraction(ThrownItemComponent component, EntityUid thr
                 _adminLogger.Add(LogType.ThrowHit, LogImpact.Low,
                     $"{ToPrettyString(thrown):thrown} thrown by {ToPrettyString(component.Thrower.Value):thrower} hit {ToPrettyString(target):target}.");
 
-            //WWDP EDIT START
-            TryComp<TargetingComponent>(component.Thrower, out var targetingComponent);
-
-            var targetPart =  targetingComponent?.Target ?? _body.GetRandomBodyPart(target);
-            //WWDP EDIT END
-
-            if (component.Thrower is not null)// Nyano - Summary: Gotta check if there was a thrower.
-                RaiseLocalEvent(target, new ThrowHitByEvent(component.Thrower.Value, thrown, target, component, targetPart), true); // Nyano - Summary: Gotta update for who threw it.
-            else
-                RaiseLocalEvent(target, new ThrowHitByEvent(null, thrown, target, component, targetPart), true); // Nyano - Summary: No thrower.
-            RaiseLocalEvent(thrown, new ThrowDoHitEvent(thrown, target, component, targetPart), true);
+            // WD EDIT START
+            var bodyPartType = component.Thrower.HasValue ? _targetDoll.GetSelectedBodyPart(component.Thrower.Value) : _targetDoll.GetRandomValidBodyPart(target);
+            RaiseLocalEvent(target, new ThrowHitByEvent(component.Thrower, thrown, target, component, bodyPartType), true);
+            RaiseLocalEvent(thrown, new ThrowDoHitEvent(thrown, target, component, bodyPartType), true);
+            // WD EDIT END
         }
 
         public override void Update(float frameTime)
diff --git a/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
index b51511c757e..319170e3a0a 100644
--- a/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
+++ b/Content.Shared/Traits/Assorted/Systems/LegsParalyzedSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Body.Systems;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
@@ -30,14 +30,14 @@ private void OnStartup(EntityUid uid, Components.LegsParalyzedComponent componen
         // WWDP edit start
         //_movementSpeedModifierSystem.ChangeBaseSpeed(uid, 0, 0, 20);
         _standingSystem.Down(uid);
-        _bodySystem.UpdateMovementSpeed(uid);
+        /*_bodySystem.UpdateMovementSpeed(uid); TODO*/
         // WWDP edit end
     }
 
     private void OnShutdown(EntityUid uid, Components.LegsParalyzedComponent component, ComponentShutdown args)
     {
         _standingSystem.Stand(uid);
-        _bodySystem.UpdateMovementSpeed(uid);
+        /*_bodySystem.UpdateMovementSpeed(uid); TODO*/
     }
 
     private void OnBuckled(EntityUid uid, Components.LegsParalyzedComponent component, ref BuckledEvent args) => _standingSystem.Stand(uid);
diff --git a/Content.Shared/Turrets/SharedDeployableTurretSystem.cs b/Content.Shared/Turrets/SharedDeployableTurretSystem.cs
index 210c93928dd..2f1750c050c 100644
--- a/Content.Shared/Turrets/SharedDeployableTurretSystem.cs
+++ b/Content.Shared/Turrets/SharedDeployableTurretSystem.cs
@@ -135,7 +135,8 @@ protected virtual void SetState(Entity<DeployableTurretComponent> ent, bool enab
         if (TryComp<DamageableComponent>(ent, out var damageable))
         {
             var damageSetID = ent.Comp.Enabled ? ent.Comp.DeployedDamageModifierSetId : ent.Comp.RetractedDamageModifierSetId;
-            _damageable.SetDamageModifierSetId(ent, damageSetID, damageable);
+            if (damageSetID.HasValue)
+                _damageable.SetDamageModifierSetId(ent, damageSetID, damageable);
         }
 
         // Change the turret's fixtures
@@ -167,4 +168,4 @@ public bool HasAmmo(Entity<DeployableTurretComponent> ent)
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Verbs/VerbCategory.cs b/Content.Shared/Verbs/VerbCategory.cs
index 02838c9ecd3..55d20442983 100644
--- a/Content.Shared/Verbs/VerbCategory.cs
+++ b/Content.Shared/Verbs/VerbCategory.cs
@@ -104,16 +104,14 @@ public VerbCategory(string text, SpriteSpecifier? sprite, bool iconsOnly = false
 
         public static readonly VerbCategory Rename = new("verb-categories-rename");
 
+        public static readonly VerbCategory PowerLevel = new("verb-categories-power-level");
+
         public static readonly VerbCategory Interaction = new("verb-categories-interaction");
 
         // WD EDIT START
         public static readonly VerbCategory BloodSpells = new("verb-categories-blood-cult",
-            new SpriteSpecifier.Rsi(new ResPath("/Textures/_White/Interface/Actions/blood_cult.rsi"), "blood_spells"));
+            new SpriteSpecifier.Rsi(new ResPath("/Textures/WhiteDream/BloodCult/actions.rsi"), "blood_spells"));
         // WD EDIT END
-        public static readonly VerbCategory PowerLevel = new("verb-categories-power-level");
-
-        // Shitmed - Starlight Abductors
-        public static readonly VerbCategory Switch = new("verb-categories-switch", "/Textures/Interface/VerbIcons/group.svg.192dpi.png");
 
         public static readonly VerbCategory GenderChange = new("verb-categories-gender-change");
         public static readonly VerbCategory SexChange = new("verb-categories-sex-change");
diff --git a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
index 75c85790deb..5e7841265cb 100644
--- a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
+++ b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared._White.Body.Components;
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
@@ -57,6 +58,13 @@ public sealed class MeleeHitEvent : HandledEntityEventArgs
     /// </summary>
     public readonly Vector2? Direction;
 
+    // WD EDIT START
+    /// <summary>
+    /// The part of the body that was struck.
+    /// </summary>
+    public readonly BodyPartType BodyPartType;
+    // WD EDIT END
+
     /// <summary>
     /// Check if this is true before attempting to do something during a melee attack other than changing/adding bonus damage. <br/>
     /// For example, do not spend charges unless <see cref="IsHit"/> equals true.
@@ -66,13 +74,14 @@ public sealed class MeleeHitEvent : HandledEntityEventArgs
     /// </remarks>
     public bool IsHit = true;
 
-    public MeleeHitEvent(List<EntityUid> hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction)
+    public MeleeHitEvent(List<EntityUid> hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction, BodyPartType bodyPartType) // WD EDIT
     {
         HitEntities = hitEntities;
         User = user;
         Weapon = weapon;
         BaseDamage = baseDamage;
         Direction = direction;
+        BodyPartType = bodyPartType; // WD EDIT
     }
 }
 
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 599964bca61..4e8012fcd04 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -119,12 +119,6 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1);
 
-    /// <summary>
-    ///     Part damage is multiplied by this amount for single-target attacks
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float ClickPartDamageMultiplier = 1.00f;
-
     // 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.
@@ -156,12 +150,6 @@ public sealed partial class MeleeWeaponComponent : Component
     [DataField, AutoNetworkedField]
     public float HeavyDamageBaseModifier = 0.8f; // WD EDIT
 
-    /// <summary>
-    ///     Part damage is multiplied by this amount for heavy swings
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeavyPartDamageMultiplier = 0.5f;
-
     /// <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 c6c75288e8c..1ead3559f28 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -1,7 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Shared._Goobstation.MartialArts.Events; // Goobstation - Martial Arts
+using Content.Shared._Goobstation.MartialArts.Events;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.TargetDoll; // Goobstation - Martial Arts
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CombatMode;
@@ -50,6 +52,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
     [Dependency] private readonly StaminaSystem _stamina = default!;
     [Dependency] private readonly ContestsSystem _contests = default!;
+    [Dependency] private readonly SharedTargetDollSystem _targetDoll = default!; // WD EDIT
 
     public const int AttackMask = (int) (CollisionGroup.MobMask | CollisionGroup.Opaque); // WD EDIT: private -> public
 
@@ -386,6 +389,8 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
             return false;
         }
 
+        var bodyPartType = _targetDoll.GetSelectedBodyPart(user); // WD EDIT
+
         // Attack confirmed
         for (var i = 0; i < swings; i++)
         {
@@ -398,7 +403,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
             switch (attack)
             {
                 case LightAttackEvent light:
-                    DoLightAttack(user, light, weaponUid, weapon, session);
+                    DoLightAttack(user, light, weaponUid, weapon, session, bodyPartType); // WD EDIT
                     animation = weapon.Animation;
                     animationRange *= weapon.LightRangeModifier;
                     break;
@@ -410,7 +415,7 @@ private bool AttemptAttack(EntityUid user, EntityUid weaponUid, MeleeWeaponCompo
                     animationRange *= weapon.DisarmRangeModifier;
                     break;
                 case HeavyAttackEvent heavy:
-                    if (!DoHeavyAttack(user, heavy, weaponUid, weapon, session))
+                    if (!DoHeavyAttack(user, heavy, weaponUid, weapon, session, bodyPartType)) // WD EDIT
                         return false;
 
                     animation = weapon.WideAnimation;
@@ -443,7 +448,7 @@ protected bool CanDoLightAttack(EntityUid user, [NotNullWhen(true)] EntityUid? t
             InRange(user, target.Value, component.Range * component.LightRangeModifier, session);
     }
 
-    protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)
+    protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session, BodyPartType bodyPartType) // WD EDIT
     {
         // If I do not come back later to fix Light Attacks being Heavy Attacks you can throw me in the spider pit -Errant
         var damage = GetDamage(meleeUid, user, component);
@@ -469,7 +474,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
                     LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed");
             }
-            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null);
+            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null, bodyPartType); // WD EDIT
             RaiseLocalEvent(meleeUid, missEvent);
             _meleeSound.PlaySwingSound(user, meleeUid, component);
             return;
@@ -478,7 +483,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
         // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
 
         // Raise event before doing damage so we can cancel damage if the event is handled
-        var hitEvent = new MeleeHitEvent(new List<EntityUid> { target.Value }, user, meleeUid, damage, null);
+        var hitEvent = new MeleeHitEvent(new List<EntityUid> { target.Value }, user, meleeUid, damage, null, bodyPartType); // WD EDIT
         RaiseLocalEvent(meleeUid, hitEvent);
 
         if (hitEvent.Handled)
@@ -503,7 +508,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, partMultiplier: component.ClickPartDamageMultiplier);
+        var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin: user, ignoreResistances: resistanceBypass, bodyPartType: bodyPartType); // WD EDIT
         var comboEv = new ComboAttackPerformedEvent(user, target.Value, meleeUid, ComboAttackType.Harm);
         RaiseLocalEvent(user, comboEv);
 
@@ -540,7 +545,7 @@ protected virtual void DoLightAttack(EntityUid user, LightAttackEvent ev, Entity
 
     protected abstract void DoDamageEffect(List<EntityUid> targets, EntityUid? user,  TransformComponent targetXform);
 
-    private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)
+    private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session, BodyPartType bodyPartType) // WD EDIT
     {
         // TODO: This is copy-paste as fuck with DoPreciseAttack
         if (!TryComp(user, out TransformComponent? userXform))
@@ -583,7 +588,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
                     LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed");
             }
-            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction);
+            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction, bodyPartType); // WD EDIT
             RaiseLocalEvent(meleeUid, missEvent);
 
             // immediate audio feedback
@@ -632,7 +637,7 @@ private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeU
         // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
 
         // Raise event before doing damage so we can cancel damage if the event is handled
-        var hitEvent = new MeleeHitEvent(targets, user, meleeUid, damage, direction);
+        var hitEvent = new MeleeHitEvent(targets, user, meleeUid, damage, direction, bodyPartType); // WD EDIT
         RaiseLocalEvent(meleeUid, hitEvent);
 
         if (hitEvent.Handled)
@@ -671,7 +676,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, partMultiplier: component.HeavyPartDamageMultiplier);
+            var damageResult = Damageable.TryChangeDamage(entity, modifiedDamage, origin: user, bodyPartType: bodyPartType); // WD EDIT
 
             var comboEv = new ComboAttackPerformedEvent(user, entity, meleeUid, ComboAttackType.HarmLight);
             RaiseLocalEvent(user, comboEv);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
index c0e496e6637..9b104643b02 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
@@ -51,24 +51,16 @@ private void OnBatteryHandleState(EntityUid uid, BatteryAmmoProviderComponent co
         component.Shots = state.Shots;
         component.Capacity = state.MaxShots;
         component.FireCost = state.FireCost;
-
-        if (component is HitscanBatteryAmmoProviderComponent hitscan && state.Prototype != null) // Shitmed Change
-            hitscan.Prototype = state.Prototype;
     }
 
     private void OnBatteryGetState(EntityUid uid, BatteryAmmoProviderComponent component, ref ComponentGetState args)
     {
-        var state = new BatteryAmmoProviderComponentState() // Shitmed Change
+        var state = new BatteryAmmoProviderComponentState()
         {
             Shots = component.Shots,
             MaxShots = component.Capacity,
             FireCost = component.FireCost,
         };
-
-        if (TryComp<HitscanBatteryAmmoProviderComponent>(uid, out var hitscan)) // Shitmed Change
-            state.Prototype = hitscan.Prototype;
-
-        args.State = state; // Shitmed Change
     }
 
     private void OnBatteryExamine(EntityUid uid, BatteryAmmoProviderComponent component, ExaminedEvent args)
@@ -141,6 +133,5 @@ private sealed class BatteryAmmoProviderComponentState : ComponentState
         public int Shots;
         public int MaxShots;
         public float FireCost;
-        public string? Prototype; // Shitmed Change
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 770f813b2a0..d55a0eb32e0 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -2,6 +2,7 @@
 using System.Numerics;
 using Content.Shared._White.Guns;
 using Content.Shared._White.Move;
+using Content.Shared._White.TargetDoll;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
 using Content.Shared.Administration.Logs;
@@ -72,7 +73,7 @@ public abstract partial class SharedGunSystem : EntitySystem
     [Dependency] protected readonly ThrowingSystem ThrowingSystem = default!;
     [Dependency] private   readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-    [Dependency] private readonly ContestsSystem _contests = default!; // WWDP
+    [Dependency] private readonly SharedTargetDollSystem _targetDoll = default!; // WD EDIT
 
     private const float InteractNextFire = 0.3f;
     private const double SafetyNextFire = 0.5;
@@ -527,6 +528,7 @@ public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocit
 
         var projectile = EnsureComp<ProjectileComponent>(uid);
         Projectiles.SetShooter(uid, projectile, user ?? gunUid);
+        Projectiles.SetBodyPartType((uid, projectile), _targetDoll.GetSelectedBodyPart(user ?? gunUid)); // WD EDIT
         projectile.Weapon = gunUid;
 
         TransformSystem.SetWorldRotation(uid, direction.ToWorldAngle() + projectile.Angle);
diff --git a/Content.Shared/Wires/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs
index 2bffe086d2d..2239fd72b1b 100644
--- a/Content.Shared/Wires/SharedWiresComponent.cs
+++ b/Content.Shared/Wires/SharedWiresComponent.cs
@@ -113,7 +113,7 @@ public StatusLightData(Color color, StatusLightState state, string text)
 
         public Color Color { get; }
         public StatusLightState State { get; }
-        public string Text { get; set; } // Shitmed Change
+        public string Text { get; }
 
         public override string ToString()
         {
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index 94e1e5afec4..a2f71238700 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -62,12 +62,6 @@ public sealed partial class ZombieComponent : Component
     [DataField("zombieRoleId", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
     public string ZombieRoleId = "Zombie";
 
-    /// <summary>
-    /// The CustomBaseLayers of the humanoid to restore in case of cloning
-    /// </summary>
-    [DataField("beforeZombifiedCustomBaseLayers")]
-    public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> BeforeZombifiedCustomBaseLayers = new ();
-
     /// <summary>
     /// The skin color of the humanoid to restore in case of cloning
     /// </summary>
diff --git a/Content.Shared/_Goobstation/Grab/GrabbingItemSystem.cs b/Content.Shared/_Goobstation/Grab/GrabbingItemSystem.cs
index 6735f15cf46..bdd9b317346 100644
--- a/Content.Shared/_Goobstation/Grab/GrabbingItemSystem.cs
+++ b/Content.Shared/_Goobstation/Grab/GrabbingItemSystem.cs
@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Body.Systems;
+using Content.Shared._White.Body.Systems;
 using Content.Shared.Cuffs;
 using Content.Shared.DoAfter;
 using Content.Shared.Hands.EntitySystems;
diff --git a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.CQC.cs b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.CQC.cs
index 33b1f64ac41..3124f8ef06e 100644
--- a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.CQC.cs
+++ b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.CQC.cs
@@ -1,6 +1,5 @@
 using Content.Shared._Goobstation.MartialArts.Components;
 using Content.Shared._Goobstation.MartialArts.Events;
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.CombatMode;
 using Content.Shared.Damage.Components;
@@ -130,7 +129,7 @@ private void OnCQCKick(Entity<CanPerformComboComponent> ent, ref CqcKickPerforme
         {
             if (TryComp<StaminaComponent>(target, out var stamina) && stamina.Critical)
                 _status.TryAddStatusEffect<ForcedSleepingComponent>(target, "ForcedSleep", TimeSpan.FromSeconds(10), true);
-            DoDamage(ent, target, proto.DamageType, proto.ExtraDamage, out _, TargetBodyPart.Head);
+            DoDamage(ent, target, proto.DamageType, proto.ExtraDamage, out _);
             _stamina.TakeStaminaDamage(target, proto.StaminaDamage * 2 + 5, source: ent);
         }
         else
diff --git a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.SleepingCarp.cs b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.SleepingCarp.cs
index 648b03ccf8d..fb34627ca52 100644
--- a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.SleepingCarp.cs
+++ b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.SleepingCarp.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Shared._Goobstation.MartialArts.Components;
 using Content.Shared._Goobstation.MartialArts.Events;
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Interaction.Events;
diff --git a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs
index d3991915780..6869241f286 100644
--- a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs
+++ b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared._Goobstation.MartialArts.Components;
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared._White.Grab;
 using Content.Shared.Actions;
 using Content.Shared.Damage;
@@ -203,7 +202,7 @@ private bool TryGrant(GrantMartialArtKnowledgeComponent comp, EntityUid user)
             var pullerComponent = EnsureComp<PullerComponent>(user);
             if (!_proto.TryIndex<MartialArtPrototype>(comp.MartialArtsForm.ToString(), out var martialArtsPrototype))
                 return false;
-                
+
             martialArtsKnowledgeComponent.MartialArtsForm = martialArtsPrototype.MartialArtsForm;
             LoadCombos(martialArtsPrototype.RoundstartCombos, canPerformComboComponent);
             martialArtsKnowledgeComponent.Blocked = false;
@@ -310,14 +309,11 @@ private void DoDamage(EntityUid ent,
         EntityUid target,
         string damageType,
         int damageAmount,
-        out DamageSpecifier damage,
-        TargetBodyPart? targetBodyPart = null)
+        out DamageSpecifier damage)
     {
         damage = new DamageSpecifier();
-        if(!TryComp<TargetingComponent>(ent, out var targetingComponent))
-            return;
         damage.DamageDict.Add(damageType, damageAmount);
-        _damageable.TryChangeDamage(target, damage, origin: ent, targetPart: targetBodyPart ?? targetingComponent.Target);
+        _damageable.TryChangeDamage(target, damage, origin: ent);
     }
 
     #endregion
diff --git a/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs b/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs
index 89c8a3fce92..48e656bf4dc 100644
--- a/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs
+++ b/Content.Shared/_Goobstation/TableSlam/TableSlamSystem.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Shared.Contests;
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Actions.Events;
 using Content.Shared.Climbing.Components;
 using Content.Shared.CombatMode;
@@ -78,17 +77,11 @@ public void TryTableSlam(Entity<PullableComponent> ent, Entity<PullerComponent>
         if (TryComp<GlassTableComponent>(tableUid, out var glassTableComponent))
         {
             _damageableSystem.TryChangeDamage(tableUid, glassTableComponent.TableDamage, origin: ent);
-            _damageableSystem.TryChangeDamage(ent, glassTableComponent.ClimberDamage, origin: ent, targetPart: TargetBodyPart.Torso);
+            _damageableSystem.TryChangeDamage(ent, glassTableComponent.ClimberDamage, origin: ent);
             _stunSystem.TryParalyze(ent, TimeSpan.FromSeconds(3), false);
         }
         else
         {
-            _damageableSystem.TryChangeDamage(ent,
-                new DamageSpecifier()
-                {
-                    DamageDict = new Dictionary<string, FixedPoint2> { { "Blunt", ent.Comp.TabledDamage } },
-                },
-                targetPart: TargetBodyPart.Torso);
             _damageableSystem.TryChangeDamage(ent,
                 new DamageSpecifier()
                 {
diff --git a/Content.Shared/_Goobstation/Traits/Assorted/LegsStartParalyzedComponent.cs b/Content.Shared/_Goobstation/Traits/Assorted/LegsStartParalyzedComponent.cs
deleted file mode 100644
index eb25af50de6..00000000000
--- a/Content.Shared/_Goobstation/Traits/Assorted/LegsStartParalyzedComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Traits.Assorted.Systems;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Traits.Assorted.Components;
-
-/// <summary>
-/// Iterate through all the legs on the entity and make them paralyzed.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(LegsStartParalyzedSystem))]
-public sealed partial class LegsStartParalyzedComponent : Component
-{
-}
diff --git a/Content.Shared/_Goobstation/Traits/Assorted/LegsStartParalyzedSystem.cs b/Content.Shared/_Goobstation/Traits/Assorted/LegsStartParalyzedSystem.cs
deleted file mode 100644
index bda4ae876e0..00000000000
--- a/Content.Shared/_Goobstation/Traits/Assorted/LegsStartParalyzedSystem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Traits.Assorted.Components;
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-
-namespace Content.Shared.Traits.Assorted.Systems;
-
-public sealed class LegsStartParalyzedSystem : EntitySystem
-{
-    [Dependency] private readonly EntityManager _entMan = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<LegsStartParalyzedComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, LegsStartParalyzedComponent component, MapInitEvent args)
-    {
-        if (!_entMan.TryGetComponent<BodyComponent>(uid, out var body))
-            return;
-
-        foreach (var legEntity in body.LegEntities)
-        {
-            if (TryComp(legEntity, out BodyPartComponent? part))
-            {
-                part.CanEnable = false;
-                Dirty(legEntity, part);
-            }
-
-            var ev = new BodyPartEnableChangedEvent(false);
-            RaiseLocalEvent(legEntity, ref ev);
-        }
-    }
-}
diff --git a/Content.Shared/_Lavaland/Body/CursedHeartSystem.cs b/Content.Shared/_Lavaland/Body/CursedHeartSystem.cs
index d8a352f5fbe..ccfb0e6f7ad 100644
--- a/Content.Shared/_Lavaland/Body/CursedHeartSystem.cs
+++ b/Content.Shared/_Lavaland/Body/CursedHeartSystem.cs
@@ -12,7 +12,7 @@
 
 namespace Content.Shared._Lavaland.Body;
 
-// TODO: Use Shitmed instead of Shitcode
+// TODO: Use WhiteMed instead of Shitcode
 public sealed class CursedHeartSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _actions = default!;
diff --git a/Content.Shared/_Lavaland/Damage/SharedDamageSquareSystem.cs b/Content.Shared/_Lavaland/Damage/SharedDamageSquareSystem.cs
index 5c9e7c688a9..286bad32abf 100644
--- a/Content.Shared/_Lavaland/Damage/SharedDamageSquareSystem.cs
+++ b/Content.Shared/_Lavaland/Damage/SharedDamageSquareSystem.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Damage;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Audio;
@@ -66,7 +65,7 @@ private void Damage(Entity<DamageSquareComponent> field)
             }
 
             // Damage
-            _dmg.TryChangeDamage(entity, field.Comp.Damage, damageable: dmg, targetPart: TargetBodyPart.Torso);
+            _dmg.TryChangeDamage(entity, field.Comp.Damage, damageable: dmg);
             // Sound
             if (field.Comp.Sound != null)
                 _aud.PlayEntity(field.Comp.Sound, entity, entity, AudioParams.Default.WithVolume(-3f));
diff --git a/Content.Shared/_Lavaland/Weapons/Block/SharedBlockChargeSystem.cs b/Content.Shared/_Lavaland/Weapons/Block/SharedBlockChargeSystem.cs
index 0c1b063ae85..2b9c9704d92 100644
--- a/Content.Shared/_Lavaland/Weapons/Block/SharedBlockChargeSystem.cs
+++ b/Content.Shared/_Lavaland/Weapons/Block/SharedBlockChargeSystem.cs
@@ -47,8 +47,7 @@ private void OnMeleeHit(EntityUid uid, BlockChargeUserComponent component, ref B
     {
         if (!TryComp<BlockChargeComponent>(component.BlockingWeapon, out var blockComp)
             || !HasComp<FaunaComponent>(args.Origin)
-            || !blockComp.HasCharge
-            || !args.CanEvade)
+            || !blockComp.HasCharge)
             return;
 
         _popup.PopupPredicted(Loc.GetString("block-attack-notice", ("user", uid), ("blocked", args.Origin)), uid, null);
diff --git a/Content.Shared/_Shitmed/Abilities/Goliath/GoliathTentacleComponent.cs b/Content.Shared/_Shitmed/Abilities/Goliath/GoliathTentacleComponent.cs
deleted file mode 100644
index 5a872315733..00000000000
--- a/Content.Shared/_Shitmed/Abilities/Goliath/GoliathTentacleComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Shared._Shitmed.GoliathTentacle;
-
-/// <summary>
-/// Component that grants the entity the ability to use goliath tentacles.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class GoliathTentacleComponent : Component
-{
-    //[DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    //public string? Action = "ActionGoliathTentacleCrew";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? ActionEntity;
-}
diff --git a/Content.Shared/_Shitmed/Abilities/Goliath/GoliathTentacleSystem.cs b/Content.Shared/_Shitmed/Abilities/Goliath/GoliathTentacleSystem.cs
deleted file mode 100644
index ecac8a8dec7..00000000000
--- a/Content.Shared/_Shitmed/Abilities/Goliath/GoliathTentacleSystem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Actions;
-
-namespace Content.Shared._Shitmed.GoliathTentacle;
-
-internal sealed class GoliathTentacleSystem : EntitySystem
-{
-    /*[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<GoliathTentacleComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<GoliathTentacleComponent, ComponentShutdown>(OnShutdown);
-    }
-
-    private void OnStartup(EntityUid uid, GoliathTentacleComponent component, ComponentStartup args)
-    {
-        _actionsSystem.AddAction(uid, ref component.ActionEntity, component.Action);
-    }
-
-    private void OnShutdown(EntityUid uid, GoliathTentacleComponent component, ComponentShutdown args)
-    {
-        _actionsSystem.RemoveAction(uid, component.ActionEntity);
-    }*/
-}
diff --git a/Content.Shared/_Shitmed/Antags/Abductor/AbductorCameraConsoleUI.cs b/Content.Shared/_Shitmed/Antags/Abductor/AbductorCameraConsoleUI.cs
deleted file mode 100644
index a4907b43f38..00000000000
--- a/Content.Shared/_Shitmed/Antags/Abductor/AbductorCameraConsoleUI.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using static Content.Shared.Pinpointer.SharedNavMapSystem;
-
-namespace Content.Shared._Shitmed.Antags.Abductor;
-
-[Serializable, NetSerializable]
-public sealed class AbductorCameraConsoleBuiState : BoundUserInterfaceState
-{
-    public required Dictionary<int, StationBeacons> Stations { get; init; }
-}
-
-[Serializable, NetSerializable]
-public sealed class AbductorConsoleBuiState : BoundUserInterfaceState
-{
-    public NetEntity? Target { get; init; }
-    public string? TargetName { get; init; }
-    public string? VictimName { get; init; }
-    public bool AlienPadFound { get; init; }
-    public bool ExperimentatorFound { get; init; }
-    public bool ArmorFound { get; init; }
-    public bool ArmorLocked { get; init; }
-    public AbductorArmorModeType CurrentArmorMode { get; init; }
-}
-
-[Serializable, NetSerializable]
-public sealed class StationBeacons
-{
-    public required int StationId { get; init; }
-    public required string Name { get; init; }
-    public required List<NavMapBeacon> Beacons { get; init; }
-}
-[Serializable, NetSerializable]
-public sealed class AbductorBeaconChosenBuiMsg : BoundUserInterfaceMessage
-{
-    public required NavMapBeacon Beacon { get; init; }
-}
-[Serializable, NetSerializable]
-public sealed class AbductorAttractBuiMsg : BoundUserInterfaceMessage
-{
-}
-[Serializable, NetSerializable]
-public sealed class AbductorCompleteExperimentBuiMsg : BoundUserInterfaceMessage
-{
-}
-
-[Serializable, NetSerializable]
-public sealed class AbductorVestModeChangeBuiMsg : BoundUserInterfaceMessage
-{
-    public required AbductorArmorModeType Mode { get; init; }
-}
-
-[Serializable, NetSerializable]
-public sealed class AbductorLockBuiMsg : BoundUserInterfaceMessage
-{
-}
diff --git a/Content.Shared/_Shitmed/Antags/Abductor/AbductorEnums.cs b/Content.Shared/_Shitmed/Antags/Abductor/AbductorEnums.cs
deleted file mode 100644
index 8a5c7b63bbd..00000000000
--- a/Content.Shared/_Shitmed/Antags/Abductor/AbductorEnums.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Antags.Abductor;
-
-[Serializable, NetSerializable]
-public enum AbductorExperimentatorVisuals : byte
-{
-    Full
-}
-
-[Serializable, NetSerializable]
-public enum AbductorCameraConsoleUIKey
-{
-    Key
-}
-
-[Serializable, NetSerializable]
-public enum AbductorConsoleUIKey
-{
-    Key
-}
-
-[Serializable, NetSerializable]
-public enum AbductorArmorModeType : byte
-{
-    Combat,
-    Stealth
-}
diff --git a/Content.Shared/_Shitmed/Antags/Abductor/AbductorReturnDoAfterEvent.cs b/Content.Shared/_Shitmed/Antags/Abductor/AbductorReturnDoAfterEvent.cs
deleted file mode 100644
index 89841c26355..00000000000
--- a/Content.Shared/_Shitmed/Antags/Abductor/AbductorReturnDoAfterEvent.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Map;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Antags.Abductor;
-
-[Serializable, NetSerializable]
-public sealed partial class AbductorReturnDoAfterEvent : SimpleDoAfterEvent
-{
-}
-
-[Serializable, NetSerializable]
-public sealed partial class AbductorGizmoMarkDoAfterEvent : SimpleDoAfterEvent
-{
-}
-
-[Serializable, NetSerializable]
-public sealed partial class AbductorSendYourselfDoAfterEvent : SimpleDoAfterEvent
-{
-    [DataField("coordinates", required: true)]
-    public NetCoordinates TargetCoordinates;
-
-    private AbductorSendYourselfDoAfterEvent()
-    {
-    }
-
-    public AbductorSendYourselfDoAfterEvent(NetCoordinates coords) => TargetCoordinates = coords;
-    public override DoAfterEvent Clone() => this;
-}
-[Serializable, NetSerializable]
-public sealed partial class AbductorAttractDoAfterEvent : SimpleDoAfterEvent
-{
-    [DataField("coordinates", required: true)]
-    public NetCoordinates TargetCoordinates;
-
-    [DataField("victim", required: true)]
-    public NetEntity Victim;
-    private AbductorAttractDoAfterEvent()
-    {
-    }
-
-    public AbductorAttractDoAfterEvent(NetCoordinates coords, NetEntity target)
-    {
-        TargetCoordinates = coords;
-        Victim = target;
-    }
-
-    public override DoAfterEvent Clone() => this;
-}
diff --git a/Content.Shared/_Shitmed/Antags/Abductor/AbductorsComponents.cs b/Content.Shared/_Shitmed/Antags/Abductor/AbductorsComponents.cs
deleted file mode 100644
index 17bfc3e2d81..00000000000
--- a/Content.Shared/_Shitmed/Antags/Abductor/AbductorsComponents.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.GameStates;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Audio;
-
-namespace Content.Shared._Shitmed.Antags.Abductor;
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class AbductorHumanObservationConsoleComponent : Component
-{
-    [DataField(readOnly: true)]
-    public EntProtoId? RemoteEntityProto = "AbductorHumanObservationConsoleEye";
-
-    [DataField, AutoNetworkedField]
-    public NetEntity? RemoteEntity;
-}
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class AbductorConsoleComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public NetEntity? Target;
-
-    [DataField, AutoNetworkedField]
-    public NetEntity? AlienPod;
-
-    [DataField, AutoNetworkedField]
-    public NetEntity? Experimentator;
-
-    [DataField, AutoNetworkedField]
-    public NetEntity? Armor;
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem))]
-public sealed partial class AbductorAlienPadComponent : Component
-{
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class AbductorExperimentatorComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public NetEntity? Console;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public string ContainerId = "storage";
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class AbductorGizmoComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public NetEntity? Target;
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem))]
-public sealed partial class AbductorComponent : Component
-{
-}
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class AbductorVictimComponent : Component
-{
-    [DataField("position"), AutoNetworkedField]
-    public EntityCoordinates? Position;
-
-    [DataField, AutoNetworkedField]
-    public bool Implanted;
-
-    [DataField, AutoNetworkedField]
-    public TimeSpan? LastActivation;
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem))]
-public sealed partial class AbductorOrganComponent : Component;
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class AbductorScientistComponent : Component
-{
-    [DataField("position"), AutoNetworkedField]
-    public EntityCoordinates? SpawnPosition;
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? Console;
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class RemoteEyeSourceContainerComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public EntityUid? Actor;
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class AbductorsAbilitiesComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public EntityUid? ExitConsole;
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? SendYourself;
-
-    [DataField]
-    public EntityUid[] HiddenActions = [];
-}
-
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class AbductorVestComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public AbductorArmorModeType CurrentState = AbductorArmorModeType.Stealth;
-}
-[RegisterComponent, Access(typeof(SharedAbductorSystem))]
-public sealed partial class AbductConditionComponent : Component
-{
-    [DataField("abducted"), ViewVariables(VVAccess.ReadWrite)]
-    public int Abducted;
-    [DataField("hashset"), ViewVariables(VVAccess.ReadWrite)]
-    public HashSet<NetEntity> AbductedHashs = [];
-}
-
-public sealed partial class ExitConsoleEvent : InstantActionEvent
-{
-
-}
-public sealed partial class SendYourselfEvent : WorldTargetActionEvent
-{
-
-}
-public sealed partial class AbductorReturnToShipEvent : InstantActionEvent
-{
-
-}
diff --git a/Content.Shared/_Shitmed/Antags/Abductor/SharedAbductorSystem.cs b/Content.Shared/_Shitmed/Antags/Abductor/SharedAbductorSystem.cs
deleted file mode 100644
index a75c802d81a..00000000000
--- a/Content.Shared/_Shitmed/Antags/Abductor/SharedAbductorSystem.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.Linq;
-using Robust.Shared.Containers;
-using Robust.Shared.Timing;
-
-namespace Content.Shared._Shitmed.Antags.Abductor;
-
-public abstract class SharedAbductorSystem : EntitySystem
-{
-    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] protected readonly IGameTiming Timing = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<AbductorExperimentatorComponent, EntInsertedIntoContainerMessage>(OnInsertedContainer);
-        SubscribeLocalEvent<AbductorExperimentatorComponent, EntRemovedFromContainerMessage>(OnRemovedContainer);
-        base.Initialize();
-    }
-
-    private void OnRemovedContainer(Entity<AbductorExperimentatorComponent> ent, ref EntRemovedFromContainerMessage args)
-    {
-        if (args.Container.ID != ent.Comp.ContainerId)
-            return;
-
-        if (ent.Comp.Console == null)
-        {
-            var xform = EnsureComp<TransformComponent>(ent.Owner);
-            var console = _entityLookup.GetEntitiesInRange<AbductorConsoleComponent>(xform.Coordinates, 5, LookupFlags.Approximate | LookupFlags.Dynamic)
-                .FirstOrDefault().Owner;
-            if (console != default)
-                ent.Comp.Console = GetNetEntity(console);
-        }
-        if (ent.Comp.Console != null && GetEntity(ent.Comp.Console.Value) is var consoleid && TryComp<AbductorConsoleComponent>(consoleid, out var consoleComp))
-            UpdateGui(consoleComp.Target, (consoleid, consoleComp));
-
-        _appearance.SetData(ent, AbductorExperimentatorVisuals.Full, args.Container.ContainedEntities.Count > 0);
-        Dirty(ent);
-    }
-
-    private void OnInsertedContainer(Entity<AbductorExperimentatorComponent> ent, ref EntInsertedIntoContainerMessage args)
-    {
-        if (args.Container.ID != ent.Comp.ContainerId)
-            return;
-        if (!Timing.IsFirstTimePredicted)
-            return;
-        if (ent.Comp.Console == null)
-        {
-            var xform = EnsureComp<TransformComponent>(ent.Owner);
-            var console = _entityLookup.GetEntitiesInRange<AbductorConsoleComponent>(xform.Coordinates, 5, LookupFlags.Approximate | LookupFlags.Dynamic)
-                .FirstOrDefault().Owner;
-            if (console != default)
-                ent.Comp.Console = GetNetEntity(console);
-        }
-        if (ent.Comp.Console != null && GetEntity(ent.Comp.Console.Value) is var consoleid && TryComp<AbductorConsoleComponent>(consoleid, out var consoleComp))
-            UpdateGui(consoleComp.Target, (consoleid, consoleComp));
-
-        _appearance.SetData(ent, AbductorExperimentatorVisuals.Full, args.Container.ContainedEntities.Count > 0);
-        Dirty(ent);
-    }
-    protected virtual void UpdateGui(NetEntity? target, Entity<AbductorConsoleComponent> computer)
-    {
-
-    }
-}
-
diff --git a/Content.Shared/_Shitmed/Autodoc/AutodocSteps.cs b/Content.Shared/_Shitmed/Autodoc/AutodocSteps.cs
deleted file mode 100644
index 1ac54ed0e82..00000000000
--- a/Content.Shared/_Shitmed/Autodoc/AutodocSteps.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-using Content.Shared._Shitmed.Autodoc.Components;
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared.Body.Part;
-using Content.Shared.Hands.Components;
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Autodoc;
-
-[Serializable, NetSerializable, DataRecord]
-public sealed partial class AutodocProgram
-{
-    public List<IAutodocStep> Steps = new();
-    public bool SkipFailed;
-    public string Title = string.Empty;
-}
-
-/// <summary>
-/// Something the autodoc can do during a program.
-/// </summary>
-[ImplicitDataDefinitionForInheritors]
-public partial interface IAutodocStep
-{
-    /// <summary>
-    /// Title of this step to display in the UI
-    /// </summary>
-    string Title { get; }
-
-    /// <summary>
-    /// Run the step, returning true if it is instantly complete and ready to go to the next step, or false if it needs to wait for something else.
-    /// Should throw AutodocError for player-facing errors.
-    /// </summary>
-    bool Run(Entity<AutodocComponent, HandsComponent> ent, SharedAutodocSystem autodoc);
-
-    /// <summary>
-    /// Check that this step is valid, returning false if it isn't.
-    /// </summary>
-    bool Validate(Entity<AutodocComponent> ent, SharedAutodocSystem autodoc)
-    {
-        return true;
-    }
-}
-
-/// <summary>
-/// Perform a surgery including any prerequesites like opening an incision.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed partial class SurgeryAutodocStep : IAutodocStep
-{
-    /// <summary>
-    /// The type of part to operate on.
-    /// </summary>
-    [DataField(required: true)]
-    public BodyPartType Part;
-
-    /// <summary>
-    /// The symmetry required. If this is null then symmetry is not checked (operate on an arbitrary leg for example).
-    /// </summary>
-    [DataField]
-    public BodyPartSymmetry? Symmetry;
-
-    /// <summary>
-    /// The ID of the surgery to perform.
-    /// </summary>
-    [DataField(required: true)]
-    public EntProtoId<SurgeryComponent> Surgery;
-
-    public string Title {
-        get {
-            var protoMan = IoCManager.Resolve<IPrototypeManager>();
-            var proto = protoMan.Index(Surgery);
-            var part = Loc.GetString("autodoc-body-part-" + Part.ToString());
-            return Loc.GetString("autodoc-program-step-surgery", ("part", part), ("name", proto.Name));
-        }
-    }
-
-    bool IAutodocStep.Run(Entity<AutodocComponent, HandsComponent> ent, SharedAutodocSystem autodoc)
-    {
-        var patient = autodoc.GetPatientOrThrow((ent.Owner, ent.Comp1));
-        if (autodoc.FindPart(patient, Part, Symmetry) is not {} part)
-            throw new AutodocError("body-part");
-
-        if (!autodoc.StartSurgery((ent.Owner, ent.Comp1), patient, part, Surgery))
-            throw new AutodocError("surgery-impossible");
-
-        return false; // wait for the surgery to be completed before going onto the next program step
-    }
-
-    bool IAutodocStep.Validate(Entity<AutodocComponent> ent, SharedAutodocSystem autodoc)
-    {
-        return autodoc.IsSurgery(Surgery);
-    }
-}
-
-/// <summary>
-/// Grab a specific item from storage, failing if it isn't found.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed partial class GrabItemAutodocStep : IAutodocStep
-{
-    /// <summary>
-    /// The name that an item in storage must match to get grabbed.
-    /// </summary>
-    [DataField(required: true)]
-    public string Name = string.Empty;
-
-    public string Title => Loc.GetString("autodoc-program-step-grab-item", ("name", Name));
-
-    bool IAutodocStep.Validate(Entity<AutodocComponent> ent, SharedAutodocSystem autodoc)
-    {
-        // client will never send a blank string for name
-        return !string.IsNullOrEmpty(Name) && Name.Length <= 100;
-    }
-
-    bool IAutodocStep.Run(Entity<AutodocComponent, HandsComponent> ent, SharedAutodocSystem autodoc)
-    {
-        if (autodoc.FindItem(ent, Name) is not {} item)
-            throw new AutodocError("item-unavailable");
-        autodoc.GrabItemOrThrow(ent, item);
-        return true;
-    }
-}
-
-/// <summary>
-/// Grab the first item that matches a whitelist, failing if none are found.
-/// </summary>
-[Serializable, NetSerializable]
-public abstract partial class GrabAnyItemAutodocStep : IAutodocStep
-{
-    /// <summary>
-    /// A whitelist that must be matched.
-    /// </summary>
-    public virtual EntityWhitelist Whitelist { get; }
-    private EntityWhitelist? _whitelist;
-
-    /// <summary>
-    /// Name that represents the whitelist.
-    /// </summary>
-    public virtual LocId Name { get; }
-
-    string IAutodocStep.Title => Loc.GetString("autodoc-program-step-grab-any", ("name", Loc.GetString(Name)));
-
-    bool IAutodocStep.Run(Entity<AutodocComponent, HandsComponent> ent, SharedAutodocSystem autodoc)
-    {
-        if (autodoc.FindItem(ent, _whitelist ??= Whitelist) is not {} item)
-            throw new AutodocError("item-unavailable");
-        autodoc.GrabItemOrThrow(ent, item);
-        return true;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed partial class GrabAnyOrganAutodocStep : GrabAnyItemAutodocStep
-{
-    public override EntityWhitelist Whitelist => new EntityWhitelist()
-    {
-        Components = ["Organ"]
-    };
-
-    public override LocId Name => "autodoc-item-organ";
-}
-
-[Serializable, NetSerializable]
-public sealed partial class GrabAnyBodyPartAutodocStep : GrabAnyItemAutodocStep
-{
-    public override EntityWhitelist Whitelist => new EntityWhitelist()
-    {
-        Components = ["BodyPart"]
-    };
-
-    public override LocId Name => "autodoc-item-part";
-}
-
-/// <summary>
-/// Store the held item in storage, failing if it can't be picked up.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed partial class StoreItemAutodocStep : IAutodocStep
-{
-    string IAutodocStep.Title => Loc.GetString("autodoc-program-step-store-item");
-
-    bool IAutodocStep.Run(Entity<AutodocComponent, HandsComponent> ent, SharedAutodocSystem autodoc)
-    {
-        autodoc.StoreItemOrThrow(ent);
-        return true;
-    }
-}
-
-/// <summary>
-/// Gives the held item a label, failing if there is no held item.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed partial class SetLabelAutodocStep : IAutodocStep
-{
-    [DataField(required: true)]
-    public string Label = string.Empty;
-
-    string IAutodocStep.Title => Loc.GetString("autodoc-program-step-set-label", ("label", Label));
-
-    bool IAutodocStep.Validate(Entity<AutodocComponent> ent, SharedAutodocSystem autodoc)
-    {
-        // client will never send a blank string for label
-        return !string.IsNullOrEmpty(Label) && Label.Length <= 20;
-    }
-
-    bool IAutodocStep.Run(Entity<AutodocComponent, HandsComponent> ent, SharedAutodocSystem autodoc)
-    {
-        var item = autodoc.GetHeldOrThrow(ent);
-        autodoc.LabelItem(item, Label);
-        return true;
-    }
-}
-
-/// <summary>
-/// Waits a number of seconds before going onto the next step.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed partial class WaitAutodocStep : IAutodocStep
-{
-    [DataField(required: true)]
-    public int Length;
-
-    string IAutodocStep.Title => Loc.GetString("autodoc-program-step-wait", ("length", Length));
-
-    bool IAutodocStep.Validate(Entity<AutodocComponent> ent, SharedAutodocSystem autodoc)
-    {
-        return Length > 0 && Length < 30;
-    }
-
-    bool IAutodocStep.Run(Entity<AutodocComponent, HandsComponent> ent, SharedAutodocSystem autodoc)
-    {
-        autodoc.Say(ent, Loc.GetString("autodoc-waiting"));
-        autodoc.DelayUpdate(ent, TimeSpan.FromSeconds(Length));
-        return true; // Waiting is for surgery
-    }
-}
diff --git a/Content.Shared/_Shitmed/Autodoc/AutodocUI.cs b/Content.Shared/_Shitmed/Autodoc/AutodocUI.cs
deleted file mode 100644
index a963243798f..00000000000
--- a/Content.Shared/_Shitmed/Autodoc/AutodocUI.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Autodoc;
-
-[Serializable, NetSerializable]
-public enum AutodocUiKey : byte
-{
-    Key
-}
-
-[Serializable, NetSerializable]
-public sealed class AutodocCreateProgramMessage(string title) : BoundUserInterfaceMessage
-{
-    public readonly string Title = title;
-}
-
-[Serializable, NetSerializable]
-public sealed class AutodocToggleProgramSafetyMessage(int program) : BoundUserInterfaceMessage
-{
-    public readonly int Program = program;
-}
-
-[Serializable, NetSerializable]
-public sealed class AutodocRemoveProgramMessage(int program) : BoundUserInterfaceMessage
-{
-    public readonly int Program = program;
-}
-
-[Serializable, NetSerializable]
-public sealed class AutodocAddStepMessage(int program, IAutodocStep step, int index) : BoundUserInterfaceMessage
-{
-    public readonly int Program = program;
-    public readonly IAutodocStep Step = step;
-    public readonly int Index = index;
-}
-
-[Serializable, NetSerializable]
-public sealed class AutodocRemoveStepMessage(int program, int step) : BoundUserInterfaceMessage
-{
-    public readonly int Program = program;
-    public readonly int Step = step;
-}
-
-[Serializable, NetSerializable]
-public sealed class AutodocStartMessage(int program) : BoundUserInterfaceMessage
-{
-    public readonly int Program = program;
-}
-
-[Serializable, NetSerializable]
-public sealed class AutodocStopMessage : BoundUserInterfaceMessage;
diff --git a/Content.Shared/_Shitmed/Autodoc/Components/ActiveAutodocComponent.cs b/Content.Shared/_Shitmed/Autodoc/Components/ActiveAutodocComponent.cs
deleted file mode 100644
index b07fa3d606b..00000000000
--- a/Content.Shared/_Shitmed/Autodoc/Components/ActiveAutodocComponent.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared._Shitmed.Autodoc.Components;
-
-/// <summary>
-/// Component added while operating on a patient.
-/// Only usable serverside, only thing that can be predicted is a surgery being active.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAutodocSystem))]
-[AutoGenerateComponentPause]
-public sealed partial class ActiveAutodocComponent : Component
-{
-    /// <summary>
-    /// The program index that is being used.
-    /// <c>AutodocComponent.Programs</c> is frozen while an autodoc is active.
-    /// </summary>
-    [DataField]
-    public int CurrentProgram;
-
-    /// <summary>
-    /// Index of the current program's step it is trying to do.
-    /// </summary>
-    [DataField]
-    public int ProgramStep;
-
-    /// <summary>
-    /// Whether a step is waiting on a doafter to complete.
-    /// </summary>
-    [DataField]
-    public bool Waiting;
-
-    /// <summary>
-    /// The current body, part and surgery being done, if any.
-    /// </summary>
-    [DataField]
-    public (EntityUid, EntityUid, EntProtoId)? CurrentSurgery;
-
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan NextUpdate = TimeSpan.Zero;
-}
diff --git a/Content.Shared/_Shitmed/Autodoc/Components/AutodocComponent.cs b/Content.Shared/_Shitmed/Autodoc/Components/AutodocComponent.cs
deleted file mode 100644
index b8ea4059e88..00000000000
--- a/Content.Shared/_Shitmed/Autodoc/Components/AutodocComponent.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Content.Shared.DeviceLinking;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Autodoc.Components;
-
-/// <summary>
-/// God component for autodoc.
-/// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAutodocSystem))]
-[AutoGenerateComponentState]
-public sealed partial class AutodocComponent : Component
-{
-    [DataField]
-    public ProtoId<SinkPortPrototype> OperatingTablePort = "OperatingTableReceiver";
-
-    /// <summary>
-    /// The linked operating table.
-    /// Autodocs require a linked operating table to be used.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public EntityUid? OperatingTable;
-
-    [DataField, AutoNetworkedField]
-    public List<AutodocProgram> Programs = new();
-
-    /// <summary>
-    /// Requires that the patient be asleep for forced vulnerability.
-    /// Can be disabled to operate on awake patients.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool RequireSleeping = true;
-
-    /// <summary>
-    /// The hand to hold surgery-specific items in (organs etc).
-    /// After an operation this gets put back into storage.
-    /// </summary>
-    [DataField]
-    public string ItemSlot = "surgery_specific";
-
-    /// <summary>
-    /// How long to wait between processing program steps while active.
-    /// </summary>
-    [DataField]
-    public TimeSpan UpdateDelay = TimeSpan.FromSeconds(0.5);
-
-    /// <summary>
-    /// The maximum number of programs this autodoc can have.
-    /// </summary>
-    [DataField]
-    public int MaxPrograms = 16;
-
-    /// <summary>
-    /// How long a program title is allowed to be.
-    /// </summary>
-    public int MaxProgramTitleLength = 20;
-
-    /// <summary>
-    /// The maximum number of steps a program can have.
-    /// </summary>
-    [DataField]
-    public int MaxProgramSteps = 16;
-}
-
-[Serializable, NetSerializable]
-public enum AutodocWireStatus : byte
-{
-    PowerIndicator,
-    SafetyIndicator
-}
diff --git a/Content.Shared/_Shitmed/Autodoc/Components/HandsFillComponent.cs b/Content.Shared/_Shitmed/Autodoc/Components/HandsFillComponent.cs
deleted file mode 100644
index 4a62b2f32a1..00000000000
--- a/Content.Shared/_Shitmed/Autodoc/Components/HandsFillComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared._Shitmed.Autodoc.Systems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Autodoc.Components;
-
-/// <summary>
-/// Creates a list of hands and spawns items to fill them.
-/// </summary>
-[RegisterComponent, Access(typeof(HandsFillSystem))]
-public sealed partial class HandsFillComponent : Component
-{
-    /// <summary>
-    /// The name of each hand and the item to fill it with, if any.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<string, EntProtoId?> Hands = new();
-}
diff --git a/Content.Shared/_Shitmed/Autodoc/Systems/HandsFillSystem.cs b/Content.Shared/_Shitmed/Autodoc/Systems/HandsFillSystem.cs
deleted file mode 100644
index d9e5cadaf44..00000000000
--- a/Content.Shared/_Shitmed/Autodoc/Systems/HandsFillSystem.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Shared._Shitmed.Autodoc.Components;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-
-namespace Content.Shared._Shitmed.Autodoc.Systems;
-
-public sealed class HandsFillSystem : EntitySystem
-{
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<HandsFillComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(Entity<HandsFillComponent> ent, ref MapInitEvent args)
-    {
-        if (!TryComp<HandsComponent>(ent, out var hands))
-            return;
-
-        var coords = Transform(ent).Coordinates;
-        foreach (var (name, fill) in ent.Comp.Hands)
-        {
-            _hands.AddHand(ent, name, HandLocation.Middle, hands);
-
-            if (fill is not {} id)
-                continue;
-
-            var uid = Spawn(id, coords);
-            if (!_hands.TryPickup(ent, uid, name, animate: false, handsComp: hands))
-            {
-                Log.Error($"Entity {ToPrettyString(ent)} couldn't pick up item {id} into its '{name}' hand!");
-                Del(uid);
-            }
-        }
-    }
-}
diff --git a/Content.Shared/_Shitmed/Autodoc/Systems/SharedAutodocSystem.cs b/Content.Shared/_Shitmed/Autodoc/Systems/SharedAutodocSystem.cs
deleted file mode 100644
index d1fcd67377a..00000000000
--- a/Content.Shared/_Shitmed/Autodoc/Systems/SharedAutodocSystem.cs
+++ /dev/null
@@ -1,501 +0,0 @@
-using Content.Shared._Shitmed.Autodoc;
-using Content.Shared._Shitmed.Autodoc.Components;
-using Content.Shared._Shitmed.Medical.Surgery;
-using Content.Shared._Shitmed.Medical.Surgery.Steps;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Bed.Sleep;
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Database;
-using Content.Shared.DeviceLinking;
-using Content.Shared.DeviceLinking.Events;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Labels.EntitySystems;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Storage;
-using Content.Shared.Storage.EntitySystems;
-using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using System.Linq;
-
-namespace Content.Shared._Shitmed.Autodoc.Systems;
-
-public abstract class SharedAutodocSystem : EntitySystem
-{
-    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
-    [Dependency] protected readonly IGameTiming Timing = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedLabelSystem _label = default!;
-    [Dependency] private readonly SharedStorageSystem _storage = default!;
-    [Dependency] private readonly SharedSurgerySystem _surgery = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AutodocComponent, NewLinkEvent>(OnNewLink);
-        SubscribeLocalEvent<AutodocComponent, PortDisconnectedEvent>(OnPortDisconnected);
-        Subs.BuiEvents<AutodocComponent>(AutodocUiKey.Key, s =>
-        {
-            s.Event<AutodocCreateProgramMessage>(OnCreateProgram);
-            s.Event<AutodocToggleProgramSafetyMessage>(OnToggleProgramSafety);
-            s.Event<AutodocRemoveProgramMessage>(OnRemoveProgram);
-            s.Event<AutodocAddStepMessage>(OnAddStep);
-            s.Event<AutodocRemoveStepMessage>(OnRemoveStep);
-            s.Event<AutodocStartMessage>(OnStart);
-            s.Event<AutodocStopMessage>(OnStop);
-        });
-
-        SubscribeLocalEvent<ActiveAutodocComponent, SurgeryStepEvent>(OnSurgeryStep);
-        SubscribeLocalEvent<ActiveAutodocComponent, SurgeryStepFailedEvent>(OnSurgeryStepFailed);
-        SubscribeLocalEvent<ActiveAutodocComponent, ComponentShutdown>(OnActiveShutdown);
-    }
-
-    private void OnNewLink(Entity<AutodocComponent> ent, ref NewLinkEvent args)
-    {
-        if (args.SinkPort == ent.Comp.OperatingTablePort &&
-            HasComp<OperatingTableComponent>(args.Source))
-        {
-            ent.Comp.OperatingTable = args.Source;
-            Dirty(ent);
-        }
-    }
-
-    private void OnPortDisconnected(Entity<AutodocComponent> ent, ref PortDisconnectedEvent args)
-    {
-        if (args.Port != ent.Comp.OperatingTablePort)
-            return;
-
-        ent.Comp.OperatingTable = null;
-        Dirty(ent);
-    }
-
-    #region UI Handling
-
-    private void OnCreateProgram(Entity<AutodocComponent> ent, ref AutodocCreateProgramMessage args)
-    {
-        CreateProgram(ent, args.Title);
-    }
-
-    private void OnToggleProgramSafety(Entity<AutodocComponent> ent, ref AutodocToggleProgramSafetyMessage args)
-    {
-        if (IsActive(ent))
-            return;
-
-        if (args.Program >= ent.Comp.Programs.Count)
-            return;
-
-        var program = ent.Comp.Programs[args.Program];
-        program.SkipFailed ^= true;
-        Dirty(ent);
-
-        _adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(args.Actor):user} toggled safety of autodoc program {program.Title}");
-    }
-
-    private void OnRemoveProgram(Entity<AutodocComponent> ent, ref AutodocRemoveProgramMessage args)
-    {
-        RemoveProgram(ent, args.Program);
-    }
-
-    private void OnAddStep(Entity<AutodocComponent> ent, ref AutodocAddStepMessage args)
-    {
-        if (!args.Step.Validate(ent, this))
-        {
-            Log.Warning($"User {ToPrettyString(args.Actor)} tried to add an invalid autodoc step!");
-            return;
-        }
-
-        AddStep(ent, args.Program, args.Step, args.Index, args.Actor);
-    }
-
-    private void OnRemoveStep(Entity<AutodocComponent> ent, ref AutodocRemoveStepMessage args)
-    {
-        RemoveStep(ent, args.Program, args.Step);
-    }
-
-    private void OnStart(Entity<AutodocComponent> ent, ref AutodocStartMessage args)
-    {
-        StartProgram(ent, args.Program, args.Actor);
-    }
-
-    private void OnStop(Entity<AutodocComponent> ent, ref AutodocStopMessage args)
-    {
-        RemComp<ActiveAutodocComponent>(ent);
-    }
-
-    #endregion
-
-    private void OnSurgeryStep(Entity<ActiveAutodocComponent> ent, ref SurgeryStepEvent args)
-    {
-        if (!TryComp<AutodocComponent>(ent, out var comp))
-            return;
-
-        var repeatable = HasComp<SurgeryRepeatableStepComponent>(args.Step);
-        if (args.Complete || !repeatable)
-        {
-            ent.Comp.Waiting = false; // try the next autodoc or surgery step
-            return;
-        }
-
-        // for tend wounds dont abort, more wounds need tending
-        if (HasComp<SurgeryRepeatableStepComponent>(args.Step))
-            return;
-
-        ent.Comp.Waiting = repeatable;
-    }
-
-    private void OnSurgeryStepFailed(Entity<ActiveAutodocComponent> ent, ref SurgeryStepFailedEvent args)
-    {
-        if (!TryComp<AutodocComponent>(ent, out var comp))
-            return;
-
-        var program = comp.Programs[ent.Comp.CurrentProgram];
-        var error = Loc.GetString("autodoc-error-surgery-failed");
-        if (program.SkipFailed)
-        {
-            Say(ent, Loc.GetString("autodoc-error", ("error", error)));
-            ent.Comp.ProgramStep++;
-        }
-        else
-        {
-            Say(ent, Loc.GetString("autodoc-fatal-error", ("error", error)));
-            RemCompDeferred<ActiveAutodocComponent>(ent);
-        }
-    }
-
-    private void OnActiveShutdown(Entity<ActiveAutodocComponent> ent, ref ComponentShutdown args)
-    {
-        if (!TryComp<AutodocComponent>(ent, out var comp))
-            return;
-
-        // wake the patient when program completes or errors out
-        if (GetPatient((ent.Owner, comp)) is {} patient)
-            WakePatient(patient);
-    }
-
-    protected virtual void WakePatient(EntityUid patient) { }
-
-    #region Step API
-
-    public bool IsSurgery(EntProtoId id)
-    {
-        // this is O(n) so with a fuck ton of surgeries it could slow down the server
-        return _surgery.AllSurgeries.Contains(id);
-    }
-
-    public EntityUid? FindItem(EntityUid uid, string name)
-    {
-        var storage = Comp<StorageComponent>(uid);
-        foreach (var item in storage.Container.ContainedEntities)
-        {
-            if (Name(item) == name)
-                return item;
-        }
-
-        return null;
-    }
-
-    public EntityUid? FindItem(EntityUid uid, EntityWhitelist? whitelist)
-    {
-        var storage = Comp<StorageComponent>(uid);
-        foreach (var item in storage.Container.ContainedEntities)
-        {
-            if (_whitelist.IsWhitelistPassOrNull(whitelist, item))
-                return item;
-        }
-
-        return null;
-    }
-
-    public bool GrabItem(Entity<AutodocComponent, HandsComponent> ent, EntityUid item)
-    {
-        return _hands.TryPickup(ent, item, ent.Comp1.ItemSlot, animate: false, handsComp: ent.Comp2);
-    }
-
-    public void GrabItemOrThrow(Entity<AutodocComponent, HandsComponent> ent, EntityUid item)
-    {
-        if (!GrabItem(ent, item))
-            throw new AutodocError("hand-full");
-    }
-
-    public void StoreItemOrThrow(Entity<AutodocComponent, HandsComponent> ent)
-    {
-        var item = GetHeldOrThrow(ent);
-        if (!_storage.Insert(ent, item, out _))
-            throw new AutodocError("storage-full");
-    }
-
-    public EntityUid GetHeldOrThrow(Entity<AutodocComponent, HandsComponent> ent)
-    {
-        if (!_hands.TryGetHand(ent, ent.Comp1.ItemSlot, out var hand, ent.Comp2))
-            throw new AutodocError("item-unavailable");
-
-        if (hand.HeldEntity is not {} item)
-            throw new AutodocError("item-unavailable");
-
-        return item;
-    }
-
-    public void LabelItem(EntityUid item, string label)
-    {
-        _label.Label(item, label);
-    }
-
-    public void DelayUpdate(EntityUid uid, TimeSpan delay)
-    {
-        if (TryComp<ActiveAutodocComponent>(uid, out var active))
-            active.NextUpdate += delay;
-    }
-
-    public EntityUid? GetPatient(Entity<AutodocComponent> ent)
-    {
-        if (!TryComp<StrapComponent>(ent.Comp.OperatingTable, out var strap))
-            return null;
-
-        var buckled = strap.BuckledEntities;
-        if (buckled.Count == 0)
-            return null;
-
-        var patient = buckled.First();
-        if (!HasComp<SurgeryTargetComponent>(patient))
-            return null; // TODO: auto draping anything with a body
-
-        return patient;
-    }
-
-    public EntityUid GetPatientOrThrow(Entity<AutodocComponent> ent)
-    {
-        if (GetPatient(ent) is not {} patient)
-            throw new AutodocError("missing-patient");
-
-        return patient;
-    }
-
-    public EntityUid? FindPart(EntityUid patient, BodyPartType type, BodyPartSymmetry? symmetry)
-    {
-        foreach (var ent in _body.GetBodyChildrenOfType(patient, type, symmetry: symmetry))
-        {
-            return ent.Id;
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// Starts doing a surgery, returns true if successful.
-    /// </summary>
-    public bool StartSurgery(Entity<AutodocComponent> ent, EntityUid patient, EntityUid part, EntProtoId surgery)
-    {
-        if (ent.Comp.RequireSleeping && IsAwake(patient))
-            throw new AutodocError("patient-unsedated");
-
-        if (_surgery.GetSingleton(surgery) is not {} singleton)
-            return false;
-
-        if (_surgery.GetNextStep(patient, part, singleton) is not {} pair)
-            return false;
-
-        var nextSurgery = pair.Item1;
-        var index = pair.Item2;
-        var nextStep = nextSurgery.Comp.Steps[index];
-        if (!_surgery.TryDoSurgeryStep(patient, part, ent, MetaData(nextSurgery).EntityPrototype!.ID, nextStep))
-            return false;
-
-        Comp<ActiveAutodocComponent>(ent).CurrentSurgery = (patient, part, surgery);
-        return true;
-    }
-
-    public bool IsAwake(EntityUid uid)
-    {
-        return _mobState.IsAlive(uid) && !HasComp<SleepingComponent>(uid);
-    }
-
-    /// <summary>
-    /// Create a blank program and return the index to it.
-    /// Programs cannot be created while operating or if there are too many, in which case it will return null.
-    /// </summary>
-    public int? CreateProgram(Entity<AutodocComponent> ent, string title)
-    {
-        var index = ent.Comp.Programs.Count;
-        if (IsActive(ent) || index >= ent.Comp.MaxPrograms)
-            return null;
-
-        if (string.IsNullOrEmpty(title) || title.Length > ent.Comp.MaxProgramTitleLength)
-            return null;
-
-        ent.Comp.Programs.Add(new AutodocProgram()
-        {
-            Title = title
-        });
-        Dirty(ent);
-        return index;
-    }
-
-    /// <summary>
-    /// Removes a program at an index, returning true if it succeeded.
-    /// </summary>
-    public bool RemoveProgram(Entity<AutodocComponent> ent, int index)
-    {
-        if (IsActive(ent) || index >= ent.Comp.Programs.Count)
-            return false;
-
-        ent.Comp.Programs.RemoveAt(index);
-        Dirty(ent);
-        return true;
-    }
-
-    /// <summary>
-    /// Adds a step to a program at an index, returning true if it succeeded.
-    /// </summary>
-    public bool AddStep(Entity<AutodocComponent> ent, int programIndex, IAutodocStep step, int index, EntityUid user)
-    {
-        if (IsActive(ent) || programIndex >= ent.Comp.Programs.Count)
-            return false;
-
-        var program = ent.Comp.Programs[programIndex];
-        if (program.Steps.Count >= ent.Comp.MaxProgramSteps || index < 0 || index > program.Steps.Count)
-            return false;
-
-        program.Steps.Insert(index, step);
-        Dirty(ent);
-
-        _adminLogger.Add(LogType.InteractActivate, LogImpact.Low, $"{ToPrettyString(user):user} added step '{step.Title}' to autodoc program '{program.Title}'");
-        return true;
-    }
-
-    /// <summary>
-    /// Removes a step from a program, returning true if it succeeded.
-    /// </summary>
-    public bool RemoveStep(Entity<AutodocComponent> ent, int programIndex, int step)
-    {
-        if (IsActive(ent) || programIndex >= ent.Comp.Programs.Count)
-            return false;
-
-        var program = ent.Comp.Programs[programIndex];
-        if (step >= program.Steps.Count)
-            return false;
-
-        program.Steps.RemoveAt(step);
-        Dirty(ent);
-        return true;
-    }
-
-    public bool IsActive(EntityUid uid)
-    {
-        return HasComp<ActiveAutodocComponent>(uid);
-    }
-
-    public AutodocProgram CurrentProgram(Entity<AutodocComponent, ActiveAutodocComponent> ent)
-    {
-        // not checking if it exists since Programs isnt allowed to be changed while operating
-        return ent.Comp1.Programs[ent.Comp2.CurrentProgram];
-    }
-
-    public bool StartProgram(Entity<AutodocComponent> ent, int index, EntityUid user)
-    {
-        // no error since UI checks this too
-        if (IsActive(ent) || index >= ent.Comp.Programs.Count || GetPatient(ent) is not {} patient)
-            return false;
-
-        var active = EnsureComp<ActiveAutodocComponent>(ent);
-        active.CurrentProgram = index;
-        active.NextUpdate = Timing.CurTime + ent.Comp.UpdateDelay;
-        Dirty(ent.Owner, active);
-
-        _adminLogger.Add(LogType.InteractActivate, LogImpact.High, $"{ToPrettyString(user):user} started autodoc program '{ent.Comp.Programs[index].Title}' on {ToPrettyString(patient):patient}");
-        return true;
-    }
-
-    /// <summary>
-    /// Tries to start the next step, shouting the error if it fails.
-    /// Returns true if the program is being stopped.
-    /// </summary>
-    public bool Proceed(Entity<AutodocComponent, ActiveAutodocComponent> ent)
-    {
-        if (ent.Comp2.Waiting)
-            return false;
-
-        // stay on this AutodocSurgeryStep until every step of the surgery (and its dependencies) is complete
-        // if this was the last step, StartSurgery will fail and the next autodoc step will run
-        if (ent.Comp2.CurrentSurgery is {} args)
-        {
-            var (body, part, surgery) = args;
-            if (StartSurgery((ent.Owner, ent.Comp1), body, part, surgery))
-            {
-                ent.Comp2.Waiting = true;
-                return false;
-            }
-
-            // done with the surgery onto next step!!!
-            ent.Comp2.CurrentSurgery = null;
-            ent.Comp2.ProgramStep++;
-        }
-
-        var program = ent.Comp1.Programs[ent.Comp2.CurrentProgram];
-        var index = ent.Comp2.ProgramStep;
-        if (index >= program.Steps.Count)
-        {
-            Say(ent, Loc.GetString("autodoc-program-completed"));
-            return true;
-        }
-
-        try
-        {
-            var step = program.Steps[index];
-            if (step.Run((ent.Owner, ent.Comp1, Comp<HandsComponent>(ent)), this))
-                ent.Comp2.ProgramStep++;
-            else
-                ent.Comp2.Waiting = true;
-        }
-        catch (AutodocError e)
-        {
-            var error = Loc.GetString("autodoc-error-" + e.Message);
-            if (program.SkipFailed)
-            {
-                Say(ent, Loc.GetString("autodoc-error", ("error", error)));
-                ent.Comp2.ProgramStep++;
-            }
-            else
-            {
-                Say(ent, Loc.GetString("autodoc-fatal-error", ("error", error)));
-                return true;
-            }
-        }
-
-        Dirty(ent.Owner, ent.Comp1);
-        return false;
-    }
-
-    #endregion
-
-    public virtual void Say(EntityUid uid, string msg)
-    {
-    }
-
-    public void SetSafety(Entity<AutodocComponent> ent, bool enabled)
-    {
-        if (enabled == ent.Comp.RequireSleeping)
-            return;
-
-        ent.Comp.RequireSleeping = enabled;
-        Dirty(ent);
-    }
-}
-
-/// <summary>
-/// Error autodoc steps can use to abort the program execution and shout an error message.
-/// </summary>
-public sealed class AutodocError : Exception
-{
-    /// <summary>
-    /// Message has "autodoc-error-" prepended to it, then it gets localized.
-    /// </summary>
-    public AutodocError(string message) : base(message)
-    {
-    }
-}
diff --git a/Content.Shared/_Shitmed/Body/BodyCapacity/CapacityType.cs b/Content.Shared/_Shitmed/Body/BodyCapacity/CapacityType.cs
deleted file mode 100644
index ea432251185..00000000000
--- a/Content.Shared/_Shitmed/Body/BodyCapacity/CapacityType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared._Shitmed.Body.BodyCapacity;
-public enum CapacityType
-{
-    Vascular = 0,
-    Respiratory = 1,
-    Filtering = 2,
-}
diff --git a/Content.Shared/_Shitmed/Body/BodyCapacity/OrganCapacity.cs b/Content.Shared/_Shitmed/Body/BodyCapacity/OrganCapacity.cs
deleted file mode 100644
index 6b0f559b1cd..00000000000
--- a/Content.Shared/_Shitmed/Body/BodyCapacity/OrganCapacity.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.Utility;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Body.BodyCapacity;
-
-/// <summary>
-///     This class represents a collection of organ types and their capacities.
-///     Yes. It's a shameless copy of DamageSpecifier for the sake of expandability.
-/// </summary>
-[DataDefinition, Serializable, NetSerializable]
-public sealed partial class OrganCapacity
-{
-    /// <summary>
-    ///     Main type and capacity dictionary.
-    /// </summary>
-    [DataField]
-    public Dictionary<CapacityType, FixedPoint2> Types { get; set; } = new();
-
-    /// <summary>
-    ///     Returns a sum of the damage values.
-    /// </summary>
-    public FixedPoint2 GetTotalOfType(CapacityType capacityType)
-    {
-        var total = FixedPoint2.Zero;
-        Types.TryGetValue(capacityType, out var value);
-        return total;
-    }
-
-    #region constructors
-
-    /// <summary>
-    ///     Constructor that takes another OrganCapacity instance and copies it.
-    /// </summary>
-    public OrganCapacity(OrganCapacity organCapacity)
-    {
-        Types = new(organCapacity.Types);
-    }
-
-    #endregion constructors
-
-    #region Operators
-    public static OrganCapacity operator *(OrganCapacity organCapacity, FixedPoint2 factor)
-    {
-        OrganCapacity newOrganCapacity = new();
-        foreach (var entry in organCapacity.Types)
-        {
-            newOrganCapacity.Types.Add(entry.Key, entry.Value * factor);
-        }
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator *(OrganCapacity organCapacity, (FixedPoint2 factor, CapacityType type) tuple)
-    {
-        OrganCapacity newOrganCapacity = new(organCapacity);
-        if (newOrganCapacity.Types.ContainsKey(tuple.type))
-        {
-            newOrganCapacity.Types[tuple.type] *= tuple.factor;
-        }
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator *(OrganCapacity organCapacity, float factor)
-    {
-        return organCapacity * factor;
-    }
-
-    public static OrganCapacity operator *(OrganCapacity organCapacity, (float factor, CapacityType type) tuple)
-    {
-        return organCapacity * (tuple.factor, tuple.type);
-    }
-
-    // Division operators
-    public static OrganCapacity operator /(OrganCapacity organCapacity, FixedPoint2 factor)
-    {
-        OrganCapacity newOrganCapacity = new();
-        foreach (var entry in organCapacity.Types)
-        {
-            newOrganCapacity.Types.Add(entry.Key, entry.Value / factor);
-        }
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator /(OrganCapacity organCapacity, (FixedPoint2 factor, CapacityType type) tuple)
-    {
-        OrganCapacity newOrganCapacity = new(organCapacity);
-        if (newOrganCapacity.Types.ContainsKey(tuple.type))
-        {
-            newOrganCapacity.Types[tuple.type] /= tuple.factor;
-        }
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator /(OrganCapacity organCapacity, float factor)
-    {
-        return organCapacity / factor;
-    }
-
-    public static OrganCapacity operator /(OrganCapacity organCapacity, (float factor, CapacityType type) tuple)
-    {
-        return organCapacity / (tuple.factor, tuple.type);
-    }
-
-    public static OrganCapacity operator +(OrganCapacity organCapacityA, OrganCapacity organCapacityB)
-    {
-        OrganCapacity newOrganCapacity = new(organCapacityA);
-
-        foreach (var entry in organCapacityB.Types)
-            if (!newOrganCapacity.Types.TryAdd(entry.Key, entry.Value))
-                newOrganCapacity.Types[entry.Key] += entry.Value;
-
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator +(OrganCapacity organCapacity, (FixedPoint2 value, CapacityType type) tuple)
-    {
-        OrganCapacity newOrganCapacity = new(organCapacity);
-        if (newOrganCapacity.Types.ContainsKey(tuple.type))
-            newOrganCapacity.Types[tuple.type] += tuple.value;
-
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator -(OrganCapacity organCapacityA, OrganCapacity organCapacityB)
-    {
-        OrganCapacity newOrganCapacity = new(organCapacityA);
-
-        foreach (var entry in organCapacityB.Types)
-            if (!newOrganCapacity.Types.TryAdd(entry.Key, -entry.Value))
-                newOrganCapacity.Types[entry.Key] -= entry.Value;
-
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator -(OrganCapacity organCapacity, (FixedPoint2 value, CapacityType type) tuple)
-    {
-        OrganCapacity newOrganCapacity = new(organCapacity);
-        if (newOrganCapacity.Types.ContainsKey(tuple.type))
-            newOrganCapacity.Types[tuple.type] -= tuple.value;
-
-        return newOrganCapacity;
-    }
-
-    public static OrganCapacity operator +(OrganCapacity organCapacity) => organCapacity;
-
-    public static OrganCapacity operator -(OrganCapacity organCapacity) => organCapacity * -1;
-
-    public static OrganCapacity operator *(float factor, OrganCapacity organCapacity) => organCapacity * factor;
-    public static OrganCapacity operator *((float factor, CapacityType type) tuple, OrganCapacity organCapacity)
-        => organCapacity * tuple;
-
-    public static OrganCapacity operator *(FixedPoint2 factor, OrganCapacity organCapacity) => organCapacity * factor;
-    public static OrganCapacity operator *((FixedPoint2 factor, CapacityType type) tuple, OrganCapacity organCapacity)
-        => organCapacity * tuple;
-
-    public FixedPoint2 this[CapacityType key] => Types[key];
-    #endregion
-}
diff --git a/Content.Shared/_Shitmed/Body/Components/BreathingImmunityComponent.cs b/Content.Shared/_Shitmed/Body/Components/BreathingImmunityComponent.cs
deleted file mode 100644
index b5cdac8614f..00000000000
--- a/Content.Shared/_Shitmed/Body/Components/BreathingImmunityComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Content.Shared._Shitmed.Body.Components;
-
-/// <summary>
-///     Disables a mobs need for air when this component is added.
-///     It will neither breathe nor take airloss damage.
-/// </summary>
-[RegisterComponent]
-public sealed partial class BreathingImmunityComponent : Component;
diff --git a/Content.Shared/_Shitmed/Body/Events/BodyPartEvents.cs b/Content.Shared/_Shitmed/Body/Events/BodyPartEvents.cs
deleted file mode 100644
index 3f65fc37b19..00000000000
--- a/Content.Shared/_Shitmed/Body/Events/BodyPartEvents.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Shared.Humanoid;
-using Content.Shared.Body.Part;
-
-namespace Content.Shared._Shitmed.Body.Events;
-
-/// <summary>
-/// Raised on an entity when attempting to remove a body part.
-/// </summary>
-[ByRefEvent]
-public readonly record struct AmputateAttemptEvent(EntityUid Part);
-
-// Kind of a clone of BodyPartAddedEvent for surgical reattachment specifically.
-[ByRefEvent]
-public readonly record struct BodyPartAttachedEvent(Entity<BodyPartComponent> Part);
-
-// Kind of a clone of BodyPartRemovedEvent 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);
-
-public readonly record struct BodyPartComponentsModifyEvent(EntityUid Body, bool Add);
diff --git a/Content.Shared/_Shitmed/Body/Organ/DebrainedComponent.cs b/Content.Shared/_Shitmed/Body/Organ/DebrainedComponent.cs
deleted file mode 100644
index 9f6e4d92c0b..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/DebrainedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Body.Organ;
-
-[RegisterComponent]
-public sealed partial class DebrainedComponent : Component;
diff --git a/Content.Shared/_Shitmed/Body/Organ/EarsComponent.cs b/Content.Shared/_Shitmed/Body/Organ/EarsComponent.cs
deleted file mode 100644
index 29c792dd0f4..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/EarsComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Body.Organ;
-
-[RegisterComponent]
-public sealed partial class EarsComponent : Component;
-// TODO: Use this for deafening.
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Body/Organ/EyesComponent.cs b/Content.Shared/_Shitmed/Body/Organ/EyesComponent.cs
deleted file mode 100644
index 3dade2091f1..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/EyesComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Body.Organ;
-
-[RegisterComponent]
-public sealed partial class EyesComponent : Component;
diff --git a/Content.Shared/_Shitmed/Body/Organ/HeartAttackComponent.cs b/Content.Shared/_Shitmed/Body/Organ/HeartAttackComponent.cs
deleted file mode 100644
index 642922366fd..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/HeartAttackComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Content.Shared._Shitmed.Body.Organ;
-
-// I wanted to name this SheerHeartAttackComponent :(
-[RegisterComponent]
-public sealed partial class HeartAttackComponent : Component
-{
-
-    /// <summary>
-    ///     Movement speed modifier for walking.
-    /// </summary>
-    [DataField]
-    public float WalkSpeed = 1f;
-
-    /// <summary>
-    ///     Movement speed modifier for sprinting.
-    /// </summary>
-    [DataField]
-    public float SprintSpeed = 1f;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Body/Organ/HeartComponent.cs b/Content.Shared/_Shitmed/Body/Organ/HeartComponent.cs
deleted file mode 100644
index ff97d9ed4d1..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/HeartComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Body.Organ;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class HeartComponent : Component
-{
-    /// <summary>
-    ///     The base capacity of the heart.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float Capacity;
-
-    /// <summary>
-    ///     The current capacity of the heart.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float CurrentCapacity;
-}
diff --git a/Content.Shared/_Shitmed/Body/Organ/HeartSystem.cs b/Content.Shared/_Shitmed/Body/Organ/HeartSystem.cs
deleted file mode 100644
index 08ad0f904b7..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/HeartSystem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*using Content.Shared.Body.Organ;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Medical;
-
-namespace Content.Shared._Shitmed.Body.Organ;
-
-public sealed class HeartSystem : EntitySystem
-{
-    [Dependency] private readonly MovementSpeedModifierSystem _speedModifier = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<HeartComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<HeartComponent, OrganDamageChangedEvent>(OnDamageChanged);
-        SubscribeLocalEvent<HeartAttackComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<HeartAttackComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<HeartAttackComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshSpeed);
-        SubscribeLocalEvent<HeartAttackComponent, DefibrillatorZapSuccessEvent>(OnZapSuccess);
-    }
-
-    private void OnStartup(EntityUid uid, HeartComponent component, ComponentStartup args)
-    {
-        component.CurrentCapacity = component.Capacity;
-    }
-
-    private void OnStartup(EntityUid uid, HeartAttackComponent component, ComponentStartup args)
-    {
-        component.WalkSpeed *= 0.35f;
-        component.SprintSpeed *= 0.35f;
-
-        _speedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
-    private void OnShutdown(EntityUid uid, HeartAttackComponent component, ComponentShutdown args)
-    {
-        component.WalkSpeed /= 0.35f;
-        component.SprintSpeed /= 0.35f;
-
-        _speedModifier.RefreshMovementSpeedModifiers(uid);
-    }
-
-    private void OnRefreshSpeed(EntityUid uid, HeartAttackComponent component, ref RefreshMovementSpeedModifiersEvent args)
-    {
-        args.ModifySpeed(component.WalkSpeed, component.SprintSpeed);
-    }
-
-    private void OnZapSuccess(EntityUid uid, HeartAttackComponent component, ref DefibrillatorZapSuccessEvent args)
-    {
-        RemComp<HeartAttackComponent>(uid);
-    }
-
-    private void OnDamageChanged(EntityUid uid, HeartComponent component, ref OrganDamageChangedEvent args)
-    {
-        if (!TryComp<OrganComponent>(uid, out var organ))
-            return;
-
-        component.CurrentCapacity = component.Capacity * (100 / (int) organ.Status);
-    }
-}*/
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Body/Organ/LiverComponent.cs b/Content.Shared/_Shitmed/Body/Organ/LiverComponent.cs
deleted file mode 100644
index 1fff7fee18c..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/LiverComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Body.Organ;
-
-[RegisterComponent]
-public sealed partial class LiverComponent : Component;
diff --git a/Content.Shared/_Shitmed/Body/Organ/MarkingContainerComponent.cs b/Content.Shared/_Shitmed/Body/Organ/MarkingContainerComponent.cs
deleted file mode 100644
index 4931b59a30e..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/MarkingContainerComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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._Shitmed.Body.Organ;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class MarkingContainerComponent : Component
-{
-    [DataField(required: true, customTypeSerializer: typeof(PrototypeIdSerializer<MarkingPrototype>))]
-    public string Marking = default!;
-
-}
diff --git a/Content.Shared/_Shitmed/Body/Organ/OrganEvents.cs b/Content.Shared/_Shitmed/Body/Organ/OrganEvents.cs
deleted file mode 100644
index 0b2f0e461bf..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/OrganEvents.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.Body.Organ;
-namespace Content.Shared._Shitmed.Body.Organ;
-
-public readonly record struct OrganComponentsModifyEvent(EntityUid Body, bool Add);
-
-[ByRefEvent]
-public readonly record struct OrganEnableChangedEvent(bool Enabled);
-
-[ByRefEvent]
-public readonly record struct OrganEnabledEvent(Entity<OrganComponent> Organ);
-
-[ByRefEvent]
-public readonly record struct OrganDisabledEvent(Entity<OrganComponent> Organ);
-
-public readonly record struct OrganDamageChangedEvent(bool DamageIncreased);
diff --git a/Content.Shared/_Shitmed/Body/Organ/OrganStatus.cs b/Content.Shared/_Shitmed/Body/Organ/OrganStatus.cs
deleted file mode 100644
index 1aeef6a84ce..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/OrganStatus.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Shared._Shitmed.Body.Organ;
-public enum OrganStatus
-{
-    Healthy = 0,
-    LightlyDamaged = 1,
-    ModeratelyDamaged = 2,
-    HeavilyDamaged = 3,
-    Ruined = 4
-
-}
diff --git a/Content.Shared/_Shitmed/Body/Organ/TailComponent.cs b/Content.Shared/_Shitmed/Body/Organ/TailComponent.cs
deleted file mode 100644
index 53d4913eead..00000000000
--- a/Content.Shared/_Shitmed/Body/Organ/TailComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Body.Organ;
-
-[RegisterComponent]
-public sealed partial class TailComponent : Component;
diff --git a/Content.Shared/_Shitmed/Body/Part/BodyPartAppearanceComponent.cs b/Content.Shared/_Shitmed/Body/Part/BodyPartAppearanceComponent.cs
deleted file mode 100644
index 2e7da47fa58..00000000000
--- a/Content.Shared/_Shitmed/Body/Part/BodyPartAppearanceComponent.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-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._Shitmed.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"/>.
-    ///     I don't actually know if these serializer props are necessary. I just lifted this from MS14 lol.
-    /// </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; }
-}
diff --git a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.BodyCapacity.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.BodyCapacity.cs
deleted file mode 100644
index 6e1b4ad54c1..00000000000
--- a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.BodyCapacity.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-/*using Content.Shared.Damage;
-using Content.Shared.Body.Organ;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.FixedPoint;
-
-// Namespace has set accessors, leaving it on the default.
-namespace Content.Shared.Body.Systems;
-
-public partial class SharedBodySystem
-{
-    /// <summary>
-    ///     Essentially we want to check on every tick if the organ is within the acceptable thresholds. And if it isnt
-    ///     then we will degrade the organ by dealing damage to it. The further away from the threshold, the more damage.
-    /// </summary>
-
-    public void UpdateOrgan(float frameTime)
-    {
-        var query = EntityQueryEnumerator<OrganComponent, DamageableComponent>();
-        var now = _gameTiming.CurTime;
-        while (query.MoveNext(out var uid, out var organ, out var damageable))
-        {
-            if (organ.Body is not { } body || now < organ.NextUpdate || _mobState.IsDead(body))
-                continue;
-
-            organ.NextUpdate = now + organ.UpdateDelay;
-
-            if (organ.Status < organ.DamagedStatus)
-                _damageable.TryChangeDamage(uid, GetHealingSpecifier(organ), canSever: false);
-
-            if (organ.Status != OrganStatus.Ruined && !organ.Enabled)
-            {
-                var ev = new OrganEnabledEvent((uid, organ));
-                RaiseLocalEvent(uid, ref ev);
-            }
-
-            if (organ.Status == OrganStatus.Ruined && organ.Enabled)
-            {
-                var ev = new OrganDisabledEvent((uid, organ));
-                RaiseLocalEvent(uid, ref ev);
-            }
-        }
-    }
-
-    private void OnDamageChanged(EntityUid entity, OrganComponent component, ref DamageChangedEvent args)
-    {
-        if (!TryComp<DamageableComponent>(entity, out var damageable))
-            return;
-
-        OrganStatus newStatus = GetOrganStatus(component, damageable.TotalDamage);
-        if (newStatus != component.Status)
-            component.Status = newStatus;
-
-        var ev = new OrganDamageChangedEvent(args.DamageIncreased);
-        RaiseLocalEvent(entity, ev);
-    }
-
-    public DamageSpecifier GetHealingSpecifier(OrganComponent organ)
-    {
-        var damage = new DamageSpecifier()
-        {
-            DamageDict = new Dictionary<string, FixedPoint2>()
-            {
-                { "Decay", -organ.SelfHealingAmount },
-                { "Trauma", -organ.SelfHealingAmount },
-            }
-        };
-
-        return damage;
-    }
-
-    /// <summary>
-    /// Fetches the OrganStatus equivalent of the current integrity value for the organ.
-    /// </summary>
-    public static OrganStatus GetOrganStatus(OrganComponent component, FixedPoint2 integrity)
-    {
-        var targetIntegrity = OrganStatus.Healthy;
-        foreach (var threshold in component.IntegrityThresholds)
-        {
-            if (integrity <= threshold.Value)
-                targetIntegrity = threshold.Key;
-        }
-
-        return targetIntegrity;
-    }
-
-
-
-}
-
-*/
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs
deleted file mode 100644
index 7034f5477d5..00000000000
--- a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-using System.Diagnostics;
-using System.Linq;
-using Content.Shared._White.Humanoid.Prototypes;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared._Shitmed.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, BodyPartAddedEvent>(OnPartAttachedToBody);
-        SubscribeLocalEvent<BodyComponent, BodyPartRemovedEvent>(OnPartDroppedFromBody);
-    }
-
-    private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent component, ComponentStartup args)
-    {
-        if (!TryComp(uid, out BodyPartComponent? part)
-            || part.ToHumanoidLayers() is not { } relevantLayer)
-            return;
-
-        if (part.BaseLayerId != null)
-        {
-            component.ID = part.BaseLayerId;
-            component.Type = relevantLayer;
-            return;
-        }
-
-        if (part.Body is not { Valid: true } body
-            || !TryComp(body, out HumanoidAppearanceComponent? bodyAppearance))
-            return;
-
-        var customLayers = bodyAppearance.CustomBaseLayers;
-        var spriteLayers = bodyAppearance.BaseLayers;
-        component.Type = relevantLayer;
-
-        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 bodyType = _prototypeManager.Index<BodyTypePrototype>(bodyAppearance.BodyType); // WD EDIT
-
-        if (!bodyType.Sprites.ContainsKey(part)) // WD EDIT
-            return null;
-
-        return HumanoidVisualLayersExtension.GetSexMorph(part, bodyAppearance.Sex, bodyType.Sprites[part]); // WD EDIT
-    }
-
-    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 BodyPartAddedEvent 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 BodyPartRemovedEvent args)
-    {
-        if (TerminatingOrDeleted(uid)
-            || TerminatingOrDeleted(args.Part)
-            || !TryComp(uid, out HumanoidAppearanceComponent? bodyAppearance))
-            return;
-
-        // We check for this conditional here since some entities may not have a profile... If they dont
-        // have one, and their part is gibbed, the markings will not be removed or applied properly.
-        if (!HasComp<BodyPartAppearanceComponent>(args.Part))
-            EnsureComp<BodyPartAppearanceComponent>(args.Part);
-
-        if (TryComp<BodyPartAppearanceComponent>(args.Part, out var partAppearance))
-            RemoveAppearance(uid, partAppearance, 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;
-            _humanoid.SetLayerVisibility(target, HumanoidVisualLayers.Eyes, true, true, bodyAppearance);
-        }
-
-        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, true, 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/_Shitmed/Body/Systems/SharedBodySystem.Targeting.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Targeting.cs
deleted file mode 100644
index aadb90c27a1..00000000000
--- a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.Targeting.cs
+++ /dev/null
@@ -1,518 +0,0 @@
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Content.Shared.IdentityManagement;
-using Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Standing;
-using Content.Shared._Shitmed.Targeting;
-using Content.Shared._Shitmed.Targeting.Events;
-using Robust.Shared.CPUJob.JobQueues;
-using Robust.Shared.CPUJob.JobQueues.Queues;
-using Robust.Shared.Network;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Content.Shared.Inventory;
-
-// Namespace has set accessors, leaving it on the default.
-namespace Content.Shared.Body.Systems;
-
-public partial class SharedBodySystem
-{
-    [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly StandingStateSystem _standing = default!;
-
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    private readonly string[] _severingDamageTypes = { "Slash", "Piercing", "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 InitializeIntegrityQueue()
-    {
-        _queryTargeting = GetEntityQuery<TargetingComponent>();
-        SubscribeLocalEvent<BodyComponent, TryChangePartDamageEvent>(OnTryChangePartDamage);
-        SubscribeLocalEvent<BodyComponent, DamageModifyEvent>(OnBodyDamageModify);
-        SubscribeLocalEvent<BodyPartComponent, DamageModifyEvent>(OnPartDamageModify);
-        SubscribeLocalEvent<BodyPartComponent, DamageChangedEvent>(OnDamageChanged);
-    }
-
-    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);
-        //UpdateOrgan(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 OnTryChangePartDamage(Entity<BodyComponent> ent, ref TryChangePartDamageEvent 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(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)
-                {
-                    // Evasion would trigger constantly if we don't target torso
-                    targetPart = args.CanEvade ? TargetBodyPart.Torso : 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.IgnoreResistances, args.CanSever, args.CanEvade, args.PartMultiplier, targetPart.Value, out var evaded)
-                && args.CanEvade && evaded)
-            {
-                if (_net.IsServer)
-                    _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 *= GetPartDamageModifier(targetType);
-        }
-    }
-
-    private void OnPartDamageModify(Entity<BodyPartComponent> partEnt, ref DamageModifyEvent args)
-    {
-        if (partEnt.Comp.Body != null
-            && TryComp(partEnt.Comp.Body.Value, out InventoryComponent? inventory))
-            _inventory.RelayEvent((partEnt.Comp.Body.Value, inventory), ref args);
-
-        if (Prototypes.TryIndex<DamageModifierSetPrototype>("PartDamage", out var partModifierSet))
-            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, partModifierSet);
-
-        args.Damage *= GetPartDamageModifier(partEnt.Comp.PartType);
-    }
-
-    private bool TryChangePartDamage(EntityUid entity,
-        DamageSpecifier damage,
-        bool ignoreResistances,
-        bool canSever,
-        bool canEvade,
-        float partMultiplier,
-        TargetBodyPart targetParts,
-        out bool evaded)
-    {
-        evaded = false;
-
-        if (damage.GetTotal() == 0)
-            return false;
-
-        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(entity, GetEvadeChance(targetType)))
-                {
-                    evaded = true;
-                    continue;
-                }
-
-                var damageResult = _damageable.TryChangeDamage(part.FirstOrDefault().Id, damage * partMultiplier, ignoreResistances, 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
-            && partEnt.Comp.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 TargetBodyPart GetRandomPartSpread(ushort torsoWeight = 9)
-    {
-        var rand = new System.Random((int) _timing.CurTick.Value);
-
-        const int targetPartsAmount = 9;
-        // 5 = amount of target parts except Torso
-        return rand.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, false))
-            return null;
-
-        var rand = new System.Random((int) _timing.CurTick.Value);
-
-        var totalWeight = target.TargetOdds.Values.Sum();
-        var randomValue = rand.NextFloat() * totalWeight;
-
-        foreach (var (part, weight) in target.TargetOdds)
-        {
-            if (randomValue <= weight)
-                return part;
-            randomValue -= weight;
-        }
-
-        return TargetBodyPart.Torso; // Default to torso if something goes wrong
-    }
-
-    /// <summary>
-    /// This should be called after body part damage was changed.
-    /// </summary>
-    public 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)
-        };
-
-    }
-
-    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;
-    }
-
-    /// <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
-            _ => 0.5f
-        };
-    }
-
-    /// <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)
-    {
-        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 => 0f,   // 0% chance to evade
-            BodyPartType.Hand => 0f, // 0% chance to evade
-            BodyPartType.Leg => 0f,   // 0% chance to evade
-            BodyPartType.Foot => 0f, // 0% chance to evade
-            BodyPartType.Torso => 0f, // 0% chance to evade
-            _ => 0f
-        };
-    }
-
-    public bool CanEvadeDamage(EntityUid uid)
-    {
-        return !_mobState.IsIncapacitated(uid) && !_standing.IsDown(uid);
-    }
-
-    public bool TryEvadeDamage(EntityUid uid, float evadeChance)
-    {
-        if (!CanEvadeDamage(uid))
-            return false;
-
-        if (evadeChance == 0f)
-            return false;
-
-        var rand = new System.Random((int) _timing.CurTick.Value);
-
-        return rand.Prob(evadeChance);
-    }
-
-}
diff --git a/Content.Shared/_Shitmed/Body/Vascular/Events.cs b/Content.Shared/_Shitmed/Body/Vascular/Events.cs
deleted file mode 100644
index abb13465392..00000000000
--- a/Content.Shared/_Shitmed/Body/Vascular/Events.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Shared._Shitmed.Body.Vascular;
-
-public readonly record struct VascularStrainEvent(string Key, float Value, bool Add, TimeSpan? Duration = null);
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Body/Vascular/VascularComponent.cs b/Content.Shared/_Shitmed/Body/Vascular/VascularComponent.cs
deleted file mode 100644
index bd77a3d0794..00000000000
--- a/Content.Shared/_Shitmed/Body/Vascular/VascularComponent.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-using System.Linq;
-
-namespace Content.Shared._Shitmed.Body.Vascular;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class VascularComponent : Component
-{
-    /// <summary>
-    ///     The summarized capacity of all the hearts in the vascular system.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public float Capacity;
-
-    /// <summary>
-    ///     The normal volume of blood for this vascular system.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float NormalBloodVolume = 250.0f;
-
-    /// <summary>
-    ///     Dictionary of all current strains on the vascular system, mapped by their source.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public Dictionary<string, StrainData> Strains = new();
-
-    /// <summary>
-    ///     The total combined strain of the vascular system.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float CurrentStrain => Strains.Values.Sum(strain => strain.Value);
-
-    /// <summary>
-    ///     The current heart rate of the vascular system.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeartRate = 0f;
-
-    /// <summary>
-    ///     The speed at which the heart rate tries to rectify itself towards normality.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeartRateRecoveryRate = 5.0f;
-
-    /// <summary>
-    ///     The maximum heart rate of the vascular system for this entity. Anything above this will be considered a heart failure.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeartRateHighThreshold = 100.0f;
-
-    /// <summary>
-    ///     The minimum heart rate of the vascular system for this entity. Anything below this will be considered a heart failure.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public float HeartRateLowThreshold = 60.0f;
-
-    /// <summary>
-    ///     How long has the heart been over the high threshold for?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public TimeSpan TimeOverHigh = TimeSpan.Zero;
-
-    /// <summary>
-    ///     How long has the heart been under the low threshold for?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public TimeSpan TimeUnderLow = TimeSpan.Zero;
-
-    /// <summary>
-    ///     How long must the heart be failing for before we inflict a heart attack?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public TimeSpan FailureTime = TimeSpan.FromSeconds(30);
-
-    /// <summary>
-    ///     The string key of the base strain for the vascular system.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string BaseStrainName = "body_strain";
-}
-
-[DataDefinition, Serializable, NetSerializable]
-public sealed partial class StrainData
-{
-    [DataField]
-    public float Value;
-
-    [DataField]
-    public TimeSpan? Duration;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Body/Vascular/VascularSystem.cs b/Content.Shared/_Shitmed/Body/Vascular/VascularSystem.cs
deleted file mode 100644
index 0cb85f1e3f2..00000000000
--- a/Content.Shared/_Shitmed/Body/Vascular/VascularSystem.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-/*using Content.Shared.FixedPoint;
-using Content.Shared.Body.Systems;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.Medical;
-using Content.Shared.Body.Components;
-using Content.Shared.Damage;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Damage.Prototypes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-namespace Content.Shared._Shitmed.Body.Vascular;
-
-public sealed class VascularSystem : EntitySystem
-{
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
-    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<VascularComponent, MapInitEvent>(OnMapInit, after: [typeof(SharedBodySystem)]);
-        SubscribeLocalEvent<VascularComponent, VascularStrainEvent>(OnStrainChange);
-        SubscribeLocalEvent<VascularComponent, DefibrillatorZapSuccessEvent>(OnZapSuccess);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-        var query = EntityQueryEnumerator<VascularComponent, BodyComponent>();
-
-        while (query.MoveNext(out var uid, out var component, out var body))
-        {
-            if (_mobState.IsDead(uid))
-                continue;
-
-            var isFailing = false;
-            foreach (var strain in component.Strains)
-            {
-                if (strain.Value.Duration.HasValue && _timing.CurTime > strain.Value.Duration.Value)
-                    component.Strains.Remove(strain.Key);
-            }
-
-            var capacityUtilization = component.CurrentStrain / component.Capacity;
-            if (component.HeartRate > component.HeartRateHighThreshold)
-                component.TimeOverHigh += TimeSpan.FromSeconds(frameTime);
-            else if (component.HeartRate < component.HeartRateLowThreshold)
-                component.TimeUnderLow += TimeSpan.FromSeconds(frameTime);
-            else
-            {
-                component.TimeOverHigh = TimeSpan.Zero;
-                component.TimeUnderLow = TimeSpan.Zero;
-            }
-
-            if (component.TimeUnderLow > component.FailureTime || component.TimeOverHigh > component.FailureTime)
-                isFailing = true;
-
-            if (component.CurrentStrain > component.Capacity)
-            {
-                if (!_body.TryGetBodyOrganEntityComps<HeartComponent>((uid, body), out var hearts))
-                {
-                    ChangeHeartRate(uid, component, -component.HeartRate);
-                    component.Capacity = 0;
-                    continue;
-                }
-
-                float newCapacity = 0;
-                foreach (var (heartUid, heart, organ) in hearts)
-                {
-                    _damageable.TryChangeDamage(heartUid,
-                        new DamageSpecifier(_proto.Index<DamageTypePrototype>("Decay"),
-                        (component.CurrentStrain - heart.CurrentCapacity) / (hearts.Count * 100)));
-
-                    if (organ.Enabled && heart.CurrentCapacity > 0)
-                        newCapacity += heart.CurrentCapacity;
-                }
-
-                if (newCapacity == 0)
-                    isFailing = true;
-
-                component.Capacity = newCapacity;
-                var heartRateIncrease = Math.Min(capacityUtilization * 10f, 50f);
-                ChangeHeartRate(uid, component, heartRateIncrease);
-            }
-
-            // Recovery phase - gradually return to normal heart rate if not in failure
-            if (!isFailing)
-            {
-                var averageHeartRate = (component.HeartRateHighThreshold + component.HeartRateLowThreshold) / 2;
-                var recoveryMultiplier = Math.Max(0, 1f - capacityUtilization);
-                var recovery = Math.Min(
-                    component.HeartRateRecoveryRate * recoveryMultiplier * frameTime,
-                    Math.Abs(component.HeartRate - averageHeartRate));
-                if (component.HeartRate > averageHeartRate)
-                    ChangeHeartRate(uid, component, -recovery);
-                else if (component.HeartRate < averageHeartRate)
-                    ChangeHeartRate(uid, component, recovery);
-            }
-        }
-    }
-
-    private void OnMapInit(EntityUid uid, VascularComponent component, MapInitEvent args)
-    {
-        if (!TryComp(uid, out BodyComponent? body)
-            || !_body.TryGetBodyOrganEntityComps<HeartComponent>((uid, body), out var hearts))
-            return;
-
-        foreach (var (heartUid, heart, organ) in hearts)
-            if (organ.Enabled && heart.CurrentCapacity > 0)
-                component.Capacity += heart.CurrentCapacity;
-
-        ChangeHeartRate(uid, component, (component.HeartRateHighThreshold + component.HeartRateLowThreshold) / 2);
-        Dirty(uid, component);
-    }
-
-    private void ChangeHeartRate(EntityUid uid, VascularComponent component, float change)
-    {
-        var oldRate = component.HeartRate;
-        var newRate = Math.Clamp(oldRate + change, 0, 250);
-        component.HeartRate = newRate;
-    }
-
-    private void OnStrainChange(EntityUid uid, VascularComponent component, ref VascularStrainEvent args)
-    {
-        if (args.Add)
-        {
-            TimeSpan? duration = args.Duration.HasValue
-                ? _timing.CurTime + args.Duration.Value
-                : null;
-
-            component.Strains[args.Key] = new StrainData
-            {
-                Value = args.Value,
-                Duration = duration
-            };
-        }
-        else
-            component.Strains.Remove(args.Key);
-    }
-
-    private void OnZapSuccess(EntityUid uid, VascularComponent component, ref DefibrillatorZapSuccessEvent args)
-    {
-        ChangeHeartRate(uid, component, ((component.HeartRateHighThreshold + component.HeartRateLowThreshold) / 2) - component.HeartRate);
-        component.TimeOverHigh = TimeSpan.Zero;
-        component.TimeUnderLow = TimeSpan.Zero;
-    }
-}*/
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/BodyEffects/BodyPartEffectComponent.cs b/Content.Shared/_Shitmed/BodyEffects/BodyPartEffectComponent.cs
deleted file mode 100644
index be6ab40a2d2..00000000000
--- a/Content.Shared/_Shitmed/BodyEffects/BodyPartEffectComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared._Shitmed.BodyEffects;
-
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
-public sealed partial class BodyPartEffectComponent : Component
-{
-    /// <summary>
-    ///     The components that are active on the part and will be refreshed every 5s
-    /// </summary>
-    [DataField]
-    public ComponentRegistry Active = new();
-
-    /// <summary>
-    ///     How long to wait between each refresh.
-    ///     Effects can only last at most this long once the organ is removed.
-    /// </summary>
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(5);
-
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextUpdate = TimeSpan.Zero;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/BodyEffects/BodyPartEffectSystem.cs b/Content.Shared/_Shitmed/BodyEffects/BodyPartEffectSystem.cs
deleted file mode 100644
index 0f6b9a37c42..00000000000
--- a/Content.Shared/_Shitmed/BodyEffects/BodyPartEffectSystem.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared.Body.Part;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager;
-using Robust.Shared.Timing;
-using System.Linq;
-
-namespace Content.Shared._Shitmed.BodyEffects;
-public partial class BodyPartEffectSystem : EntitySystem
-{
-    [Dependency] private readonly ISerializationManager _serManager = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<BodyPartComponent, BodyPartComponentsModifyEvent>(OnPartComponentsModify);
-    }
-
-    // While I would love to kill this function, problem is that if we happen to have two parts that add the same
-    // effect, removing one will remove both of them, since we cant tell what the source of a Component is.
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<BodyPartEffectComponent, BodyPartComponent>();
-        var now = _gameTiming.CurTime;
-        while (query.MoveNext(out var uid, out var comp, out var part))
-        {
-            if (now < comp.NextUpdate || !comp.Active.Any() || part.Body is not { } body)
-                continue;
-
-            comp.NextUpdate = now + comp.Delay;
-            AddComponents(body, uid, comp.Active);
-        }
-    }
-
-    private void OnPartComponentsModify(Entity<BodyPartComponent> partEnt,
-        ref BodyPartComponentsModifyEvent ev)
-    {
-        if (partEnt.Comp.OnAdd != null)
-        {
-            if (ev.Add)
-                AddComponents(ev.Body, partEnt, partEnt.Comp.OnAdd);
-            else
-                RemoveComponents(ev.Body, partEnt, partEnt.Comp.OnAdd);
-        }
-
-        if (partEnt.Comp.OnRemove != null)
-        {
-            if (ev.Add)
-                AddComponents(ev.Body, partEnt, partEnt.Comp.OnRemove);
-            else
-                RemoveComponents(ev.Body, partEnt, partEnt.Comp.OnRemove);
-        }
-
-        Dirty(partEnt, partEnt.Comp);
-    }
-
-    private void AddComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        BodyPartEffectComponent? effectComp = null)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        foreach (var (key, comp) in reg)
-        {
-            var compType = comp.Component.GetType();
-            if (HasComp(body, compType))
-                continue;
-
-            var newComp = (Component) _serManager.CreateCopy(comp.Component, notNullableOverride: true);
-            EntityManager.AddComponent(body, newComp, true);
-
-            effectComp.Active[key] = comp;
-        }
-    }
-
-    private void RemoveComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        BodyPartEffectComponent? effectComp = null)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        foreach (var (key, comp) in reg)
-        {
-            RemComp(body, comp.Component.GetType());
-            effectComp.Active.Remove(key);
-        }
-    }
-}
diff --git a/Content.Shared/_Shitmed/BodyEffects/OrganEffectComponent.cs b/Content.Shared/_Shitmed/BodyEffects/OrganEffectComponent.cs
deleted file mode 100644
index c0c627b8f0b..00000000000
--- a/Content.Shared/_Shitmed/BodyEffects/OrganEffectComponent.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// We keep this clone of the other component since I don't know yet if I'll need organ specific functions in the future.
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared._Shitmed.BodyEffects;
-
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
-public sealed partial class OrganEffectComponent : Component
-{
-    /// <summary>
-    ///     The components that are active on the part and will be refreshed every 5s
-    /// </summary>
-    [DataField]
-    public ComponentRegistry Active = new();
-
-    /// <summary>
-    ///     How long to wait between each refresh.
-    ///     Effects can only last at most this long once the organ is removed.
-    /// </summary>
-    [DataField]
-    public TimeSpan Delay = TimeSpan.FromSeconds(5);
-
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextUpdate = TimeSpan.Zero;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/BodyEffects/OrganEffectSystem.cs b/Content.Shared/_Shitmed/BodyEffects/OrganEffectSystem.cs
deleted file mode 100644
index 991a8cbf83e..00000000000
--- a/Content.Shared/_Shitmed/BodyEffects/OrganEffectSystem.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// We keep this clone of the other system since I don't know yet if I'll need organ specific functions in the future.
-// will delete or refactor as time goes on.
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared.Body.Organ;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-using System.Linq;
-
-
-namespace Content.Shared._Shitmed.BodyEffects;
-public sealed partial class OrganEffectSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<OrganComponent, OrganComponentsModifyEvent>(OnOrganComponentsModify);
-    }
-
-    // While I would love to kill this function, problem is that if we happen to have two parts that add the same
-    // effect, removing one will remove both of them, since we cant tell what the source of a Component is.
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-        var query = EntityQueryEnumerator<OrganEffectComponent, OrganComponent>();
-        var now = _gameTiming.CurTime;
-        while (query.MoveNext(out var uid, out var comp, out var part))
-        {
-            if (now < comp.NextUpdate
-                || !comp.Active.Any()
-                || part.Body is not { } body
-                || !part.Enabled)
-                continue;
-
-            comp.NextUpdate = now + comp.Delay;
-            AddComponents(body, uid, comp.Active, comp, false);
-        }
-    }
-
-    private void OnOrganComponentsModify(Entity<OrganComponent> organEnt,
-        ref OrganComponentsModifyEvent ev)
-    {
-        if (organEnt.Comp.OnAdd != null)
-        {
-            if (ev.Add)
-                AddComponents(ev.Body, organEnt, organEnt.Comp.OnAdd);
-            else
-                RemoveComponents(ev.Body, organEnt, organEnt.Comp.OnAdd);
-        }
-
-        if (organEnt.Comp.OnRemove != null)
-        {
-            if (ev.Add)
-                RemoveComponents(ev.Body, organEnt, organEnt.Comp.OnRemove);
-            else
-                AddComponents(ev.Body, organEnt, organEnt.Comp.OnRemove);
-        }
-    }
-
-    private void AddComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        OrganEffectComponent? effectComp = null,
-        bool? removeExisting = true)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        EntityManager.AddComponents(body, reg, removeExisting ?? true);
-        foreach (var (key, comp) in reg)
-        {
-            effectComp.Active[key] = comp;
-        }
-    }
-
-    private void RemoveComponents(EntityUid body,
-        EntityUid part,
-        ComponentRegistry reg,
-        OrganEffectComponent? effectComp = null)
-    {
-        if (!Resolve(part, ref effectComp, logMissing: false))
-            return;
-
-        EntityManager.RemoveComponents(body, reg);
-        foreach (var key in reg.Keys)
-        {
-            effectComp.Active.Remove(key);
-        }
-    }
-}
diff --git a/Content.Shared/_Shitmed/BodyEffects/Subsystems/GenerateChildPartComponent.cs b/Content.Shared/_Shitmed/BodyEffects/Subsystems/GenerateChildPartComponent.cs
deleted file mode 100644
index e581867fc30..00000000000
--- a/Content.Shared/_Shitmed/BodyEffects/Subsystems/GenerateChildPartComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.BodyEffects.Subsystems;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class GenerateChildPartComponent : Component
-{
-
-    [DataField(required: true)]
-    public EntProtoId Id = "";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? ChildPart;
-
-    [DataField]
-    public bool Active = false;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/BodyEffects/Subsystems/GenerateChildPartSystem.cs b/Content.Shared/_Shitmed/BodyEffects/Subsystems/GenerateChildPartSystem.cs
deleted file mode 100644
index f5067266182..00000000000
--- a/Content.Shared/_Shitmed/BodyEffects/Subsystems/GenerateChildPartSystem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Content.Shared.Body.Part;
-using Content.Shared.Body.Systems;
-using Content.Shared._Shitmed.Body.Events;
-using Robust.Shared.Map;
-using Robust.Shared.Network;
-using System.Numerics;
-
-namespace Content.Shared._Shitmed.BodyEffects.Subsystems;
-
-public sealed class GenerateChildPartSystem : EntitySystem
-{
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
-    [Dependency] private readonly INetManager _net = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GenerateChildPartComponent, BodyPartComponentsModifyEvent>(OnPartComponentsModify);
-    }
-
-    private void OnPartComponentsModify(EntityUid uid, GenerateChildPartComponent component, ref BodyPartComponentsModifyEvent args)
-    {
-        if (args.Add)
-            CreatePart(uid, component);
-        //else
-            //DeletePart(uid, component);
-    }
-
-    private void CreatePart(EntityUid uid, GenerateChildPartComponent component)
-    {
-        if (!TryComp(uid, out BodyPartComponent? partComp)
-            || partComp.Body is null
-            || component.Active)
-            return;
-
-        // I pinky swear to also move this to the server side properly next update :)
-        if (_net.IsServer)
-        {
-            var childPart = Spawn(component.Id, new EntityCoordinates(partComp.Body.Value, Vector2.Zero));
-
-            if (!TryComp(childPart, out BodyPartComponent? childPartComp))
-                return;
-
-            var slotName = _bodySystem.GetSlotFromBodyPart(childPartComp);
-            _bodySystem.TryCreatePartSlot(uid, slotName, childPartComp.PartType, out var _);
-            _bodySystem.AttachPart(uid, slotName, childPart, partComp, childPartComp);
-            component.ChildPart = childPart;
-            component.Active = true;
-            Dirty(childPart, childPartComp);
-        }
-    }
-
-    // Still unusued, gotta figure out what I want to do with this function outside of fuckery with mantis blades.
-    private void DeletePart(EntityUid uid, GenerateChildPartComponent component)
-    {
-        if (!TryComp(uid, out BodyPartComponent? partComp))
-            return;
-
-        _bodySystem.DropSlotContents((uid, partComp));
-        var ev = new BodyPartDroppedEvent((uid, partComp));
-        RaiseLocalEvent(uid, ref ev);
-        QueueDel(uid);
-    }
-}
-
diff --git a/Content.Shared/_Shitmed/BodyEffects/Subsystems/RandomStatusActivationComponent.cs b/Content.Shared/_Shitmed/BodyEffects/Subsystems/RandomStatusActivationComponent.cs
deleted file mode 100644
index ad849e3ebb1..00000000000
--- a/Content.Shared/_Shitmed/BodyEffects/Subsystems/RandomStatusActivationComponent.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Content.Shared.StatusEffect;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared._Shitmed.BodyEffects.Subsystems;
-
-[RegisterComponent]
-[AutoGenerateComponentPause]
-public sealed partial class RandomStatusActivationComponent : Component
-{
-    /// <summary>
-    /// List of status effects to roll while the organ is installed.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<ProtoId<StatusEffectPrototype>, string> StatusEffects = new();
-
-    /// <summary>
-    ///     How long the status effect should last for.
-    /// </summary>
-    [DataField]
-    public TimeSpan? Duration;
-
-    /// <summary>
-    ///     What is the minimum time between activations?
-    /// </summary>
-    [DataField]
-    public TimeSpan MinActivationTime = TimeSpan.FromSeconds(60);
-
-    /// <summary>
-    ///     What is the maximum time between activations?
-    /// </summary>
-    [DataField]
-    public TimeSpan MaxActivationTime = TimeSpan.FromSeconds(300);
-
-    /// <summary>
-    ///     The next time the organ will activate.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextUpdate;
-}
diff --git a/Content.Shared/_Shitmed/Cybernetics/CyberneticsComponent.cs b/Content.Shared/_Shitmed/Cybernetics/CyberneticsComponent.cs
deleted file mode 100644
index 43c1588c2a6..00000000000
--- a/Content.Shared/_Shitmed/Cybernetics/CyberneticsComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Cybernetics;
-
-/// <summary>
-/// Component for cybernetic implants that can be installed in entities
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class CyberneticsComponent : Component 
-{
-    /// <summary>
-    ///     Is the cybernetic implant disabled by EMPs, etc?
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Disabled = false;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Humanoid/Events/ProfileLoadFinishedEvent.cs b/Content.Shared/_Shitmed/Humanoid/Events/ProfileLoadFinishedEvent.cs
deleted file mode 100644
index 6d571651046..00000000000
--- a/Content.Shared/_Shitmed/Humanoid/Events/ProfileLoadFinishedEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared._Shitmed.Humanoid.Events;
-
-/// <summary>
-///     Raised on an entity when their profile has finished being loaded
-/// </summary>
-public sealed class ProfileLoadFinishedEvent : EntityEventArgs { }
-
diff --git a/Content.Shared/_Shitmed/ItemSwitch/Components/ItemSwitchComponent.cs b/Content.Shared/_Shitmed/ItemSwitch/Components/ItemSwitchComponent.cs
deleted file mode 100644
index 1d99a3607d6..00000000000
--- a/Content.Shared/_Shitmed/ItemSwitch/Components/ItemSwitchComponent.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
-
-namespace Content.Shared._Shitmed.ItemSwitch.Components;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
-public sealed partial class ItemSwitchComponent : Component
-{
-    /// <summary>
-    ///     The item's toggle state.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public string State;
-
-    [DataField(readOnly: true)]
-    public Dictionary<string, ItemSwitchState> States = [];
-
-    /// <summary>
-    /// Can the entity be activated in the world.
-    /// </summary>
-    [DataField]
-    public bool OnActivate = true;
-
-    /// <summary>
-    /// If this is set to false then the item can't be toggled by pressing Z.
-    /// Use another system to do it then.
-    /// </summary>
-    [DataField]
-    public bool OnUse = true;
-
-    /// <summary>
-    ///     Whether the item's toggle can be predicted by the client.
-    /// </summary>
-    /// /// <remarks>
-    /// If server-side systems affect the item's toggle, like charge/fuel systems, then the item is not predictable.
-    /// </remarks>
-    [DataField]
-    public bool Predictable = true;
-
-    /// <summary>
-    ///     Whether the item's currently toggled state should be shown in the UI.
-    /// </summary>
-    [DataField]
-    public bool ShowLabel = false;
-}
-[DataDefinition]
-public sealed partial class ItemSwitchState : BoundUserInterfaceMessage
-{
-    [DataField]
-    public string Verb;
-
-    [DataField]
-    public SoundSpecifier? SoundStateActivate;
-
-    [DataField]
-    public SoundSpecifier? SoundFailToActivate;
-
-    [DataField]
-    public ComponentRegistry? Components;
-
-    [DataField]
-    public bool RemoveComponents = true;
-
-    [DataField]
-    public SpriteSpecifier? Sprite;
-
-    [DataField]
-    public bool Hidden;
-}
-
-/// <summary>
-/// Raised directed on an entity when its ItemToggle is attempted to be activated.
-/// </summary>
-[ByRefEvent]
-public record struct ItemSwitchAttemptEvent()
-{
-    public bool Cancelled = false;
-    public required readonly EntityUid? User { get; init; }
-    public required readonly string State { get; init; }
-    /// <summary>
-    /// Pop-up that gets shown to users explaining why the attempt was cancelled.
-    /// </summary>
-    public string? Popup { get; set; }
-}
-
-/// <summary>
-/// Raised directed on an entity any sort of toggle is complete.
-/// </summary>
-[ByRefEvent]
-public readonly record struct ItemSwitchedEvent()
-{
-    public required readonly bool Predicted { get; init; }
-    public required readonly string State { get; init; }
-    public required readonly EntityUid? User { get; init; }
-}
diff --git a/Content.Shared/_Shitmed/ItemSwitch/SharedItemSwitchSystem.cs b/Content.Shared/_Shitmed/ItemSwitch/SharedItemSwitchSystem.cs
deleted file mode 100644
index 79df5633080..00000000000
--- a/Content.Shared/_Shitmed/ItemSwitch/SharedItemSwitchSystem.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-using System.Linq;
-using Content.Shared.Clothing.Components;
-using Content.Shared.Clothing.EntitySystems;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Item;
-using Content.Shared._Shitmed.ItemSwitch.Components;
-using Content.Shared._Shitmed.Switchable;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Network;
-
-namespace Content.Shared._Shitmed.ItemSwitch;
-public abstract class SharedItemSwitchSystem : EntitySystem
-{
-    [Dependency] private readonly INetManager _netManager = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedItemSystem _item = default!;
-    [Dependency] private readonly ClothingSystem _clothing = default!;
-
-    private EntityQuery<ItemSwitchComponent> _query;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _query = GetEntityQuery<ItemSwitchComponent>();
-
-        //SubscribeLocalEvent<ItemSwitchComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<ItemSwitchComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<ItemSwitchComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<ItemSwitchComponent, GetVerbsEvent<ActivationVerb>>(OnActivateVerb);
-        SubscribeLocalEvent<ItemSwitchComponent, ActivateInWorldEvent>(OnActivate);
-
-        SubscribeLocalEvent<ClothingComponent, ItemSwitchedEvent>(UpdateClothingLayer);
-    }
-
-
-    /*private void OnStartup(Entity<ItemSwitchComponent> ent, ref ComponentStartup args)
-    {
-        var state = ent.Comp.State;
-        state ??= ent.Comp.States.Keys.FirstOrDefault();
-        if (state != null)
-            Switch((ent, ent.Comp), state, predicted: ent.Comp.Predictable);
-    }*/
-
-    private void OnMapInit(Entity<ItemSwitchComponent> ent, ref MapInitEvent args)
-    {
-        var state = ent.Comp.State;
-        state ??= ent.Comp.States.Keys.FirstOrDefault();
-        if (state != null)
-            Switch((ent, ent.Comp), state, predicted: ent.Comp.Predictable);
-    }
-
-    private void OnUseInHand(Entity<ItemSwitchComponent> ent, ref UseInHandEvent args)
-    {
-        if (args.Handled || !ent.Comp.OnUse || ent.Comp.States.Count == 0) return;
-        args.Handled = true;
-
-        if (ent.Comp.States.TryGetValue(Next(ent), out var state) && state.Hidden)
-            return;
-
-        Switch((ent, ent.Comp), Next(ent), args.User, predicted: ent.Comp.Predictable);
-    }
-
-    private void OnActivateVerb(Entity<ItemSwitchComponent> ent, ref GetVerbsEvent<ActivationVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || !ent.Comp.OnActivate || ent.Comp.States.Count == 0) return;
-
-        var user = args.User;
-        int addedVerbs = 0;
-
-        foreach (var state in ent.Comp.States)
-        {
-            if (state.Value.Hidden)
-                continue;
-
-            args.Verbs.Add(new ActivationVerb()
-            {
-                Text = Loc.TryGetString(state.Value.Verb, out var title) ? title : state.Value.Verb,
-                Category = VerbCategory.Switch,
-                Act = () => Switch((ent.Owner, ent.Comp), state.Key, user, ent.Comp.Predictable)
-            });
-            addedVerbs++;
-        }
-
-        if (addedVerbs > 0)
-            args.ExtraCategories.Add(VerbCategory.Switch);
-    }
-
-    private void OnActivate(Entity<ItemSwitchComponent> ent, ref ActivateInWorldEvent args)
-    {
-        if (args.Handled || !ent.Comp.OnActivate)
-            return;
-
-        args.Handled = true;
-
-        if (ent.Comp.States.TryGetValue(Next(ent), out var state) && state.Hidden)
-            return;
-
-        Switch((ent.Owner, ent.Comp), Next(ent), args.User, predicted: ent.Comp.Predictable);
-    }
-
-    private static string Next(Entity<ItemSwitchComponent> ent)
-    {
-        var foundCurrent = false;
-        string firstState = null!;
-
-        foreach (var state in ent.Comp.States.Keys)
-        {
-            firstState ??= state;
-
-            if (foundCurrent)
-                return state;
-
-            if (state == ent.Comp.State)
-                foundCurrent = true;
-        }
-        return firstState;
-    }
-
-    /// <summary>
-    /// Used when an item is attempted to be toggled.
-    /// Sets its state to the opposite of what it is.
-    /// </summary>
-    /// <returns>Same as <see cref="TrySetActive"/></returns>
-    public bool Switch(Entity<ItemSwitchComponent?> ent, string key, EntityUid? user = null, bool predicted = true)
-    {
-        if (!_query.Resolve(ent, ref ent.Comp, false) || !ent.Comp.States.TryGetValue(key, out var state))
-            return false;
-
-        var uid = ent.Owner;
-        var comp = ent.Comp;
-
-        if (!comp.Predictable && _netManager.IsClient)
-            return true;
-
-        var attempt = new ItemSwitchAttemptEvent
-        {
-            User = user,
-            State = key
-        };
-        RaiseLocalEvent(uid, ref attempt);
-
-        if (ent.Comp.States.TryGetValue(ent.Comp.State, out var prevState)
-            && prevState.RemoveComponents
-            && prevState.Components is not null)
-            EntityManager.RemoveComponents(ent, prevState.Components);
-
-        if (state.Components is not null)
-            EntityManager.AddComponents(ent, state.Components);
-
-        if (!comp.Predictable) predicted = false;
-
-        if (attempt.Cancelled)
-        {
-            if (predicted)
-                _audio.PlayPredicted(state.SoundFailToActivate, uid, user);
-            else
-                _audio.PlayPvs(state.SoundFailToActivate, uid);
-
-            if (attempt.Popup != null && user != null)
-                if (predicted)
-                    _popup.PopupClient(attempt.Popup, uid, user.Value);
-                else
-                    _popup.PopupEntity(attempt.Popup, uid, user.Value);
-
-            return false;
-        }
-
-        if (predicted)
-            _audio.PlayPredicted(state.SoundStateActivate, uid, user);
-        else
-            _audio.PlayPvs(state.SoundStateActivate, uid);
-
-        comp.State = key;
-        UpdateVisuals((uid, comp), key);
-        Dirty(uid, comp);
-
-        var switched = new ItemSwitchedEvent { Predicted = predicted, State = key, User = user };
-        RaiseLocalEvent(uid, ref switched);
-
-        return true;
-    }
-    public virtual void VisualsChanged(Entity<ItemSwitchComponent> ent, string key)
-    {
-
-    }
-    protected virtual void UpdateVisuals(Entity<ItemSwitchComponent> ent, string key)
-    {
-        if (TryComp(ent, out AppearanceComponent? appearance))
-            _appearance.SetData(ent, SwitchableVisuals.Switched, key, appearance);
-        _item.SetHeldPrefix(ent, key);
-
-        VisualsChanged(ent, key);
-    }
-    private void UpdateClothingLayer(Entity<ClothingComponent> ent, ref ItemSwitchedEvent args)
-        => _clothing.SetEquippedPrefix(ent, args.State, ent.Comp);
-}
diff --git a/Content.Shared/_Shitmed/OnHit/CuffsOnHitComponent.cs b/Content.Shared/_Shitmed/OnHit/CuffsOnHitComponent.cs
deleted file mode 100644
index 80bbb2d9017..00000000000
--- a/Content.Shared/_Shitmed/OnHit/CuffsOnHitComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Audio;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.OnHit;
-
-[RegisterComponent]
-public sealed partial class CuffsOnHitComponent : Component
-{
-    [DataField("proto")]
-    public ProtoId<EntityPrototype>? HandcuffPrototype;
-
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(1);
-
-    [DataField("sound")]
-    public SoundSpecifier? Sound;
-}
-
-[ByRefEvent]
-public record struct CuffsOnHitAttemptEvent(bool Cancelled);
-
-[Serializable, NetSerializable]
-public sealed partial class CuffsOnHitDoAfter : SimpleDoAfterEvent { }
diff --git a/Content.Shared/_Shitmed/OnHit/InjectOnHitComponent.cs b/Content.Shared/_Shitmed/OnHit/InjectOnHitComponent.cs
deleted file mode 100644
index 9ad1e7adfb0..00000000000
--- a/Content.Shared/_Shitmed/OnHit/InjectOnHitComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Audio;
-
-namespace Content.Shared._Shitmed.OnHit;
-
-[RegisterComponent]
-public sealed partial class InjectOnHitComponent : Component
-{
-    [DataField("reagents")]
-    public List<ReagentQuantity> Reagents;
-
-    [DataField("sound")]
-    public SoundSpecifier? Sound;
-
-    [DataField("limit")]
-    public float? ReagentLimit;
-
-    [DataField]
-    public bool NeedsRestrain;
-
-    [DataField]
-    public int InjectionDelay = 10000;
-}
-[ByRefEvent]
-public record struct InjectOnHitAttemptEvent(bool Cancelled);
diff --git a/Content.Shared/_Shitmed/OnHit/SharedOnHitSystem.cs b/Content.Shared/_Shitmed/OnHit/SharedOnHitSystem.cs
deleted file mode 100644
index b27f3ae6b4f..00000000000
--- a/Content.Shared/_Shitmed/OnHit/SharedOnHitSystem.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using System.Linq;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Cuffs;
-using Content.Shared.Cuffs.Components;
-using Content.Shared.DoAfter;
-using Content.Shared.Effects;
-using Content.Shared.FixedPoint;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Stunnable;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Network;
-using Robust.Shared.Player;
-using Robust.Shared.Timing;
-namespace Content.Shared._Shitmed.OnHit;
-
-public abstract class SharedOnHitSystem : EntitySystem
-{
-    [Dependency] protected readonly INetManager _net = default!;
-    [Dependency] protected readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] protected readonly SharedAudioSystem _audio = default!;
-    [Dependency] protected readonly ReactiveSystem _reactiveSystem = default!;
-    [Dependency] protected readonly SharedSolutionContainerSystem _solutionContainers = default!;
-    [Dependency] protected readonly SharedColorFlashEffectSystem _color = default!;
-    [Dependency] protected readonly SharedCuffableSystem _cuffs = default!;
-
-    [Dependency] protected readonly MobStateSystem _mobState = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<InjectOnHitComponent, MeleeHitEvent>(OnInjectOnMeleeHit);
-        SubscribeLocalEvent<CuffsOnHitComponent, MeleeHitEvent>(OnCuffsOnMeleeHit);
-
-        base.Initialize();
-    }
-
-    private void OnCuffsOnMeleeHit(Entity<CuffsOnHitComponent> ent, ref MeleeHitEvent args)
-    {
-        if (!args.IsHit
-         || !args.HitEntities.Any())
-            return;
-
-        var ev = new InjectOnHitAttemptEvent();
-        RaiseLocalEvent(ent, ref ev);
-        if (ev.Cancelled)
-            return;
-
-        foreach (var target in args.HitEntities)
-        {
-            if (!TryComp<CuffableComponent>(target, out var cuffable) || cuffable.Container.Count != 0)
-                continue;
-            var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.Duration, new CuffsOnHitDoAfter(), ent, target)
-            {
-                BreakOnMove = true,
-                BreakOnWeightlessMove = false,
-                BreakOnDamage = true,
-                NeedHand = true,
-                DistanceThreshold = 1f
-            };
-
-            if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
-                continue;
-            _color.RaiseEffect(Color.FromHex("#601653"), new List<EntityUid>(1) { target }, Filter.Pvs(target, entityManager: EntityManager));
-        }
-    }
-
-    private void OnInjectOnMeleeHit(Entity<InjectOnHitComponent> ent, ref MeleeHitEvent args)
-    {
-        if (!args.IsHit
-            || !args.HitEntities.Any())
-            return;
-
-        var ev = new InjectOnHitAttemptEvent();
-        RaiseLocalEvent(ent, ref ev);
-        if (ev.Cancelled)
-            return;
-
-        foreach (var target in args.HitEntities)
-        {
-            if (_solutionContainers.TryGetInjectableSolution(target, out var targetSoln, out var targetSolution))
-            {
-                var solution = new Solution(ent.Comp.Reagents);
-                foreach (var reagent in ent.Comp.Reagents)
-                    if (ent.Comp.ReagentLimit != null && _solutionContainers.GetTotalPrototypeQuantity(target, reagent.Reagent.ToString()) >= FixedPoint2.New(ent.Comp.ReagentLimit.Value))
-                        return;
-
-                if (!ent.Comp.NeedsRestrain
-                    || _mobState.IsIncapacitated(target)
-                    || HasComp<StunnedComponent>(target)
-                    || HasComp<KnockedDownComponent>(target)
-                    || TryComp<CuffableComponent>(target, out var cuffable)
-                    && _cuffs.IsCuffed((target, cuffable)))
-                {
-                    _reactiveSystem.DoEntityReaction(target, solution, ReactionMethod.Injection);
-                    _solutionContainers.TryAddSolution(targetSoln.Value, solution);
-                }
-                else
-                {
-                    Timer.Spawn(ent.Comp.InjectionDelay, () =>
-                    {
-                        _reactiveSystem.DoEntityReaction(target, solution, ReactionMethod.Injection);
-                        _solutionContainers.TryAddSolution(targetSoln.Value, solution);
-                    });
-                }
-                _color.RaiseEffect(Color.FromHex("#0000FF"), new List<EntityUid>(1) { target }, Filter.Pvs(target, entityManager: EntityManager));
-            }
-            if (ent.Comp.Sound is not null && _net.IsServer)
-                _audio.PlayPvs(ent.Comp.Sound, target);
-        }
-    }
-
-    public override void Update(float frameTime)
-    {
-    }
-}
-
diff --git a/Content.Shared/_Shitmed/Restrict/RestrictByUserTagComponent.cs b/Content.Shared/_Shitmed/Restrict/RestrictByUserTagComponent.cs
deleted file mode 100644
index f974e299645..00000000000
--- a/Content.Shared/_Shitmed/Restrict/RestrictByUserTagComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared._Shitmed.Antags.Abductor;
-using Content.Shared.Tag;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Restrict;
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]
-public sealed partial class RestrictByUserTagComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public List<ProtoId<TagPrototype>> Contains = [];
-
-    [DataField, AutoNetworkedField]
-    public List<ProtoId<TagPrototype>> DoesntContain = [];
-
-    [DataField, AutoNetworkedField]
-    public List<string> Messages = [];
-}
diff --git a/Content.Shared/_Shitmed/Restrict/SharedRestrictSystem.cs b/Content.Shared/_Shitmed/Restrict/SharedRestrictSystem.cs
deleted file mode 100644
index cfcb474adea..00000000000
--- a/Content.Shared/_Shitmed/Restrict/SharedRestrictSystem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Interaction.Events;
-using Content.Shared.Popups;
-using Content.Shared.Tag;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Random;
-
-namespace Content.Shared._Shitmed.Restrict;
-public sealed partial class SharedRestrictSystem : EntitySystem
-{
-    [Dependency] private readonly TagSystem _tagSystem = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<RestrictByUserTagComponent, AttemptMeleeEvent>(OnAttemptMelee);
-        SubscribeLocalEvent<RestrictByUserTagComponent, InteractionAttemptEvent>(OnAttemptInteract);
-    }
-
-    private void OnAttemptInteract(Entity<RestrictByUserTagComponent> ent, ref InteractionAttemptEvent args)
-    {
-        if (!_tagSystem.HasAllTags(args.Uid, ent.Comp.Contains) || _tagSystem.HasAnyTag(args.Uid, ent.Comp.DoesntContain))
-        {
-            args.Cancelled = true;
-            if (ent.Comp.Messages.Count != 0)
-                _popup.PopupClient(Loc.GetString(_random.Pick(ent.Comp.Messages)), args.Uid);
-        }
-    }
-
-    private void OnAttemptMelee(Entity<RestrictByUserTagComponent> ent, ref AttemptMeleeEvent args)
-    {
-        if (!_tagSystem.HasAllTags(args.User, ent.Comp.Contains) || _tagSystem.HasAnyTag(args.User, ent.Comp.DoesntContain))
-        {
-            args.Cancelled = true;
-            if(ent.Comp.Messages.Count != 0)
-                args.Message = Loc.GetString(_random.Pick(ent.Comp.Messages));
-        }
-    }
-}
diff --git a/Content.Shared/_Shitmed/Spawners/EntitySystems/Events.cs b/Content.Shared/_Shitmed/Spawners/EntitySystems/Events.cs
deleted file mode 100644
index 3da82783b11..00000000000
--- a/Content.Shared/_Shitmed/Spawners/EntitySystems/Events.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.GameObjects;
-
-namespace Content.Shared._Shitmed.Spawners.EntitySystems;
-
-public sealed class SpawnerSpawnedEvent : EntityEventArgs
-{
-    public EntityUid Entity { get; }
-
-    public bool IsFriendly { get; }
-    public SpawnerSpawnedEvent(EntityUid entity, bool isFriendly)
-    {
-        Entity = entity;
-        IsFriendly = isFriendly;
-    }
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/StatusEffects/ActivateArtifactEffectComponent.cs b/Content.Shared/_Shitmed/StatusEffects/ActivateArtifactEffectComponent.cs
deleted file mode 100644
index 851df05d027..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/ActivateArtifactEffectComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Atmos;
-using Robust.Shared.GameStates;
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     Activates an entity that is also an artifact.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ActivateArtifactEffectComponent : Component;
diff --git a/Content.Shared/_Shitmed/StatusEffects/ExpelGasComponent.cs b/Content.Shared/_Shitmed/StatusEffects/ExpelGasComponent.cs
deleted file mode 100644
index 5f95947f9e6..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/ExpelGasComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.Atmos;
-using Robust.Shared.GameStates;
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     Randomly spawns gas of a given type.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ExpelGasComponent : Component
-{
-    public List<Gas> PossibleGases = new()
-    {
-        Gas.Oxygen,
-        Gas.Plasma,
-        Gas.Nitrogen,
-        Gas.CarbonDioxide,
-        Gas.Tritium,
-        Gas.Ammonia,
-        Gas.NitrousOxide,
-        Gas.Frezon,
-        // Gas.BZ, ///tg/ gases
-        // Gas.Healium, ///tg/ gases
-        // Gas.Nitrium, ///tg/ gases
-    };
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/ScramEffectComponent.cs b/Content.Shared/_Shitmed/StatusEffects/ScramEffectComponent.cs
deleted file mode 100644
index 07658757acb..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/ScramEffectComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     Randomly teleports the entity to a random location.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ScrambleLocationEffectComponent : Component;
diff --git a/Content.Shared/_Shitmed/StatusEffects/ScrambleDnaEffectComponent.cs b/Content.Shared/_Shitmed/StatusEffects/ScrambleDnaEffectComponent.cs
deleted file mode 100644
index 54cc67d220f..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/ScrambleDnaEffectComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     Randomly changes the entity's DNA.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ScrambleDnaEffectComponent : Component;
diff --git a/Content.Shared/_Shitmed/StatusEffects/SpawnEmpComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SpawnEmpComponent.cs
deleted file mode 100644
index 05c152162ee..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/SpawnEmpComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     For use as a status effect. Spawns EMPs.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SpawnEmpComponent : SpawnEntityEffectComponent
-{
-    public override string EntityPrototype { get; set; } = "AdminInstantEffectEMP7";
-    public override bool AttachToParent { get; set; } = true;
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/SpawnEntityEffectComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SpawnEntityEffectComponent.cs
deleted file mode 100644
index 4d00e879cab..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/SpawnEntityEffectComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     For use as a status effect. Spawns a given entity prototype.
-/// </summary>
-public abstract partial class SpawnEntityEffectComponent : Component
-{
-    public virtual string EntityPrototype { get; set; }
-
-    public virtual bool IsFriendly { get; set; }
-
-    public virtual bool AttachToParent { get; set; }
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/SpawnFlashComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SpawnFlashComponent.cs
deleted file mode 100644
index 3868badfe33..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/SpawnFlashComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     For use as a status effect. Creates the same effect as a flash grenade.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SpawnFlashComponent : SpawnEntityEffectComponent
-{
-    public override string EntityPrototype { get; set; } = "AdminInstantEffectFlash";
-    public override bool AttachToParent { get; set; } = true;
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/SpawnGravityWellComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SpawnGravityWellComponent.cs
deleted file mode 100644
index 4984b9a6b44..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/SpawnGravityWellComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     For use as a status effect. Spawns a gravity well.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SpawnGravityWellComponent : SpawnEntityEffectComponent
-{
-    public override string EntityPrototype { get; set; } = "AdminInstantEffectGravityWell";
-    public override bool AttachToParent { get; set; } = true;
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/SpawnSlimesComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SpawnSlimesComponent.cs
deleted file mode 100644
index fd8667a474a..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/SpawnSlimesComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     For use as a status effect. Spawns slimes.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SpawnSlimesComponent : SpawnEntityEffectComponent
-{
-    public override string EntityPrototype { get; set; } = "MobAdultSlimesBlueAngry";
-
-    public override bool IsFriendly { get; set; } = true;
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/SpawnSmokeComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SpawnSmokeComponent.cs
deleted file mode 100644
index 3ece21f58b1..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/SpawnSmokeComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     For use as a status effect. Spawns a smoke cloud.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SpawnSmokeComponent : SpawnEntityEffectComponent
-{
-    public override string EntityPrototype { get; set; } = "AdminInstantEffectSmoke10";
-    public override bool AttachToParent { get; set; } = true;
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/SpawnSpiderEggsComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SpawnSpiderEggsComponent.cs
deleted file mode 100644
index ade561b01b9..00000000000
--- a/Content.Shared/_Shitmed/StatusEffects/SpawnSpiderEggsComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.StatusEffects;
-
-/// <summary>
-///     For use as a status effect. Spawns spider eggs that will hatch into spiders.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SpawnSpiderEggsComponent : SpawnEntityEffectComponent
-{
-    public override string EntityPrototype { get; set; } = "EggSpiderFertilized";
-}
diff --git a/Content.Shared/_Shitmed/StatusEffects/SplashChemicalsComponent.cs b/Content.Shared/_Shitmed/StatusEffects/SplashChemicalsComponent.cs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryBodyComponentConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryBodyComponentConditionComponent.cs
deleted file mode 100644
index 3d08e61e7c8..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryBodyComponentConditionComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-// <summary>
-//   What components are necessary in the body for the surgery to be valid.
-// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryBodyComponentConditionComponent : Component
-{
-    // <summary>
-    //   The components to check for.
-    // </summary>
-    [DataField(required: true)]
-    public ComponentRegistry Components;
-
-    // <summary>
-    //   If true, the lack of these components will instead make the surgery valid.
-    // </summary>
-    [DataField]
-    public bool Inverse = false;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs
deleted file mode 100644
index 6ee258aa47e..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryCloseIncisionConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryHasBodyConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryHasBodyConditionComponent.cs
deleted file mode 100644
index c031a64b3ed..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryHasBodyConditionComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-/// <summary>
-/// Requires that this part is attached to a body for the surgery to be done.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryHasBodyConditionComponent : Component;
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryLarvaConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryLarvaConditionComponent.cs
deleted file mode 100644
index 593022c144a..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryLarvaConditionComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryLarvaConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryMarkingConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryMarkingConditionComponent.cs
deleted file mode 100644
index bb81f8c2deb..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryMarkingConditionComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Shared.Humanoid;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.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/_Shitmed/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs
deleted file mode 100644
index 677ae689c2e..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryOperatingTableConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOrganConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOrganConditionComponent.cs
deleted file mode 100644
index 7ddd99f9af8..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOrganConditionComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Body.Organ;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryOrganConditionComponent : Component
-{
-    [DataField]
-    public ComponentRegistry? Organ;
-
-    [DataField]
-    public bool Inverse;
-
-    [DataField]
-    public bool Reattaching;
-
-    [DataField(required: true)]
-    public string SlotId = string.Empty;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOrganOnAddConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOrganOnAddConditionComponent.cs
deleted file mode 100644
index 407488f70d6..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryOrganOnAddConditionComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-// <summary>
-//   What components are necessary in the part's organs' OnAdd fields for the surgery to be valid.
-//
-//   Not all components need to be present (or missing for Inverse = true). At least one component matching (or missing) can make the surgery valid.
-// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryOrganOnAddConditionComponent : Component
-{
-    // <summary>
-    //   The components to check for on each organ, with the key being the organ's SlotId.
-    // </summary>
-    [DataField(required: true)]
-    public Dictionary<string, ComponentRegistry> Components;
-
-    // <summary>
-    //   If true, the lack of these components will instead make the surgery valid.
-    // </summary>
-    [DataField]
-    public bool Inverse = false;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartComponentConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartComponentConditionComponent.cs
deleted file mode 100644
index 096715a9e82..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartComponentConditionComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-// <summary>
-//   What components are necessary in the targeted body part for the surgery to be valid.
-// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryPartComponentConditionComponent : Component
-{
-    // <summary>
-    //   The components to check for.
-    // </summary>
-    [DataField(required: true)]
-    public ComponentRegistry Components;
-
-    // <summary>
-    //   If true, the lack of these components will instead make the surgery valid.
-    // </summary>
-    [DataField]
-    public bool Inverse = false;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartConditionComponent.cs
deleted file mode 100644
index 46815b71c58..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartConditionComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.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/_Shitmed/Surgery/Conditions/SurgeryPartPresentCondition.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartPresentCondition.cs
deleted file mode 100644
index a458dec5868..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartPresentCondition.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryPartPresentConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
deleted file mode 100644
index 16292a54dbc..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.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/_Shitmed/Surgery/Conditions/SurgeryValidEvent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryValidEvent.cs
deleted file mode 100644
index a6890f8128c..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryValidEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Body.Part;
-
-namespace Content.Shared._Shitmed.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/_Shitmed/Surgery/Conditions/SurgeryWoundedConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryWoundedConditionComponent.cs
deleted file mode 100644
index d48f7313d44..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryWoundedConditionComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Body.Part;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryWoundedConditionComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Effects/Complete/SurgeryCompletedEvent.cs b/Content.Shared/_Shitmed/Surgery/Effects/Complete/SurgeryCompletedEvent.cs
deleted file mode 100644
index b492f8dd0b9..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Complete/SurgeryCompletedEvent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Shared._Shitmed.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/_Shitmed/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs b/Content.Shared/_Shitmed/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs
deleted file mode 100644
index 0cdebe30fab..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Effects.Complete;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemoveLarvaComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs b/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
deleted file mode 100644
index f4d95604e66..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryDamageChangeEffectComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-namespace Content.Shared._Shitmed.Medical.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;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs b/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
deleted file mode 100644
index a7b436984c1..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-namespace Content.Shared._Shitmed.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/_Shitmed/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs b/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
deleted file mode 100644
index 04dc376fd62..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepCavityEffectComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryStepCavityEffectComponent : Component
-{
-    [DataField]
-    public string Action = "Insert";
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs b/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
deleted file mode 100644
index 09e4f049d3c..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepEmoteEffectComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SurgeryStepEmoteEffectComponent : Component
-{
-    [DataField, AutoNetworkedField]
-    public ProtoId<EmotePrototype> Emote = "Scream";
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs b/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
deleted file mode 100644
index f7df5e8bada..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryStepSpawnEffect.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Shared.Chat.Prototypes;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-using System.ComponentModel.DataAnnotations;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Effects.Step;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SurgeryStepSpawnEffectComponent : Component
-{
-    [DataField(required: true), AutoNetworkedField]
-    public EntProtoId Entity;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs b/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
deleted file mode 100644
index 2306c891025..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Effects/Step/SurgeryTendWoundsEffectComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Damage;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-namespace Content.Shared._Shitmed.Medical.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;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/GloveJacketComponent.cs b/Content.Shared/_Shitmed/Surgery/GloveJacketComponent.cs
deleted file mode 100644
index c20c3c9533a..00000000000
--- a/Content.Shared/_Shitmed/Surgery/GloveJacketComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-/// <summary>
-///     Used to treat a jacket as gloves for surgical purposes
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class GloveJacketComponent : Component { }
diff --git a/Content.Shared/_Shitmed/Surgery/NoScreamComponent.cs b/Content.Shared/_Shitmed/Surgery/NoScreamComponent.cs
deleted file mode 100644
index ed896442d25..00000000000
--- a/Content.Shared/_Shitmed/Surgery/NoScreamComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-/// <summary>
-///     Prevents the entity from screaming during surgery without having to be asleep.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class NoScreamComponent : Component { }
diff --git a/Content.Shared/_Shitmed/Surgery/OperatingTableComponent.cs b/Content.Shared/_Shitmed/Surgery/OperatingTableComponent.cs
deleted file mode 100644
index 6ad09760502..00000000000
--- a/Content.Shared/_Shitmed/Surgery/OperatingTableComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class OperatingTableComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/SanitizedComponent.cs b/Content.Shared/_Shitmed/Surgery/SanitizedComponent.cs
deleted file mode 100644
index a9ebb11d370..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SanitizedComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-/// <summary>
-///     Prevents the entity from causing toxin damage to entities it does surgery on.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SanitizedComponent : Component { }
diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
deleted file mode 100644
index 64cda85ba55..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
+++ /dev/null
@@ -1,931 +0,0 @@
-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._Shitmed.BodyEffects;
-using Content.Shared._Shitmed.Body.Events;
-using Content.Shared.Buckle.Components;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.DoAfter;
-using Content.Shared.IdentityManagement;
-using Content.Shared._Shitmed.Medical.Surgery.Conditions;
-using Content.Shared._Shitmed.Medical.Surgery.Effects.Step;
-using Content.Shared._Shitmed.Medical.Surgery.Steps;
-using Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-using Content.Shared._Shitmed.Medical.Surgery.Tools;
-using Content.Shared.Mood;
-using Content.Shared.Inventory;
-using Content.Shared.Item;
-using Content.Shared._Shitmed.Body.Organ;
-using Content.Shared._Shitmed.Body.Part;
-using Content.Shared.Popups;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Toolshed.TypeParsers;
-using System.Linq;
-using Content.Shared.Inventory.VirtualItem;
-
-
-namespace Content.Shared._Shitmed.Medical.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, out _))
-                    return;
-
-                if (_net.IsServer &&
-                    TryComp(tool, out SurgeryToolComponent? toolComp) &&
-                    toolComp.EndSound != null)
-                {
-                    _audio.PlayPvs(toolComp.EndSound, 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.BodyAdd != null)
-        {
-            foreach (var reg in ent.Comp.BodyAdd.Values)
-            {
-                var compType = reg.Component.GetType();
-                if (HasComp(args.Body, compType))
-                    continue;
-                AddComp(args.Body, _compFactory.GetComponent(compType));
-            }
-        }
-
-        if (ent.Comp.BodyRemove != null)
-        {
-            foreach (var reg in ent.Comp.BodyRemove.Values)
-            {
-                RemComp(args.Body, reg.Component.GetType());
-            }
-        }
-
-        // Dude this fucking function is so bloated now what the fuck.
-        if (ent.Comp.AddOrganOnAdd != null)
-        {
-            var organSlotIdToOrgan = _body.GetPartOrgans(args.Part).ToDictionary(o => o.Item2.SlotId, o => o);
-
-            foreach (var (organSlotId, compsToAdd) in ent.Comp.AddOrganOnAdd)
-            {
-                if (!organSlotIdToOrgan.TryGetValue(organSlotId, out var organValue))
-                    continue;
-                var (organId, organ) = organValue;
-
-                organ.OnAdd ??= new();
-
-                foreach (var (key, compToAdd) in compsToAdd)
-                    organ.OnAdd[key] = compToAdd;
-
-                EnsureComp<OrganEffectComponent>(organId);
-                RaiseLocalEvent(organId, new OrganComponentsModifyEvent(args.Body, true));
-            }
-        }
-
-        if (ent.Comp.RemoveOrganOnAdd != null)
-        {
-            var organSlotIdToOrgan = _body.GetPartOrgans(args.Part).ToDictionary(o => o.Item2.SlotId, o => o);
-
-            foreach (var (organSlotId, compsToRemove) in ent.Comp.RemoveOrganOnAdd)
-            {
-                if (!organSlotIdToOrgan.TryGetValue(organSlotId, out var organValue) ||
-                    organValue.Item2.OnAdd == null)
-                    continue;
-                var (organId, organ) = organValue;
-
-                // Need to raise this event first before removing the component entries so
-                // OrganEffectSystem still knows which components on the body to remove
-                RaiseLocalEvent(organId, new OrganComponentsModifyEvent(args.Body, false));
-                foreach (var key in compsToRemove.Keys)
-                    organ.OnAdd.Remove(key);
-            }
-        }
-
-
-        if (!HasComp<ForcedSleepingComponent>(args.Body) && !HasComp<NoScreamComponent>(args.Body))
-            RaiseLocalEvent(args.Body, new MoodEffectEvent("SurgeryPain"));
-        // Morphine - reenable this :)
-        if (!_inventory.TryGetSlotEntity(args.User, "gloves", out var _)
-            || !_inventory.TryGetSlotEntity(args.User, "mask", out var _))
-        {
-            if (!HasComp<SanitizedComponent>(args.User))
-            {
-                // Zeta - Xelthia Glove Jacket Check
-                _inventory.TryGetSlotEntity(args.User, "outerClothing", out var glovejacket);
-                if (!HasComp<GloveJacketComponent>(glovejacket) || !_inventory.TryGetSlotEntity(args.User, "mask", out var _))
-                {
-                    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.BodyAdd != null)
-        {
-            foreach (var reg in ent.Comp.BodyAdd.Values)
-            {
-                if (!HasComp(args.Body, 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;
-                }
-            }
-        }
-
-        if (ent.Comp.AddOrganOnAdd != null)
-        {
-            var organSlotIdToOrgan = _body.GetPartOrgans(args.Part).ToDictionary(o => o.Item2.SlotId, o => o.Item2);
-            foreach (var (organSlotId, compsToAdd) in ent.Comp.AddOrganOnAdd)
-            {
-                if (!organSlotIdToOrgan.TryGetValue(organSlotId, out var organ))
-                    continue;
-
-                if (organ.OnAdd == null || compsToAdd.Keys.Any(key => !organ.OnAdd.ContainsKey(key)))
-                {
-                    args.Cancelled = true;
-                    return;
-                }
-            }
-        }
-
-        if (ent.Comp.RemoveOrganOnAdd != null)
-        {
-            var organSlotIdToOrgan = _body.GetPartOrgans(args.Part).ToDictionary(o => o.Item2.SlotId, o => o.Item2);
-            foreach (var (organSlotId, compsToRemove) in ent.Comp.RemoveOrganOnAdd)
-            {
-                if (!organSlotIdToOrgan.TryGetValue(organSlotId, out var organ) || organ.OnAdd == null)
-                    continue;
-
-                if (compsToRemove.Keys.Any(key => organ.OnAdd.ContainsKey(key)))
-                {
-                    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))
-        {
-            if (HasComp<SurgeryIgnoreClothingComponent>(args.User))
-                return;
-
-            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 Dictionary<EntityUid, float>();
-
-            foreach (var reg in ent.Comp.Tool.Values)
-            {
-                if (!AnyHaveComp(args.Tools, reg.Component, out var tool, out var speed))
-                {
-                    args.Invalid = StepInvalidReason.MissingTool;
-
-                    if (reg.Component is ISurgeryToolComponent required)
-                        args.Popup = $"You need {required.ToolName} to perform this step!";
-
-                    return;
-                }
-
-                args.ValidTools[tool] = speed;
-            }
-        }
-    }
-
-    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);
-
-        foreach (var type in group)
-            adjustedDamage.DamageDict[type] -= bonus;
-
-        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;
-
-        _itemSlotsSystem.SetLock(args.Part, partComp.ItemInsertionSlot, false); // WWDP prevent inserting items into torsos without surgery
-
-        var activeHandEntity = _hands.EnumerateHeld(args.User).FirstOrDefault();
-        if (activeHandEntity != default
-            && ent.Comp.Action == "Insert"
-            && !HasComp<VirtualItemComponent>(activeHandEntity) // WWDP prevent trying to insert virtual items
-            && 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);
-
-        _itemSlotsSystem.SetLock(args.Part, partComp.ItemInsertionSlot, true); // WWDP prevent inserting items into torsos without surgery
-    }
-
-    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 var _);
-                _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);
-                    args.Complete = true;
-                }
-                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 { } body &&
-            GetEntity(args.Part) is { } targetPart)
-        {
-            TryDoSurgeryStep(body, targetPart, user, args.Surgery, args.Step);
-        }
-    }
-
-    /// <summary>
-    /// Do a surgery step on a part, if it can be done.
-    /// Returns true if it succeeded.
-    /// </summary>
-    public bool TryDoSurgeryStep(EntityUid body, EntityUid targetPart, EntityUid user, EntProtoId surgeryId, EntProtoId stepId)
-    {
-        if (!IsSurgeryValid(body, targetPart, surgeryId, stepId, user, out var surgery, out var part, out var step))
-            return false;
-
-        if (!PreviousStepsComplete(body, part, surgery, stepId) ||
-            IsStepComplete(body, part, stepId, surgery))
-            return false;
-
-        if (!CanPerformStep(user, body, part, step, true, out _, out _, out var validTools))
-            return false;
-
-        var speed = 1f;
-        var usedEv = new SurgeryToolUsedEvent(user, body);
-        // We need to check for nullability because of surgeries that dont require a tool, like Cavity Implants
-        if (validTools?.Count > 0)
-        {
-            foreach (var (tool, toolSpeed) in validTools)
-            {
-                RaiseLocalEvent(tool, ref usedEv);
-                if (usedEv.Cancelled)
-                    return false;
-
-                speed *= toolSpeed;
-            }
-
-            if (_net.IsServer)
-            {
-                foreach (var tool in validTools.Keys)
-                {
-                    if (TryComp(tool, out SurgeryToolComponent? toolComp) &&
-                        toolComp.StartSound != null)
-                    {
-                        _audio.PlayPvs(toolComp.StartSound, tool);
-                    }
-                }
-            }
-        }
-
-        if (TryComp(body, out TransformComponent? xform))
-            _rotateToFace.TryFaceCoordinates(user, _transform.GetMapCoordinates(body, xform).Position);
-
-        var ev = new SurgeryDoAfterEvent(surgeryId, stepId);
-        var duration = GetSurgeryDuration(step, user, body, speed);
-
-        /* WWDP fix - SurgerySpeedModifier is already counted in GetSurgeryDuration
-         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))
-            return false;
-
-        var userName = Identity.Entity(user, EntityManager);
-        var targetName = Identity.Entity(body, EntityManager);
-
-        var locName = $"surgery-popup-procedure-{surgeryId}-step-{stepId}";
-        var locResult = Loc.GetString(locName,
-            ("user", userName), ("target", targetName), ("part", part));
-
-        if (locResult == locName)
-            locResult = Loc.GetString($"surgery-popup-step-{stepId}",
-                ("user", userName), ("target", targetName), ("part", part));
-
-        _popup.PopupEntity(locResult, user);
-        return true;
-    }
-
-    private float GetSurgeryDuration(EntityUid surgeryStep, EntityUid user, EntityUid target, float toolSpeed)
-    {
-        if (!TryComp(surgeryStep, out SurgeryStepComponent? stepComp))
-            return 2f; // Shouldnt really happen but just a failsafe.
-
-        var speed = toolSpeed;
-
-        if (TryComp(user, out SurgerySpeedModifierComponent? surgerySpeedMod))
-            speed *= surgerySpeedMod.SpeedModifier;
-
-        return stepComp.Duration / speed;
-    }
-    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 Dictionary<EntityUid, float>? 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, out float speed)
-    {
-        foreach (var tool in tools)
-        {
-            if (EntityManager.TryGetComponent(tool, component.GetType(), out var found) && found is ISurgeryToolComponent toolComp)
-            {
-                withComp = tool;
-                speed = toolComp.Speed;
-                return true;
-            }
-        }
-
-        withComp = EntityUid.Invalid;
-        speed = 1f;
-        return false;
-    }
-}
diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs
deleted file mode 100644
index aa47087532b..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs
+++ /dev/null
@@ -1,415 +0,0 @@
-using System.Linq;
-using Content.Shared._Shitmed.Medical.Surgery.Conditions;
-using Content.Shared._Shitmed.Medical.Surgery.Effects.Complete;
-using Content.Shared.Body.Systems;
-using Content.Shared._Shitmed.Medical.Surgery.Steps;
-using Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-//using Content.Shared._RMC14.Xenonids.Parasite;
-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.Prototypes;
-using Content.Shared.Standing;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Network;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
-
-namespace Content.Shared._Shitmed.Medical.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!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-
-    /// <summary>
-    /// Cache of all surgery prototypes' singleton entities.
-    /// Cleared after a prototype reload.
-    /// </summary>
-    private readonly Dictionary<EntProtoId, EntityUid> _surgeries = new();
-
-    private readonly List<EntProtoId> _allSurgeries = new();
-
-    /// <summary>
-    /// Every surgery entity prototype id.
-    /// Kept in sync with prototype reloads.
-    /// </summary>
-    public IReadOnlyList<EntProtoId> AllSurgeries => _allSurgeries;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
-
-        SubscribeLocalEvent<SurgeryTargetComponent, SurgeryDoAfterEvent>(OnTargetDoAfter);
-        SubscribeLocalEvent<SurgeryCloseIncisionConditionComponent, SurgeryValidEvent>(OnCloseIncisionValid);
-        //SubscribeLocalEvent<SurgeryLarvaConditionComponent, SurgeryValidEvent>(OnLarvaValid);
-        SubscribeLocalEvent<SurgeryHasBodyConditionComponent, SurgeryValidEvent>(OnHasBodyConditionValid);
-        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<SurgeryBodyComponentConditionComponent, SurgeryValidEvent>(OnBodyComponentConditionValid);
-        SubscribeLocalEvent<SurgeryPartComponentConditionComponent, SurgeryValidEvent>(OnPartComponentConditionValid);
-        SubscribeLocalEvent<SurgeryOrganOnAddConditionComponent, SurgeryValidEvent>(OnOrganOnAddConditionValid);
-        //SubscribeLocalEvent<SurgeryRemoveLarvaComponent, SurgeryCompletedEvent>(OnRemoveLarva);
-        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
-
-        InitializeSteps();
-
-        LoadPrototypes();
-    }
-
-    private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev)
-    {
-        _surgeries.Clear();
-    }
-
-    private void OnTargetDoAfter(Entity<SurgeryTargetComponent> ent, ref SurgeryDoAfterEvent args)
-    {
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
-        if (args.Cancelled)
-        {
-            var failEv = new SurgeryStepFailedEvent(args.User, ent, args.Surgery, args.Step);
-            RaiseLocalEvent(args.User, ref failEv);
-            return;
-        }
-
-        if (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;
-        }
-
-        var complete = IsStepComplete(ent, part, args.Step, surgery);
-        args.Repeat = HasComp<SurgeryRepeatableStepComponent>(step) && !complete;
-        var ev = new SurgeryStepEvent(args.User, ent, part, GetTools(args.User), surgery, step, complete);
-        RaiseLocalEvent(step, ref ev);
-        RaiseLocalEvent(args.User, 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 OnBodyComponentConditionValid(Entity<SurgeryBodyComponentConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        var present = true;
-        foreach (var reg in ent.Comp.Components.Values)
-        {
-            var compType = reg.Component.GetType();
-            if (!HasComp(args.Body, compType))
-                present = false;
-        }
-
-        if (ent.Comp.Inverse ? present : !present)
-            args.Cancelled = true;
-    }
-
-    private void OnPartComponentConditionValid(Entity<SurgeryPartComponentConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        var present = true;
-        foreach (var reg in ent.Comp.Components.Values)
-        {
-            var compType = reg.Component.GetType();
-            if (!HasComp(args.Part, compType))
-                present = false;
-        }
-        if (ent.Comp.Inverse ? present : !present)
-            args.Cancelled = true;
-    }
-
-    // This is literally a duplicate of the checks in OnToolCheck for SurgeryStepComponent.AddOrganOnAdd
-    private void OnOrganOnAddConditionValid(Entity<SurgeryOrganOnAddConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (!TryComp<BodyPartComponent>(args.Part, out var part)
-            || part.Body != args.Body)
-        {
-            args.Cancelled = true;
-            return;
-        }
-
-        var organSlotIdToOrgan = _body.GetPartOrgans(args.Part, part).ToDictionary(o => o.Item2.SlotId, o => o.Item2);
-
-        var allOnAddFound = true;
-        var zeroOnAddFound = true;
-
-        foreach (var (organSlotId, components) in ent.Comp.Components)
-        {
-            if (!organSlotIdToOrgan.TryGetValue(organSlotId, out var organ))
-                continue;
-
-            if (organ.OnAdd == null)
-            {
-                allOnAddFound = false;
-                continue;
-            }
-
-            foreach (var key in components.Keys)
-            {
-                if (!organ.OnAdd.ContainsKey(key))
-                    allOnAddFound = false;
-                else
-                    zeroOnAddFound = false;
-            }
-        }
-
-        if (ent.Comp.Inverse ? allOnAddFound : zeroOnAddFound)
-            args.Cancelled = true;
-    }
-
-    private void OnHasBodyConditionValid(Entity<SurgeryHasBodyConditionComponent> ent, ref SurgeryValidEvent args)
-    {
-        if (CompOrNull<BodyPartComponent>(args.Part)?.Body == 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 || !_container.TryGetContainer(args.Part, SharedBodySystem.GetOrganContainerId(ent.Comp.SlotId), out _))
-                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).ToList();
-        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)
-    {
-    }
-
-    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
-    {
-        if (!args.WasModified<EntityPrototype>())
-            return;
-
-        LoadPrototypes();
-    }
-
-    private void LoadPrototypes()
-    {
-        // Cache is probably invalid so delete it
-        foreach (var uid in _surgeries.Values)
-        {
-            Del(uid);
-        }
-        _surgeries.Clear();
-
-        _allSurgeries.Clear();
-        foreach (var entity in _prototypes.EnumeratePrototypes<EntityPrototype>())
-            if (entity.HasComponent<SurgeryComponent>())
-                _allSurgeries.Add(new EntProtoId(entity.ID));
-    }
-}
diff --git a/Content.Shared/_Shitmed/Surgery/StepInvalidReason.cs b/Content.Shared/_Shitmed/Surgery/StepInvalidReason.cs
deleted file mode 100644
index 7d1f6779ddf..00000000000
--- a/Content.Shared/_Shitmed/Surgery/StepInvalidReason.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-public enum StepInvalidReason
-{
-    None,
-    MissingSkills,
-    NeedsOperatingTable,
-    Armor,
-    MissingTool,
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/BleedersClampedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/BleedersClampedComponent.cs
deleted file mode 100644
index 9684cd83742..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/BleedersClampedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BleedersClampedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/BodyPartReattachedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/BodyPartReattachedComponent.cs
deleted file mode 100644
index db08d326fa8..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/BodyPartReattachedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BodyPartReattachedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/BodyPartSawedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/BodyPartSawedComponent.cs
deleted file mode 100644
index 6b52489a3d6..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/BodyPartSawedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BodyPartSawedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/IncisionOpenComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/IncisionOpenComponent.cs
deleted file mode 100644
index b2c8dea84cc..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/IncisionOpenComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class IncisionOpenComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs
deleted file mode 100644
index 9f7763229a5..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/InternalBleedersClampedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class InternalBleedersClampedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/OrganReattachedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/OrganReattachedComponent.cs
deleted file mode 100644
index 7f612d061dc..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/OrganReattachedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class OrganReattachedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/PartRemovedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/PartRemovedComponent.cs
deleted file mode 100644
index 0a2f73d5604..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/PartRemovedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class PartsRemovedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/RibcageOpenComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/RibcageOpenComponent.cs
deleted file mode 100644
index 65f2e285ff8..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/RibcageOpenComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RibcageOpenComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/RibcageSawedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/RibcageSawedComponent.cs
deleted file mode 100644
index a386a9293ce..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/RibcageSawedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RibcageSawedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/Parts/SkinRetractedComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/Parts/SkinRetractedComponent.cs
deleted file mode 100644
index 90f7d9297ec..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/Parts/SkinRetractedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps.Parts;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SkinRetractedComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddMarkingStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
deleted file mode 100644
index c7feee6d4c6..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Content.Shared.Humanoid;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.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 = string.Empty;
-
-    /// <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/_Shitmed/Surgery/Steps/SurgeryAddOrganStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddOrganStepComponent.cs
deleted file mode 100644
index db592d1cd6d..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddOrganStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAddOrganStepComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddPartStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddPartStepComponent.cs
deleted file mode 100644
index c569341f997..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddPartStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAddPartStepComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAffixOrganStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAffixOrganStepComponent.cs
deleted file mode 100644
index 13ce206f2db..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAffixOrganStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAffixOrganStepComponent : Component;
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAffixPartStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAffixPartStepComponent.cs
deleted file mode 100644
index 62baf329d2d..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAffixPartStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAffixPartStepComponent : Component;
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryCanPerformStepEvent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryCanPerformStepEvent.cs
deleted file mode 100644
index d36c05b6d98..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryCanPerformStepEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Content.Shared.Inventory;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[ByRefEvent]
-public record struct SurgeryCanPerformStepEvent(
-    EntityUid User,
-    EntityUid Body,
-    List<EntityUid> Tools,
-    SlotFlags TargetSlots,
-    string? Popup = null,
-    StepInvalidReason Invalid = StepInvalidReason.None,
-    Dictionary<EntityUid, float>? ValidTools = null
-) : IInventoryRelayEvent;
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs
deleted file mode 100644
index 438c974687b..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryCutLarvaRootsStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryCutLarvaRootsStepComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
deleted file mode 100644
index ca76fb78900..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Robust.Shared.Prototypes;
-using Content.Shared.Humanoid;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.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 = string.Empty;
-
-    /// <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/_Shitmed/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs
deleted file mode 100644
index 13216db9a2e..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveOrganStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemoveOrganStepComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemovePartStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemovePartStepComponent.cs
deleted file mode 100644
index 6eb3fcf8a58..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemovePartStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemovePartStepComponent : Component;
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRepeatableStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRepeatableStepComponent.cs
deleted file mode 100644
index d28dc4ba08e..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRepeatableStepComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRepeatableStepComponent : Component;
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs
deleted file mode 100644
index e70de606be2..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryStepCompleteCheckEvent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[ByRefEvent]
-public record struct SurgeryStepCompleteCheckEvent(EntityUid Body, EntityUid Part, EntityUid Surgery, bool Cancelled = false);
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryStepComponent.cs
deleted file mode 100644
index fe3463a5d95..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryStepComponent.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Steps;
-
-[RegisterComponent, NetworkedComponent]
-[Prototype("SurgerySteps")]
-public sealed partial class SurgeryStepComponent : Component
-{
-
-    [DataField]
-    public ComponentRegistry? Tool;
-
-    [DataField]
-    public ComponentRegistry? Add;
-
-    [DataField]
-    public ComponentRegistry? BodyAdd;
-
-    [DataField]
-    public ComponentRegistry? Remove;
-
-    [DataField]
-    public ComponentRegistry? BodyRemove;
-
-    /// <summary>
-    ///   These components will be added to the body part's organs' OnAdd field.
-    ///   Each key is the SlotId of the organ to look for.
-    ///
-    ///   Used to make organs add components to whatever body it's residing in.
-    /// </summary>
-    [DataField]
-    public Dictionary<string, ComponentRegistry>? AddOrganOnAdd;
-
-    /// <summary>
-    ///   These components will be removed from the body part's organs' OnAdd field.
-    ///   Each key is the SlotId of the organ to look for.
-    ///
-    ///   Used to stop organs from adding components to whatever body it's residing in.
-    /// </summary>
-    [DataField]
-    public Dictionary<string, ComponentRegistry>? RemoveOrganOnAdd;
-
-    [DataField]
-    public float Duration = 2f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryComponent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryComponent.cs
deleted file mode 100644
index 4fc0c67c4d7..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.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();
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryDoAfterEvent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryDoAfterEvent.cs
deleted file mode 100644
index 8aad79c2c0e..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryDoAfterEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.DoAfter;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Medical.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;
-    }
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryIgnoreClothingComponent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryIgnoreClothingComponent.cs
deleted file mode 100644
index 3ca414a41b7..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryIgnoreClothingComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-/// <summary>
-///     Allows the entity to do surgery without having to remove clothing.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryIgnoreClothingComponent : Component { }
diff --git a/Content.Shared/_Shitmed/Surgery/SurgerySpeedModifierComponent.cs b/Content.Shared/_Shitmed/Surgery/SurgerySpeedModifierComponent.cs
deleted file mode 100644
index 72b3a6dbf43..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgerySpeedModifierComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgerySpeedModifierComponent : Component
-{
-    [DataField]
-    public float SpeedModifier = 1.5f;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageChangeEvent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageChangeEvent.cs
deleted file mode 100644
index aca17499ce5..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageChangeEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Shared._Shitmed.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/_Shitmed/Surgery/SurgeryStepDamageEvent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageEvent.cs
deleted file mode 100644
index 128251aa3bd..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageEvent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.Damage;
-
-namespace Content.Shared._Shitmed.Medical.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);
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryStepEvent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryStepEvent.cs
deleted file mode 100644
index b34e95c0abd..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryStepEvent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-/// <summary>
-///     Raised on the step entity and the user after doing a step.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryStepEvent(EntityUid User, EntityUid Body, EntityUid Part, List<EntityUid> Tools, EntityUid Surgery, EntityUid Step, bool Complete);
-
-/// <summary>
-/// Raised on the user after failing to do a step for any reason.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryStepFailedEvent(EntityUid User, EntityUid Body, EntProtoId SurgeryId, EntProtoId StepId);
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryTargetComponent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryTargetComponent.cs
deleted file mode 100644
index 38505e28a9b..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryTargetComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryTargetComponent : Component
-{
-    [DataField]
-    public bool CanOperate = true;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryUI.cs b/Content.Shared/_Shitmed/Surgery/SurgeryUI.cs
deleted file mode 100644
index 64a269ab02d..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryUI.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Medical.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/_Shitmed/Surgery/SurgeryUiRefreshEvent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryUiRefreshEvent.cs
deleted file mode 100644
index 4504f327689..00000000000
--- a/Content.Shared/_Shitmed/Surgery/SurgeryUiRefreshEvent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Medical.Surgery;
-
-[Serializable, NetSerializable]
-public sealed class SurgeryUiRefreshEvent : EntityEventArgs
-{
-    public NetEntity Uid { get; }
-
-    public SurgeryUiRefreshEvent(NetEntity uid)
-    {
-        Uid = uid;
-    }
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/BoneGelComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/BoneGelComponent.cs
deleted file mode 100644
index 4c479e9b036..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/BoneGelComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BoneGelComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "bone gel";
-
-    public bool? Used { get; set; } = null;
-
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/BoneSawComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/BoneSawComponent.cs
deleted file mode 100644
index 67a7056a5a9..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/BoneSawComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class BoneSawComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a bone saw";
-    public bool? Used { get; set; } = null;
-    [DataField, AutoNetworkedField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/BoneSetterComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/BoneSetterComponent.cs
deleted file mode 100644
index 8d2dda0cb1c..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/BoneSetterComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class BoneSetterComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a bone setter";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/CauteryComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/CauteryComponent.cs
deleted file mode 100644
index 61b18bb452e..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/CauteryComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class CauteryComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a cautery";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/DrillComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/DrillComponent.cs
deleted file mode 100644
index 919307e8989..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/DrillComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class DrillComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a drill";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/HemostatComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/HemostatComponent.cs
deleted file mode 100644
index 7ccfcdf1d7c..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/HemostatComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class HemostatComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a hemostat";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/ISurgeryToolComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/ISurgeryToolComponent.cs
deleted file mode 100644
index ecf06bd4703..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/ISurgeryToolComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-public interface ISurgeryToolComponent
-{
-    [DataField]
-    public string ToolName { get; }
-
-    /// <summary>
-    ///     Field intended for discardable or non-reusable tools.
-    /// </summary>
-    [DataField]
-    public bool? Used { get; set; }
-
-    /// <summary>
-    ///     Multiply the step's doafter by this value.
-    ///     This is per-type so you can have something that's a good scalpel but a bad retractor.
-    /// </summary>
-    [DataField]
-    public float Speed { get; set; }
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/RetractorComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/RetractorComponent.cs
deleted file mode 100644
index ff8b699585a..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/RetractorComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RetractorComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a retractor";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/ScalpelComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/ScalpelComponent.cs
deleted file mode 100644
index 2c50343e05f..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/ScalpelComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class ScalpelComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a scalpel";
-    public bool? Used { get; set; } = null;
-    [DataField, AutoNetworkedField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolComponent.cs
deleted file mode 100644
index 6c78e9e3789..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class SurgeryToolComponent : Component
-{
-
-    [DataField, AutoNetworkedField]
-    public SoundSpecifier? StartSound;
-
-    [DataField, AutoNetworkedField]
-    public SoundSpecifier? EndSound;
-}
-
-/// <summary>
-///     Raised on a tool to see if it can be used in a surgery step.
-///     If this is cancelled the step can't be completed.
-/// </summary>
-[ByRefEvent]
-public record struct SurgeryToolUsedEvent(EntityUid User, EntityUid Target, bool Cancelled = false);
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolConditionsSystem.cs b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolConditionsSystem.cs
deleted file mode 100644
index 0c2ff64722c..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolConditionsSystem.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Content.Shared.Item.ItemToggle.Components;
-using Content.Shared.Popups;
-using Content.Shared.Smoking;
-using Content.Shared.Smoking.Components;
-using Content.Shared.Weapons.Ranged;
-using Content.Shared.Weapons.Ranged.Components;
-using Content.Shared.Weapons.Ranged.Events;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-/// <summary>
-///  Prevents using esword or welder when off, laser when no charges.
-/// </summary>
-public sealed class SurgeryToolConditionsSystem : EntitySystem
-{
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ItemToggleComponent, SurgeryToolUsedEvent>(OnToggleUsed);
-        SubscribeLocalEvent<GunComponent, SurgeryToolUsedEvent>(OnGunUsed);
-        SubscribeLocalEvent<MatchstickComponent, SurgeryToolUsedEvent>(OnMatchUsed);
-    }
-
-    private void OnToggleUsed(Entity<ItemToggleComponent> ent, ref SurgeryToolUsedEvent args)
-    {
-        if (ent.Comp.Activated)
-            return;
-
-        _popup.PopupEntity(Loc.GetString("surgery-tool-turn-on"), ent, args.User);
-        args.Cancelled = true;
-    }
-
-    private void OnGunUsed(Entity<GunComponent> ent, ref SurgeryToolUsedEvent args)
-    {
-        var coords = Transform(args.User).Coordinates;
-        var ev = new TakeAmmoEvent(1, new List<(EntityUid? Entity, IShootable Shootable)>(), coords, args.User);
-        if (ev.Ammo.Count > 0)
-            return;
-
-        _popup.PopupEntity(Loc.GetString("surgery-tool-reload"), ent, args.User);
-        args.Cancelled = true;
-    }
-
-    private void OnMatchUsed(Entity<MatchstickComponent> ent, ref SurgeryToolUsedEvent args)
-    {
-        var state = ent.Comp.CurrentState;
-        if (state == SmokableState.Lit)
-            return;
-
-        var key = "surgery-tool-match-" + (state == SmokableState.Burnt ? "replace" : "light");
-        _popup.PopupEntity(Loc.GetString(key), ent, args.User);
-        args.Cancelled = true;
-    }
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolExamineSystem.cs b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolExamineSystem.cs
deleted file mode 100644
index 9338a85a9b0..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolExamineSystem.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Part;
-using Content.Shared.Examine;
-using Content.Shared.Verbs;
-using Robust.Shared.Utility;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-/// <summary>
-///     Examining a surgical or ghetto tool shows everything it can be used for.
-/// </summary>
-public sealed class SurgeryToolExamineSystem : EntitySystem
-{
-    [Dependency] private readonly ExamineSystemShared _examine = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<SurgeryToolComponent, GetVerbsEvent<ExamineVerb>>(OnGetVerbs);
-
-        SubscribeLocalEvent<BoneGelComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<BoneSawComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<CauteryComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<HemostatComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<RetractorComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<ScalpelComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<DrillComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<TendingComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<TweezersComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<BoneSetterComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<BodyPartComponent, SurgeryToolExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<OrganComponent, SurgeryToolExaminedEvent>(OnExamined);
-    }
-
-    private void OnGetVerbs(Entity<SurgeryToolComponent> ent, ref GetVerbsEvent<ExamineVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess)
-            return;
-
-        var msg = FormattedMessage.FromMarkupOrThrow(Loc.GetString("surgery-tool-header"));
-        msg.PushNewline();
-        var ev = new SurgeryToolExaminedEvent(msg);
-        RaiseLocalEvent(ent, ref ev);
-
-        _examine.AddDetailedExamineVerb(args, ent.Comp, ev.Message,
-            Loc.GetString("surgery-tool-examinable-verb-text"), "/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png",
-            Loc.GetString("surgery-tool-examinable-verb-message"));
-    }
-
-    private void OnExamined(EntityUid uid, ISurgeryToolComponent comp, ref SurgeryToolExaminedEvent args)
-    {
-        var msg = args.Message;
-        var color = comp.Speed switch
-        {
-            < 1f => "red",
-            > 1f => "green",
-            _ => "white"
-        };
-        var key = "surgery-tool-" + (comp.Used == true ? "used" : "unlimited");
-        var speed = comp.Speed.ToString("N2"); // 2 decimal places to not get trolled by float
-        msg.PushMarkup(Loc.GetString(key, ("tool", comp.ToolName), ("speed", speed), ("color", color)));
-    }
-}
-
-[ByRefEvent]
-public record struct SurgeryToolExaminedEvent(FormattedMessage Message);
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/TendingComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/TendingComponent.cs
deleted file mode 100644
index 1d4d9325a63..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/TendingComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-/// <summary>
-///     Like Hemostat but lets ghetto tools be used differently for clamping and tending wounds.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class TendingComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "a wound tender";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/TweezersComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/TweezersComponent.cs
deleted file mode 100644
index 0b5f6f65e07..00000000000
--- a/Content.Shared/_Shitmed/Surgery/Tools/TweezersComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
-
-/// <summary>
-///     Like Hemostat but lets ghetto tools be used differently for clamping and removing organs.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class TweezersComponent : Component, ISurgeryToolComponent
-{
-    public string ToolName => "tweezers";
-    public bool? Used { get; set; } = null;
-    [DataField]
-    public float Speed { get; set; } = 1f;
-}
diff --git a/Content.Shared/_Shitmed/Switchable/SwitchableVisuals.cs b/Content.Shared/_Shitmed/Switchable/SwitchableVisuals.cs
deleted file mode 100644
index e0fa09d2013..00000000000
--- a/Content.Shared/_Shitmed/Switchable/SwitchableVisuals.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Content.Shared.Actions;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Switchable;
-
-public sealed partial class SwitchableActionEvent : InstantActionEvent;
-
-/// <summary>
-///     Generic enum keys for toggle-visualizer appearance data & sprite layers.
-/// </summary>
-[Serializable, NetSerializable]
-public enum SwitchableVisuals : byte
-{
-    Switched,
-    Layer
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Targeting/Events.cs b/Content.Shared/_Shitmed/Targeting/Events.cs
deleted file mode 100644
index 11a84cc4049..00000000000
--- a/Content.Shared/_Shitmed/Targeting/Events.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Content.Shared._Shitmed.Targeting;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared._Shitmed.Targeting.Events;
-
-[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;
-    }
-}
diff --git a/Content.Shared/_Shitmed/Targeting/SharedTargetingSystem.cs b/Content.Shared/_Shitmed/Targeting/SharedTargetingSystem.cs
deleted file mode 100644
index 2dccd238d84..00000000000
--- a/Content.Shared/_Shitmed/Targeting/SharedTargetingSystem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace Content.Shared._Shitmed.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/_Shitmed/Targeting/TargetBodyPart.cs b/Content.Shared/_Shitmed/Targeting/TargetBodyPart.cs
deleted file mode 100644
index 37bcf175d2e..00000000000
--- a/Content.Shared/_Shitmed/Targeting/TargetBodyPart.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace Content.Shared._Shitmed.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/_Shitmed/Targeting/TargetIntegrity.cs b/Content.Shared/_Shitmed/Targeting/TargetIntegrity.cs
deleted file mode 100644
index e6b6a34905a..00000000000
--- a/Content.Shared/_Shitmed/Targeting/TargetIntegrity.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Shared._Shitmed.Targeting;
-public enum TargetIntegrity
-{
-    Healthy = 0,
-    LightlyWounded = 1,
-    SomewhatWounded = 2,
-    ModeratelyWounded = 3,
-    HeavilyWounded = 4,
-    CriticallyWounded = 5,
-    Severed = 6,
-    Dead = 7,
-    Disabled = 8,
-}
\ No newline at end of file
diff --git a/Content.Shared/_Shitmed/Targeting/TargetingComponent.cs b/Content.Shared/_Shitmed/Targeting/TargetingComponent.cs
deleted file mode 100644
index 096e7026a51..00000000000
--- a/Content.Shared/_Shitmed/Targeting/TargetingComponent.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared._Shitmed.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/Content.Shared/_White/Bed/Components/StasisBedBuckledComponent.cs b/Content.Shared/_White/Bed/Components/StasisBedBuckledComponent.cs
new file mode 100644
index 00000000000..37a1011c132
--- /dev/null
+++ b/Content.Shared/_White/Bed/Components/StasisBedBuckledComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Bed.Components;
+
+/// <summary>
+/// Tracking component added to entities buckled to stasis beds.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StasisBedBuckledComponent : Component;
diff --git a/Content.Shared/_White/Body/Bloodstream/BloodGroup.cs b/Content.Shared/_White/Body/Bloodstream/BloodGroup.cs
new file mode 100644
index 00000000000..f9f2d72a10f
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/BloodGroup.cs
@@ -0,0 +1,76 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Bloodstream;
+
+/// <summary>
+/// Defines the main blood type of person according to the AB0 system.
+/// </summary>
+[Serializable, NetSerializable]
+public enum BloodType : byte
+{
+    O,
+    A,
+    B,
+    AB,
+}
+
+/// <summary>
+/// Defines the Rhesus factor of the blood.
+/// </summary>
+[Serializable, NetSerializable]
+public enum BloodRhesusFactor : byte
+{
+    Positive,
+    Negative,
+}
+
+/// <summary>
+/// Represents a complete blood group, combining the AB0 type and the Rhesus factor.
+/// </summary>
+[Serializable, NetSerializable]
+public struct BloodGroup
+{
+    [DataField]
+    public BloodType Type = BloodType.O;
+
+    [DataField]
+    public BloodRhesusFactor RhesusFactor = BloodRhesusFactor.Negative;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BloodGroup"/> structure.
+    /// </summary>
+    public BloodGroup() { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BloodGroup"/> structure.
+    /// </summary>
+    /// <param name="type">The AB0 type.</param>
+    /// <param name="rhesusFactor">The Rhesus factor.</param>
+    public BloodGroup(BloodType type, BloodRhesusFactor rhesusFactor)
+    {
+        Type = type;
+        RhesusFactor = rhesusFactor;
+    }
+
+    /// <summary>
+    /// Returns the standard string representation of the blood group (e.g., "+A", "-O").
+    /// </summary>
+    /// <returns>The string representation of the blood group.</returns>
+    public override string ToString()
+    {
+        var type = Type.ToString();
+        var rhesusFactor = RhesusFactor == BloodRhesusFactor.Positive ? "+" : "-";
+
+        return $"{rhesusFactor}{type}";
+    }
+
+    public bool Equals(BloodGroup other) => other.Type == Type && other.RhesusFactor == RhesusFactor;
+
+    public override bool Equals(object? obj) => obj is BloodGroup other && Equals(other);
+
+    public override int GetHashCode() => HashCode.Combine(Type, RhesusFactor);
+
+    public static bool operator ==(BloodGroup left, BloodGroup right) => left.Equals(right);
+
+    public static bool operator !=(BloodGroup left, BloodGroup right) => !(left == right);
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/BloodGroupSerializer.cs b/Content.Shared/_White/Body/Bloodstream/BloodGroupSerializer.cs
new file mode 100644
index 00000000000..cb664a986a4
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/BloodGroupSerializer.cs
@@ -0,0 +1,67 @@
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Markdown.Mapping;
+using Robust.Shared.Serialization.Markdown.Validation;
+using Robust.Shared.Serialization.Markdown.Value;
+using Robust.Shared.Serialization.TypeSerializers.Interfaces;
+
+namespace Content.Shared._White.Body.Bloodstream;
+
+[TypeSerializer]
+public sealed class BloodGroupSerializer : ITypeReader<BloodGroup, MappingDataNode>, ITypeCopier<BloodGroup>
+{
+    public ValidationNode Validate(
+        ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        ISerializationContext? context = null
+        )
+    {
+        var nodes = new List<ValidationNode>();
+
+        if (node.TryGet("type", out ValueDataNode? type)
+            && !Enum.TryParse(type.Value, out BloodType _))
+            nodes.Add(new ErrorNode(type, $"Can't parse {type.Value} to {typeof(BloodType)}"));
+
+        if (node.TryGet("rhesusFactor", out ValueDataNode? rhesusFactor)
+            && !Enum.TryParse(rhesusFactor.Value, out BloodRhesusFactor _))
+            nodes.Add(new ErrorNode(rhesusFactor, $"Can't parse {rhesusFactor.Value} to {typeof(BloodRhesusFactor)}"));
+
+        return new ValidatedSequenceNode(nodes);
+    }
+
+    public BloodGroup Read(
+        ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        SerializationHookContext hookCtx,
+        ISerializationContext? context = null,
+        ISerializationManager.InstantiationDelegate<BloodGroup>? instanceProvider = null
+        )
+    {
+        var bloodGroup = new BloodGroup();
+
+        if (node.TryGet("type", out ValueDataNode? type)
+            && Enum.TryParse(type.Value, out BloodType bloodType))
+            bloodGroup.Type = bloodType;
+
+        if (node.TryGet("rhesusFactor", out ValueDataNode? rhesusFactor)
+            && Enum.TryParse(rhesusFactor.Value, out BloodRhesusFactor bloodRhesusFactor))
+            bloodGroup.RhesusFactor = bloodRhesusFactor;
+
+        return bloodGroup;
+    }
+
+    public void CopyTo(
+        ISerializationManager serializationManager,
+        BloodGroup source,
+        ref BloodGroup target,
+        IDependencyCollection dependencies,
+        SerializationHookContext hookCtx,
+        ISerializationContext? context = null
+        )
+    {
+        target.Type = source.Type;
+        target.RhesusFactor = source.RhesusFactor;
+    }
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Components/BleedingBodyPartComponent.cs b/Content.Shared/_White/Body/Bloodstream/Components/BleedingBodyPartComponent.cs
new file mode 100644
index 00000000000..83db6a79aa6
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Components/BleedingBodyPartComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Body.Bloodstream.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class BleedingBodyPartComponent : Component
+{
+    /// <summary>
+    /// The current amount of bleeding.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public FixedPoint2 Bleeding;
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Components/BleedingWoundComponent.cs b/Content.Shared/_White/Body/Bloodstream/Components/BleedingWoundComponent.cs
new file mode 100644
index 00000000000..12e1c17dab2
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Components/BleedingWoundComponent.cs
@@ -0,0 +1,44 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Body.Bloodstream.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class BleedingWoundComponent : Component
+{
+    /// <summary>
+    /// The maximum amount of bleeding.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 MaximumBleeding = 5f;
+
+    /// <summary>
+    /// Wound must be tended before bleeding ends if it has this much damage.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 RequiresTendingAbove = 25;
+
+    /// <summary>
+    /// Wound must have at least this much damage to start bleeding.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 StartsBleedingAbove = 10;
+
+    /// <summary>
+    /// Coefficient of damage to bleeding rate.
+    /// </summary>
+    [DataField]
+    public float BleedingCoefficient = 0.015f;
+
+    /// <summary>
+    /// Coefficient of damage to bleeding duration.
+    /// </summary>
+    [DataField]
+    public float BleedingDurationCoefficient = 1f;
+
+    /// <summary>
+    /// The current amount of bleeding.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public FixedPoint2 Bleeding;
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Components/BloodGeneratorComponent.cs b/Content.Shared/_White/Body/Bloodstream/Components/BloodGeneratorComponent.cs
new file mode 100644
index 00000000000..3043a4527f1
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Components/BloodGeneratorComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Body.Bloodstream.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class BloodGeneratorComponent : Component
+{
+    /// <summary>
+    /// How much should bleeding be reduced every update interval?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 BleedReductionAmount = 0.11f;
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Components/BloodstreamComponent.cs b/Content.Shared/_White/Body/Bloodstream/Components/BloodstreamComponent.cs
new file mode 100644
index 00000000000..c7c54ed185c
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Components/BloodstreamComponent.cs
@@ -0,0 +1,210 @@
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Prototypes;
+using Content.Shared.Alert;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Bloodstream.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
+public sealed partial class BloodstreamComponent : Component
+{
+    /// <summary>
+    /// The blood type that flows in the entity.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(BloodGroupSerializer)), AutoNetworkedField]
+    public BloodGroup BloodGroup = new BloodGroup();
+
+    /// <summary>
+    /// From which solution will this metabolizer attempt to metabolize chemicals for a given stage?
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<MetabolismStagePrototype>, MetabolismStagesEntry> Stages = new()
+    {
+        ["Respiration"] = new()
+        {
+            NextStage = "Absorption"
+        },
+        ["Digestion"] = new()
+        {
+            NextStage = "Absorption"
+        },
+        ["Absorption"] = new()
+        {
+            NextStage = "Excretion"
+        },
+        ["Excretion"] = new()
+    };
+
+    /// <summary>
+    /// How much is this entity currently bleeding?
+    /// Higher numbers mean more blood lost every tick.
+    ///
+    /// Goes down slowly over time, and items like bandages
+    /// or clotting reagents can lower bleeding.
+    /// </summary>
+    /// <remarks>
+    /// This generally corresponds to the amount of damage and can't go above 100.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 Bleeding = FixedPoint2.Zero;
+
+    /// <summary>
+    /// How much blood needs to be in the temporary solution in order to create a puddle?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 BleedPuddleThreshold = 1.0f;
+
+    /// <summary>
+    /// Max volume of internal blood storage,
+    /// and starting level of blood.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 BloodMaxVolume = FixedPoint2.New(300);
+
+    /// <summary>
+    /// Max volume of internal chemical solution storage
+    /// </summary>
+    [DataField]
+    public FixedPoint2 ChemicalMaxVolume = FixedPoint2.New(250);
+
+    /// <summary>
+    /// How high can <see cref="Bleeding"/> go?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 MaximumBleeding = 10;
+
+    /// <summary>
+    /// Maximum mass coefficient regulating bloodstream volume.
+    /// </summary>
+    [DataField]
+    public float MaxMassAdjust = 3f;
+
+    /// <summary>
+    /// Minimum mass coefficient regulating bloodstream volume.
+    /// </summary>
+    [DataField]
+    public float MinMassAdjust = 1 / 3f;
+
+    /// <summary>
+    /// The power to which the outcome of the mass contest will be risen.
+    /// </summary>
+    [DataField]
+    public float PowerMassAdjust;
+
+    /// <summary>
+    /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float UpdateIntervalMultiplier = 1f;
+
+    /// <summary>
+    /// Alert to show when bleeding.
+    /// </summary>
+    [DataField]
+    public ProtoId<AlertPrototype> BleedingAlert = "Bleed";
+
+    /// <summary>
+    /// The sound to be played when some damage actually heals bleeding rather than starting it.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier BloodHealedSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
+
+    /// <summary>
+    /// Defines which reagents are considered as 'blood'.
+    /// </summary>
+    /// <remarks>
+    /// Slime-people might use slime as their blood or something like that.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> BloodReagent = "Blood";
+
+    /// <summary>
+    /// The sound to be played when a weapon instantly deals blood loss damage.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("blood");
+
+    /// <summary>
+    /// Name/Key that <see cref="BloodSolution"/> is indexed by.
+    /// </summary>
+    [DataField]
+    public string BloodSolutionName = "bloodstream";
+
+    /// <summary>
+    /// Name/Key that <see cref="TemporarySolution"/> is indexed by.
+    /// </summary>
+    [DataField]
+    public string BloodTemporarySolutionName = "bloodstreamTemporary";
+
+    /// <summary>
+    /// The interval at which this component updates.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(3);
+
+    /// <summary>
+    /// Multiplier applied to <see cref="BloodMaxVolume"/> for adjusting based on body mass index.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public double BloodMaxVolumeMultiplier = 1d;
+
+    /// <summary>
+    /// Internal solution for blood storage.
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? BloodSolution;
+
+    /// <summary>
+    /// Temporary blood solution.
+    /// When blood is lost, it goes to this solution, and when this
+    /// solution hits a certain cap, the blood is actually spilled as a puddle.
+    /// </summary>
+    [ViewVariables]
+    public Entity<SolutionComponent>? TemporarySolution;
+
+    /// <summary>
+    /// Adjusted blood max volume based off of the multiplier value.
+    /// </summary>
+    [ViewVariables]
+    public FixedPoint2 CurrentBloodMaxVolume => BloodMaxVolume * BloodMaxVolumeMultiplier;
+
+    [ViewVariables]
+    public float SaturationLevel = 1f;
+
+    /// <summary>
+    /// Caches the blood data of an entity.
+    /// This is modified by DNA on init so it's not savable.
+    /// </summary>
+    [ViewVariables]
+    public List<ReagentData>? BloodData;
+
+    /// <summary>
+    /// Adjusted update interval based off of the multiplier value.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
+    /// <summary>
+    /// The next time that blood level will be updated and bloodloss damage dealt.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
+}
+
+[DataDefinition]
+public sealed partial class MetabolismStagesEntry
+{
+    /// <summary>
+    /// Reagents without a metabolism for the current stage will be transferred to this stage.
+    /// </summary>
+    [DataField]
+    public ProtoId<MetabolismStagePrototype>? NextStage;
+
+    [ViewVariables]
+    public List<MetabolismStageEntry> Stages = new ();
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Bloodstream.cs b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Bloodstream.cs
new file mode 100644
index 00000000000..0d2b032b203
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Bloodstream.cs
@@ -0,0 +1,462 @@
+using System.Linq;
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared._White.Chemistry.Reagent;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics.Components;
+using Content.Shared.HealthExaminable;
+using Content.Shared.Rejuvenate;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Bloodstream.Systems;
+
+public abstract partial class SharedBloodstreamSystem
+{
+    private void InitializeBloodstream()
+    {
+        SubscribeLocalEvent<BloodstreamComponent, ApplyMetabolicRateEvent>(OnApplyMetabolicMultiplier);
+        SubscribeLocalEvent<BloodstreamComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
+        SubscribeLocalEvent<BloodstreamComponent, HealthBeingExaminedEvent>(OnHealthBeingExamined);
+        SubscribeLocalEvent<BloodstreamComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<BloodstreamComponent, RejuvenateEvent>(OnRejuvenate);
+    }
+
+    #region Event Handling
+
+    private void OnApplyMetabolicMultiplier(Entity<BloodstreamComponent> ent, ref ApplyMetabolicRateEvent args)
+    {
+        ent.Comp.UpdateIntervalMultiplier = args.Rate == 0 ? 0 : 1 / args.Rate;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.UpdateIntervalMultiplier));
+    }
+
+    private void OnEntRemoved(Entity<BloodstreamComponent> entity, ref EntRemovedFromContainerMessage args)
+    {
+        // Make sure the removed entity was our contained solution and set it to null
+        if (args.Entity == entity.Comp.BloodSolution?.Owner)
+            entity.Comp.BloodSolution = null;
+
+        if (args.Entity == entity.Comp.TemporarySolution?.Owner)
+            entity.Comp.TemporarySolution = null;
+    }
+
+    private void OnHealthBeingExamined(Entity<BloodstreamComponent> ent, ref HealthBeingExaminedEvent args)
+    {
+        // Shows profusely bleeding at half the max bleed rate.
+        if (ent.Comp.Bleeding > ent.Comp.MaximumBleeding / 2)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(
+                !args.IsSelfAware
+                    ? Loc.GetString("bloodstream-component-profusely-bleeding", ("target", ent.Owner))
+                    : Loc.GetString("bloodstream-component-selfaware-profusely-bleeding"));
+        }
+        // Shows bleeding message when bleeding, but less than profusely.
+        else if (ent.Comp.Bleeding > 0)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(
+                !args.IsSelfAware
+                    ? Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner))
+                    : Loc.GetString("bloodstream-component-selfaware-bleeding"));
+        }
+
+        // If the mob's blood level is below the damage threshhold, the pale message is added.
+        if (GetBloodLevel(ent.AsNullable()) < 0.9f)
+        {
+            args.Message.PushNewline();
+            args.Message.AddMarkupOrThrow(
+                !args.IsSelfAware
+                    ? Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner))
+                    : Loc.GetString("bloodstream-component-selfaware-looks-pale"));
+        }
+    }
+
+    private void OnMapInit(Entity<BloodstreamComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.AdjustedUpdateInterval;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.NextUpdate));
+    }
+
+    private void OnRejuvenate(Entity<BloodstreamComponent> ent, ref RejuvenateEvent args)
+    {
+        if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out _))
+            return;
+
+        SolutionContainer.RemoveAllSolution(ent.Comp.BloodSolution.Value);
+        TryModifyBloodLevel(ent.AsNullable(), ent.Comp.CurrentBloodMaxVolume - GetBloodAmount(ent.AsNullable()));
+
+        UpdateBloodstream(ent);
+    }
+
+    #endregion
+
+    #region Private API
+
+    private bool IsCompatibleBlood(BloodstreamComponent bloodstream, ReagentId reagent) =>
+        reagent.Prototype == bloodstream.BloodReagent
+        && reagent.EnsureReagentData()
+            .Any(x => x is BloodReagentData bloodReagentData
+                && BloodGroupCompatible(bloodReagentData.BloodGroup, bloodstream.BloodGroup));
+
+    /// <summary>
+    /// Gets new blood data for this entity and caches it in <see cref="BloodstreamComponent.BloodData"/>
+    /// </summary>
+    protected List<ReagentData> GenerateEntityBloodData(Entity<BloodstreamComponent?> ent)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp))
+            return new List<ReagentData>();
+
+        var reagentData = new List<ReagentData>
+        {
+            new BloodReagentData
+            {
+                BloodGroup = ent.Comp.BloodGroup
+            },
+            new DnaData
+            {
+                DNA = TryComp<DnaComponent>(ent, out var dnaComponent)
+                    ? dnaComponent.DNA
+                    : Loc.GetString("forensics-dna-unknown")
+            }
+        };
+
+        ent.Comp.BloodData = reagentData;
+        return reagentData;
+    }
+
+    private void UpdateBloodstream(Entity<BloodstreamComponent> ent)
+    {
+        ent.Comp.NextUpdate += ent.Comp.AdjustedUpdateInterval;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.NextUpdate));
+
+        var bloodAmount = GetBloodAmount(ent.AsNullable());
+        // Adds blood to their blood level if it is below the maximum; Blood regeneration. Must be alive.
+        if (bloodAmount < ent.Comp.CurrentBloodMaxVolume && !_mobState.IsDead(ent))
+        {
+            var getReductionEvent = new GetBloodReductionEvent(FixedPoint2.Zero);
+            RaiseLocalEvent(ent, ref getReductionEvent);
+
+            if (getReductionEvent.BloodReduction > FixedPoint2.Zero)
+                TryModifyBloodLevel(ent.AsNullable(), getReductionEvent.BloodReduction);
+        }
+
+        if (bloodAmount > ent.Comp.CurrentBloodMaxVolume)
+            TryModifyBloodLevel(ent.AsNullable(), ent.Comp.CurrentBloodMaxVolume - bloodAmount);
+
+        var getBleedEvent = new GetBleedEvent(FixedPoint2.Zero);
+        RaiseLocalEvent(ent, ref getBleedEvent);
+
+        var oldBleeding = ent.Comp.Bleeding;
+        ent.Comp.Bleeding = FixedPoint2.Clamp(getBleedEvent.Bleeding, 0, ent.Comp.MaximumBleeding);
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.Bleeding));
+
+        TickBleed(ent);
+
+        if (oldBleeding == ent.Comp.Bleeding)
+            return;
+
+        RaiseLocalEvent(ent, new AfterBleedingChangedEvent(ent.Comp.Bleeding, oldBleeding));
+
+        if (ent.Comp.Bleeding == 0)
+            _alerts.ClearAlert(ent, ent.Comp.BleedingAlert);
+        else
+        {
+            var severity = (short)Math.Clamp(Math.Round(ent.Comp.Bleeding.Float(), MidpointRounding.ToZero), 0, 10);
+            _alerts.ShowAlert(ent, ent.Comp.BleedingAlert, severity);
+        }
+    }
+
+    private void TickBleed(Entity<BloodstreamComponent> ent)
+    {
+        if (ent.Comp.Bleeding <= 0)
+            return;
+
+        var ev = new BleedModifierEvent(ent.Comp.Bleeding, 0);
+        RaiseLocalEvent(ent, ref ev);
+
+        // Blood is removed from the bloodstream at a 1-1 rate with the bleed amount
+        TryBleedOut(ent.AsNullable(), ev.Bleeding);
+
+        // Bleed rate is reduced by the bleed reduction amount in the bloodstream component.
+        TryModifyBleedAmount(ent.AsNullable(), -ev.BleedReductionAmount);
+    }
+
+    #endregion
+
+    #region Public API
+
+    /// <summary>
+    /// Removes a certain amount of all reagents except of a single excluded one from the bloodstream and blood itself.
+    /// </summary>
+    /// <returns>
+    /// Solution of removed chemicals or null if none were removed.
+    /// </returns>
+    public Solution? FlushChemicals(Entity<BloodstreamComponent?> ent, FixedPoint2 quantity, ProtoId<ReagentPrototype>? excludedReagentId = null)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+            return null;
+
+        var flushedSolution = new Solution();
+        foreach (var reagent in bloodSolution.Contents)
+        {
+            if (reagent.Reagent.Prototype == excludedReagentId
+                || reagent.Reagent.Prototype == ent.Comp.BloodReagent)
+                continue;
+
+            var reagentFlushAmount = SolutionContainer.RemoveReagent(ent.Comp.BloodSolution.Value, reagent.Reagent, quantity);
+            flushedSolution.AddReagent(reagent.Reagent, reagentFlushAmount);
+        }
+
+        return flushedSolution.Volume == 0 ? null : flushedSolution;
+    }
+
+    /// <summary>
+    /// Attempt to transfer a provided solution to internal solution.
+    /// </summary>
+    public bool TryAddToBloodstream(Entity<BloodstreamComponent?> ent, Solution solution)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution))
+            return false;
+
+        var bloodAmount = GetBloodAmount(ent);
+
+        if (!SolutionContainer.TryAddSolution(ent.Comp.BloodSolution.Value, solution))
+            return false;
+
+        var newBloodAmount = FixedPoint2.Zero;
+        foreach (var reagent in solution.Contents)
+        {
+            if (!IsCompatibleBlood(ent.Comp, reagent.Reagent))
+                continue;
+
+            newBloodAmount += reagent.Quantity;
+        }
+
+        if (newBloodAmount == FixedPoint2.Zero)
+            return true;
+
+        RaiseLocalEvent(ent, new AfterBloodAmountChangedEvent((ent, ent.Comp), bloodAmount + newBloodAmount, bloodAmount));
+        return true;
+    }
+
+    /// <summary>
+    /// Removes blood by spilling out the bloodstream.
+    /// </summary>
+    public bool TryBleedOut(Entity<BloodstreamComponent?> ent, FixedPoint2 amount)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution)
+            || amount <= 0)
+            return false;
+
+        var leakedBlood = SolutionContainer.SplitSolution(ent.Comp.BloodSolution.Value, amount);
+
+        if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodTemporarySolutionName, ref ent.Comp.TemporarySolution, out var tempSolution))
+            return true;
+
+        tempSolution.AddSolution(leakedBlood, _prototypeManager);
+
+        if (tempSolution.Volume > ent.Comp.BleedPuddleThreshold)
+        {
+            _puddle.TrySpillAt(ent.Owner, tempSolution, out _, sound: false);
+
+            tempSolution.RemoveAllSolution();
+        }
+
+        SolutionContainer.UpdateChemicals(ent.Comp.TemporarySolution.Value);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to make an entity bleed more or less.
+    /// </summary>
+    public bool TryModifyBleedAmount(Entity<BloodstreamComponent?> ent, FixedPoint2 amount, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        if (!Resolve(ent, ref ent.Comp, logMissing: false))
+            return false;
+
+        var woundAmount = amount;
+
+        var wounds = _wound.GetWounds<BleedingWoundComponent>(ent, scar: true, bodyPartType: bodyPartType);
+        foreach (var wound in wounds)
+        {
+            if (woundAmount == 0f)
+                break;
+
+            woundAmount -= TryModifyWoundBleedAmount((wound, wound.Comp2), woundAmount);
+        }
+
+        ent.Comp.Bleeding = FixedPoint2.Clamp(ent.Comp.Bleeding + (amount - woundAmount), 0, ent.Comp.MaximumBleeding);
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.Bleeding));
+
+        if (ent.Comp.Bleeding == 0)
+            _alerts.ClearAlert(ent.Owner, ent.Comp.BleedingAlert);
+        else
+        {
+            var severity = (short)Math.Clamp(Math.Round(ent.Comp.Bleeding.Float(), MidpointRounding.ToZero), 0, 10);
+            _alerts.ShowAlert(ent.Owner, ent.Comp.BleedingAlert, severity);
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    ///  Attempts to modify the blood level of this entity directly.
+    /// </summary>
+    public bool TryModifyBloodLevel(Entity<BloodstreamComponent?> ent, FixedPoint2 amount)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp, logMissing: false)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out _)
+            || amount == 0)
+            return false;
+
+        var bloodAmount = GetBloodAmount(ent);
+        var bloodData = GetEntityBloodData(ent);
+        var acceptedQuantity = FixedPoint2.Zero;
+
+        amount = FixedPoint2.Min(amount, ent.Comp.CurrentBloodMaxVolume - bloodAmount);
+
+        if (amount > 0 && !SolutionContainer.TryAddReagent(ent.Comp.BloodSolution.Value, ent.Comp.BloodReagent, amount, out acceptedQuantity, data: bloodData))
+            return false;
+
+        if (amount < 0)
+            acceptedQuantity = -SolutionContainer.RemoveReagent(ent.Comp.BloodSolution.Value, ent.Comp.BloodReagent, amount, bloodData);
+
+        if (acceptedQuantity == FixedPoint2.Zero)
+            return false;
+
+        RaiseLocalEvent(ent, new AfterBloodAmountChangedEvent((ent, ent.Comp), bloodAmount + acceptedQuantity, bloodAmount));
+
+        return true;
+    }
+
+    /// <summary>
+    /// Returns the current blood amount.
+    /// </summary>
+    public FixedPoint2 GetBloodAmount(Entity<BloodstreamComponent?> ent)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+            return FixedPoint2.Zero;
+
+        var bloodAmount = FixedPoint2.Zero;
+        foreach (var reagent in bloodSolution.Contents)
+        {
+            if (!IsCompatibleBlood(ent.Comp, reagent.Reagent))
+                continue;
+
+            bloodAmount += reagent.Quantity;
+        }
+
+        return bloodAmount;
+    }
+
+    /// <summary>
+    /// Returns the current blood level as a percentage (between 0 and 1).
+    /// </summary>
+    public float GetBloodLevel(Entity<BloodstreamComponent?> ent)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp))
+            return 0.0f;
+
+        return GetBloodAmount(ent).Float() / ent.Comp.CurrentBloodMaxVolume.Float();
+    }
+
+    /// <summary>
+    /// Get the reagent data for blood that a specific entity should have.
+    /// </summary>
+    public List<ReagentData> GetEntityBloodData(Entity<BloodstreamComponent?> ent)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp))
+            return new List<ReagentData>();
+
+        return ent.Comp.BloodData ?? GenerateEntityBloodData(ent);
+    }
+
+    public List<ReagentQuantity> GetChemicals(Entity<BloodstreamComponent?> ent)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp)
+            || !SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+            return new List<ReagentQuantity>();
+
+        return GetChemicals(ent, bloodSolution);
+    }
+
+    public List<ReagentQuantity> GetChemicals(Entity<BloodstreamComponent?> ent, Solution solution)
+    {
+        var reagents =  new List<ReagentQuantity>();
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp))
+            return reagents;
+
+        foreach (var reagent in solution.Contents)
+        {
+            if (IsCompatibleBlood(ent.Comp, reagent.Reagent))
+                continue;
+
+            reagents.Add(reagent);
+        }
+
+        return reagents;
+    }
+
+    /// <summary>
+    /// Change what someone's blood is made of, on the fly.
+    /// </summary>
+    public void ChangeBloodReagent(Entity<BloodstreamComponent?> ent, ProtoId<ReagentPrototype> reagent)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp, logMissing: false) || reagent == ent.Comp.BloodReagent)
+            return;
+
+        if (!SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+        {
+            ent.Comp.BloodReagent = reagent;
+            return;
+        }
+
+        var currentVolume = bloodSolution.RemoveReagent(ent.Comp.BloodReagent, bloodSolution.Volume, ignoreReagentData: true);
+
+        ent.Comp.BloodReagent = reagent;
+        DirtyField(ent, ent.Comp, nameof(BloodstreamComponent.BloodReagent));
+
+        if (currentVolume > 0)
+            SolutionContainer.TryAddReagent(ent.Comp.BloodSolution.Value, ent.Comp.BloodReagent, currentVolume, null, GetEntityBloodData(ent));
+    }
+
+    /// <summary>
+    /// Spill all bloodstream solutions into a puddle.
+    /// BLOOD FOR THE BLOOD GOD
+    /// </summary>
+    public void SpillAllSolutions(Entity<BloodstreamComponent?> ent)
+    {
+        if (!_bloodstreamQuery.Resolve(ent, ref ent.Comp))
+            return;
+
+        var tempSol = new Solution();
+
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodSolutionName, ref ent.Comp.BloodSolution, out var bloodSolution))
+        {
+            tempSol.MaxVolume += bloodSolution.MaxVolume;
+            tempSol.AddSolution(bloodSolution, _prototypeManager);
+            SolutionContainer.RemoveAllSolution(ent.Comp.BloodSolution.Value);
+        }
+
+        if (SolutionContainer.ResolveSolution(ent.Owner, ent.Comp.BloodTemporarySolutionName, ref ent.Comp.TemporarySolution, out var tempSolution))
+        {
+            tempSol.MaxVolume += tempSolution.MaxVolume;
+            tempSol.AddSolution(tempSolution, _prototypeManager);
+            SolutionContainer.RemoveAllSolution(ent.Comp.TemporarySolution.Value);
+        }
+
+        _puddle.TrySpillAt(ent, tempSol, out _);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.BodyPart.cs b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.BodyPart.cs
new file mode 100644
index 00000000000..0b537570f3e
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.BodyPart.cs
@@ -0,0 +1,25 @@
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Systems;
+
+namespace Content.Shared._White.Body.Bloodstream.Systems;
+
+public abstract partial class SharedBloodstreamSystem
+{
+    private void InitializeBodyPart() =>
+        SubscribeLocalEvent<BleedingBodyPartComponent, BodyPartRelayedEvent<GetBleedEvent>>(OnBodyPartGetBleed);
+
+    #region Event Handling
+
+    private void OnBodyPartGetBleed(Entity<BleedingBodyPartComponent> ent, ref BodyPartRelayedEvent<GetBleedEvent> args)
+    {
+        ent.Comp.Bleeding = 0f;
+        foreach (var wound in _wound.GetWounds<BleedingWoundComponent>(ent, scar: true))
+            ent.Comp.Bleeding += GetWoundBleed(wound.AsNullable());
+
+        Dirty(ent);
+
+        args.Args = new (args.Args.Bleeding + ent.Comp.Bleeding);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Generator.cs b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Generator.cs
new file mode 100644
index 00000000000..e9a641c8ef9
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Generator.cs
@@ -0,0 +1,27 @@
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Systems;
+
+namespace Content.Shared._White.Body.Bloodstream.Systems;
+
+public abstract partial class SharedBloodstreamSystem
+{
+    private void InitializeGenerator()
+    {
+        SubscribeLocalEvent<BloodGeneratorComponent, BodyPartRelayedEvent<GetBloodReductionEvent>>(OnGetBloodReduction);
+        SubscribeLocalEvent<BloodGeneratorComponent, BoneRelayedEvent<GetBloodReductionEvent>>(OnGetBloodReduction);
+        SubscribeLocalEvent<BloodGeneratorComponent, OrganRelayedEvent<GetBloodReductionEvent>>(OnGetBloodReduction);
+    }
+
+    #region Event Handling
+
+    private void OnGetBloodReduction(Entity<BloodGeneratorComponent> ent, ref BodyPartRelayedEvent<GetBloodReductionEvent> args) =>
+        args.Args = new (BloodReduction: args.Args.BloodReduction + ent.Comp.BleedReductionAmount);
+
+    private void OnGetBloodReduction(Entity<BloodGeneratorComponent> ent, ref BoneRelayedEvent<GetBloodReductionEvent> args) =>
+        args.Args = new (BloodReduction: args.Args.BloodReduction + ent.Comp.BleedReductionAmount);
+
+    private void OnGetBloodReduction(Entity<BloodGeneratorComponent> ent, ref OrganRelayedEvent<GetBloodReductionEvent> args) =>
+        args.Args = new (BloodReduction: args.Args.BloodReduction + ent.Comp.BleedReductionAmount);
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Wound.cs b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Wound.cs
new file mode 100644
index 00000000000..15c6ee7aa22
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.Wound.cs
@@ -0,0 +1,72 @@
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared.FixedPoint;
+
+namespace Content.Shared._White.Body.Bloodstream.Systems;
+
+public abstract partial class SharedBloodstreamSystem
+{
+    private void InitializeWound() =>
+        SubscribeLocalEvent<BleedingWoundComponent, WoundDamageChangedEvent>(OnWoundDamageChange);
+
+    #region Event Handling
+
+    private void OnWoundDamageChange(Entity<BleedingWoundComponent> ent, ref WoundDamageChangedEvent args)
+    {
+        if (args.Wound.Comp.DamageAmount <= args.OldDamage
+            || args.Wound.Comp.DamageAmount < ent.Comp.StartsBleedingAbove)
+            return;
+
+        TryModifyWoundBleedAmount(ent.AsNullable(), (args.Wound.Comp.DamageAmount - args.OldDamage).Float() * ent.Comp.BleedingCoefficient);
+    }
+
+    #endregion
+
+    #region Private API
+
+    private FixedPoint2 GetWoundBleed(Entity<WoundComponent?, BleedingWoundComponent?> wound)
+    {
+        if (!Resolve(wound, ref wound.Comp1, ref wound.Comp2, false))
+            return 0f;
+
+        var ratio = 1f;
+        if (wound.Comp1.DamageAmount < wound.Comp2.RequiresTendingAbove)
+        {
+            var expiresAfter = TimeSpan.FromSeconds((wound.Comp1.DamageAmount * wound.Comp2.BleedingDurationCoefficient).Double());
+
+            if (wound.Comp1.WoundedAt + expiresAfter <= _timing.CurTime)
+                return 0f;
+
+            var expiryTime = (wound.Comp1.WoundedAt + expiresAfter - _timing.CurTime).TotalSeconds;
+            ratio = (float)(expiryTime / expiresAfter.TotalSeconds);
+        }
+
+        wound.Comp2.Bleeding *= ratio;
+        Dirty(wound, wound.Comp2);
+
+        return wound.Comp2.Bleeding;
+    }
+
+    #endregion
+
+    #region Public API
+
+    /// <summary>
+    /// Tries to make a wound bleed more or less.
+    /// </summary>
+    public FixedPoint2 TryModifyWoundBleedAmount(Entity<BleedingWoundComponent?> ent, FixedPoint2 amount)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return 0f;
+
+        var oldBleeding = ent.Comp.Bleeding;
+
+        ent.Comp.Bleeding = FixedPoint2.Clamp(ent.Comp.Bleeding + amount, 0f, ent.Comp.MaximumBleeding);
+        Dirty(ent);
+
+        return ent.Comp.Bleeding - oldBleeding;
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.cs b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.cs
new file mode 100644
index 00000000000..f87ad81f3e7
--- /dev/null
+++ b/Content.Shared/_White/Body/Bloodstream/Systems/SharedBloodstreamSystem.cs
@@ -0,0 +1,119 @@
+using Content.Shared._White.Body.Bloodstream.Components;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared.Alert;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Fluids;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._White.Body.Bloodstream.Systems;
+
+public abstract partial class SharedBloodstreamSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!;
+
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedPuddleSystem _puddle = default!;
+    [Dependency] private readonly SharedWoundSystem _wound = default!;
+
+    private EntityQuery<BloodstreamComponent> _bloodstreamQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _bloodstreamQuery = GetEntityQuery<BloodstreamComponent>();
+
+        InitializeBloodstream();
+        InitializeBodyPart();
+        InitializeGenerator();
+        InitializeWound();
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<BloodstreamComponent>();
+        while (query.MoveNext(out var uid, out var bloodstream))
+        {
+            if (bloodstream.AdjustedUpdateInterval == TimeSpan.Zero || curTime < bloodstream.NextUpdate)
+                continue;
+
+            UpdateBloodstream((uid, bloodstream));
+        }
+    }
+
+    #region Public API
+
+    /// <summary>
+    /// Checks whether the donor's blood group matches the recipient's.
+    /// </summary>
+    /// <param name="donor">Donor's blood group.</param>
+    /// <param name="recipient">Recipient's blood group.</param>
+    public static bool BloodGroupCompatible(BloodGroup donor, BloodGroup recipient) =>
+        BloodTypeCompatible(donor.Type, recipient.Type)
+        && BloodRhesusFactorCompatible(donor.RhesusFactor, recipient.RhesusFactor);
+
+    /// <summary>
+    /// Checks whether the donor's blood type matches the recipient's.
+    /// </summary>
+    /// <param name="donor">Donor's blood type.</param>
+    /// <param name="recipient">Recipient's blood type</param>
+    public static bool BloodTypeCompatible(BloodType donor, BloodType recipient) =>
+        recipient switch
+        {
+            BloodType.O => donor is BloodType.O,
+            BloodType.A => donor is BloodType.A or BloodType.O,
+            BloodType.B => donor is BloodType.B or BloodType.O,
+            BloodType.AB => true,
+            _ => false
+        };
+
+    /// <summary>
+    /// Checks whether the donor's blood Rhesus factor matches the recipient's.
+    /// </summary>
+    /// <param name="donor">Donor's blood Rhesus factor.</param>
+    /// <param name="recipient">Recipient's blood Rhesus factor</param>
+    public static bool BloodRhesusFactorCompatible(BloodRhesusFactor donor, BloodRhesusFactor recipient) =>
+        donor == BloodRhesusFactor.Negative || recipient == BloodRhesusFactor.Positive;
+
+    #endregion
+}
+
+/// <summary>
+/// Raised on an entity after its blood level has changed.
+/// </summary>
+public record struct AfterBloodAmountChangedEvent(Entity<BloodstreamComponent> Bloodstream, FixedPoint2 BloodAmount, FixedPoint2 OldBloodAmount);
+
+/// <summary>
+/// Raised on an entity after its bleeding has changed.
+/// </summary>
+public record struct AfterBleedingChangedEvent(FixedPoint2 Bleeding, FixedPoint2 OldBleeding);
+
+/// <summary>
+/// Raised on an entity before they bleed to modify the amount.
+/// </summary>
+/// <param name="Bleeding">The amount of blood the entity will lose.</param>
+/// <param name="BleedReductionAmount">The amount of bleed reduction that will happen.</param>
+[ByRefEvent]
+public record struct BleedModifierEvent(FixedPoint2 Bleeding, float BleedReductionAmount);
+
+/// <summary>
+/// Raised on an entity to get the sum total of bleeding.
+/// </summary>
+[ByRefEvent]
+public record struct GetBleedEvent(FixedPoint2 Bleeding);
+
+/// <summary>
+/// Raised on an entity to get the sum total of blood reduction.
+/// </summary>
+[ByRefEvent]
+public record struct GetBloodReductionEvent(FixedPoint2 BloodReduction);
diff --git a/Content.Shared/_White/Body/BodyParts/Amputatable/AmputatableBodyPartComponent.cs b/Content.Shared/_White/Body/BodyParts/Amputatable/AmputatableBodyPartComponent.cs
new file mode 100644
index 00000000000..04c4866f0cf
--- /dev/null
+++ b/Content.Shared/_White/Body/BodyParts/Amputatable/AmputatableBodyPartComponent.cs
@@ -0,0 +1,46 @@
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.BodyParts.Amputatable;
+
+[RegisterComponent]
+public sealed partial class AmputatableBodyPartComponent : Component
+{
+    /// <summary>
+    /// The wound that will be created after amputation of this limb.
+    /// </summary>
+    [DataField]
+    public EntProtoId<WoundComponent> Wound;
+
+    /// <summary>
+    /// Damage, the value of which affects the chance of amputating a body part.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<DamageTypePrototype>, float> SupportedDamageType = new();
+
+    /// <summary>
+    /// Chance of amputated body parts based on damage. The highest threshold is selected.
+    /// </summary>
+    [DataField(required: true)]
+    public SortedDictionary<FixedPoint2, float> ChanceThresholds;
+
+    /// <summary>
+    /// A multiplier for the chance of body part amputation based on the current bone status.
+    /// </summary>
+    [DataField]
+    public Dictionary<BoneStatus, float> BoneMultiplierThresholds= new();
+
+    [ViewVariables]
+    public FixedPoint2 TotalDamage = FixedPoint2.Zero;
+
+    [ViewVariables]
+    public float CurrentChance => float.Clamp(CurrentChanceThreshold * CurrentBoneMultiplierThreshold, 0f, 1f);
+
+    [ViewVariables]
+    public float CurrentChanceThreshold;
+
+    [ViewVariables]
+    public float CurrentBoneMultiplierThreshold = 1f;
+}
diff --git a/Content.Shared/_White/Body/BodyParts/Amputatable/AmputatableBodyPartSystem.cs b/Content.Shared/_White/Body/BodyParts/Amputatable/AmputatableBodyPartSystem.cs
new file mode 100644
index 00000000000..553ba476db7
--- /dev/null
+++ b/Content.Shared/_White/Body/BodyParts/Amputatable/AmputatableBodyPartSystem.cs
@@ -0,0 +1,76 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared._White.Random;
+using Content.Shared._White.Threshold;
+using Content.Shared.FixedPoint;
+using Content.Shared.Rejuvenate;
+using Content.Shared.Throwing;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._White.Body.BodyParts.Amputatable;
+
+public sealed class AmputatableBodyPartSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly PredictedRandomManager _random = default!;
+
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly SharedWoundSystem _wound = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<AmputatableBodyPartComponent, BodyPartRelayedEvent<RejuvenateEvent>>(OnRejuvenate);
+        SubscribeLocalEvent<AmputatableBodyPartComponent, BoneStatusChangedEvent>(OnBoneStatusChange);
+        SubscribeLocalEvent<AmputatableBodyPartComponent, WoundDamageChangedEvent>(OnWoundDamageChanged);
+    }
+
+    private void OnRejuvenate(Entity<AmputatableBodyPartComponent> amputatableBodyPart, ref BodyPartRelayedEvent<RejuvenateEvent> args)
+    {
+        amputatableBodyPart.Comp.TotalDamage = FixedPoint2.Zero;
+        amputatableBodyPart.Comp.CurrentChanceThreshold = amputatableBodyPart.Comp.ChanceThresholds.HighestMatch(amputatableBodyPart.Comp.TotalDamage) ?? 0f;
+    }
+
+    private void OnBoneStatusChange(Entity<AmputatableBodyPartComponent> amputatableBodyPart, ref BoneStatusChangedEvent args)
+    {
+        if (!amputatableBodyPart.Comp.BoneMultiplierThresholds.TryGetValue(args.BoneState, out var boneMultiplier))
+            return;
+
+        amputatableBodyPart.Comp.CurrentBoneMultiplierThreshold = boneMultiplier;
+    }
+
+    private void OnWoundDamageChanged(Entity<AmputatableBodyPartComponent> amputatableBodyPart, ref WoundDamageChangedEvent args)
+    {
+        if (!_gameTiming.IsFirstTimePredicted
+            || args.Handled
+            || args.Wound.Comp.IsScar
+            || !amputatableBodyPart.Comp.SupportedDamageType.TryGetValue(args.Wound.Comp.DamageType, out var modify))
+            return;
+
+        amputatableBodyPart.Comp.TotalDamage += (args.Wound.Comp.DamageAmount - args.OldDamage) * modify;
+
+        if (args.OldDamage >= args.Wound.Comp.DamageAmount)
+            return;
+
+        amputatableBodyPart.Comp.CurrentChanceThreshold = amputatableBodyPart.Comp.ChanceThresholds.HighestMatch(amputatableBodyPart.Comp.TotalDamage) ?? 0f;
+
+        var random = _random.GetRandom(amputatableBodyPart);
+        if (!_random.Prob(random, amputatableBodyPart.Comp.CurrentChance))
+            return;
+
+        if (TryComp<BodyPartComponent>(amputatableBodyPart, out var bodyPartComponent)
+            && bodyPartComponent.Parent.HasValue
+            && _wound.TryCreateWound(bodyPartComponent.Parent.Value, amputatableBodyPart.Comp.Wound, out var wound))
+            _wound.ChangeWoundDamage(wound.Value.AsNullable(), amputatableBodyPart.Comp.TotalDamage);
+
+        _body.TryDetachBodyPart(amputatableBodyPart);
+        _throwing.TryThrow(
+            amputatableBodyPart,
+            _random.NextAngle(random).ToWorldVec() * _random.NextFloat(random, 0.8f, 2f),
+            _random.NextFloat(random, 0.5f, 1f),
+            pushbackRatio: 0.3f);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/_White/Body/BodyParts/Movement/MovementBodyPartSystem.cs b/Content.Shared/_White/Body/BodyParts/Movement/MovementBodyPartSystem.cs
new file mode 100644
index 00000000000..817515dfa4d
--- /dev/null
+++ b/Content.Shared/_White/Body/BodyParts/Movement/MovementBodyPartSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared._White.Body.Systems;
+using Content.Shared.Buckle;
+using Content.Shared.Movement.Components;
+using Content.Shared.Standing;
+
+namespace Content.Shared._White.Body.BodyParts.Movement;
+
+public sealed class MovementBodyPartSystem : EntitySystem
+{
+    [Dependency] private readonly SharedBuckleSystem _buckle = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<MovementBodyPartComponent, BodyPartAddedEvent>(OnBodyPartAdded);
+        SubscribeLocalEvent<MovementBodyPartComponent, BodyPartRemovedEvent>(OnBodyPartRemoved);
+    }
+
+    #region Event Handling
+
+    private void OnBodyPartAdded(Entity<MovementBodyPartComponent> movementBodyPart, ref BodyPartAddedEvent args)
+    {
+        if (!args.Body.HasValue)
+            return;
+
+        //TODO
+    }
+
+    private void OnBodyPartRemoved(Entity<MovementBodyPartComponent> movementBodyPart, ref BodyPartRemovedEvent args)
+    {
+        if (!args.Body.HasValue || _buckle.IsBuckled(args.Body.Value))
+            return;
+
+        _standingState.Down(args.Body.Value);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Components/BodyAppearanceComponent.cs b/Content.Shared/_White/Body/Components/BodyAppearanceComponent.cs
new file mode 100644
index 00000000000..cf0d1e119e1
--- /dev/null
+++ b/Content.Shared/_White/Body/Components/BodyAppearanceComponent.cs
@@ -0,0 +1,60 @@
+using Content.Shared._White.Humanoid.Prototypes;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._White.Body.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class BodyAppearanceComponent : Component
+{
+    [ViewVariables, AutoNetworkedField, NonSerialized]
+    public Dictionary<Enum, BodyAppearanceLayerInfo?> Layers = new();
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class BodyAppearanceLayerInfo
+{
+    [DataField]
+    public ProtoId<BodyTypePrototype>? BodyType;
+
+    [DataField]
+    public Color Color = Color.White;
+
+    [DataField]
+    public List<MarkingLayerInfo> MarkingsLayers = new();
+
+    [DataField]
+    public ResPath Sprite;
+
+    [DataField]
+    public Sex Sex = Sex.Unsexed;
+
+    [DataField]
+    public string State = string.Empty;
+
+    [DataField]
+    public bool Visible = true;
+}
+
+[Serializable, NetSerializable]
+public enum BodyAppearanceLayer
+{
+    Head,
+    Chest,
+    Groin,
+    LeftArm,
+    RightArm,
+    LeftHand,
+    RightHand,
+    LeftLeg,
+    RightLeg,
+    LeftFoot,
+    RightFoot,
+    Tail,
+    Wings,
+    Eyes
+}
diff --git a/Content.Shared/_White/Body/Components/BodyComponent.cs b/Content.Shared/_White/Body/Components/BodyComponent.cs
new file mode 100644
index 00000000000..94c077e9626
--- /dev/null
+++ b/Content.Shared/_White/Body/Components/BodyComponent.cs
@@ -0,0 +1,54 @@
+using Content.Shared._White.Body.Prototypes;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BodyComponent : Component
+{
+    [DataField]
+    public bool ThermalVisibility = true;
+
+    /// <summary>
+    /// Body parts attached to this body.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, BodyPartSlot> BodyParts = new();
+
+    /// <summary>
+    /// Organs attached to this body.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, OrganSlot> Organs = new();
+
+    /// <summary>
+    /// Relevant template to spawn for this body.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<BodyPrototype> Prototype;
+
+    [DataField]
+    public SoundSpecifier GibSound = new SoundCollectionSpecifier("gib");
+}
+
+[Serializable, NetSerializable]
+public sealed class BodyComponentState : ComponentState
+{
+    public BodyComponentState(BodyComponent component, EntityManager entityManager)
+    {
+        BodyParts = new();
+        foreach (var (stateKey, stateSlot) in component.BodyParts)
+            BodyParts.Add(stateKey, (stateSlot, entityManager.GetNetEntity(stateSlot.ContainerSlot?.Owner)));
+
+        Organs = new();
+        foreach (var (stateKey, stateSlot) in component.Organs)
+            Organs.Add(stateKey, (stateSlot, entityManager.GetNetEntity(stateSlot.ContainerSlot?.Owner)));
+    }
+
+    public readonly Dictionary<string, (BodyPartSlot BodyPartSlot, NetEntity? BodyPartOwner)> BodyParts;
+
+    public readonly Dictionary<string, (OrganSlot OrganSlot, NetEntity? OrganOwner)> Organs;
+}
diff --git a/Content.Shared/_White/Body/Components/BodyPartAppearanceComponent.cs b/Content.Shared/_White/Body/Components/BodyPartAppearanceComponent.cs
new file mode 100644
index 00000000000..4d9661856e4
--- /dev/null
+++ b/Content.Shared/_White/Body/Components/BodyPartAppearanceComponent.cs
@@ -0,0 +1,75 @@
+using Content.Shared._White.Humanoid.Prototypes;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._White.Body.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class BodyPartAppearanceComponent : Component
+{
+    /// <summary>
+    /// Determines whether a body part should change color when the body color changes.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanChangeColor = true;
+
+    /// <summary>
+    /// Determines whether a body part is marking.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IsMarking;
+
+    /// <summary>
+    /// Determines whether the body part sprite is visible.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Visible { get => LayerInfo.Visible; set => LayerInfo.Visible = value; }
+
+    /// <summary>
+    /// Sprite the color of this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color Color { get => LayerInfo.Color; set => LayerInfo.Color = value; }
+
+    /// <summary>
+    /// Display layer for this body part.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public Enum Layer;
+
+    /// <summary>
+    /// Markings of this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<MarkingLayerInfo> MarkingsLayers { get => LayerInfo.MarkingsLayers; set => LayerInfo.MarkingsLayers = value; }
+
+    /// <summary>
+    /// Body type of this body part.
+    /// </summary>
+    [DataField]
+    public ProtoId<BodyTypePrototype>? BodyType { get => LayerInfo.BodyType; set => LayerInfo.BodyType = value; }
+
+    /// <summary>
+    /// Path to sprite of this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ResPath Sprite { get => LayerInfo.Sprite; set => LayerInfo.Sprite = value; }
+
+    /// <summary>
+    /// Sex of this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Sex Sex { get => LayerInfo.Sex; set => LayerInfo.Sex = value; }
+
+    /// <summary>
+    /// Sprite state of this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string State { get => LayerInfo.State; set => LayerInfo.State = value; }
+
+    public BodyAppearanceLayerInfo LayerInfo = new();
+}
diff --git a/Content.Shared/_White/Body/Components/BodyPartComponent.cs b/Content.Shared/_White/Body/Components/BodyPartComponent.cs
new file mode 100644
index 00000000000..0e244594239
--- /dev/null
+++ b/Content.Shared/_White/Body/Components/BodyPartComponent.cs
@@ -0,0 +1,369 @@
+using System.Linq;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BodyPartComponent : Component
+{
+    /// <summary>
+    /// The type of this body part
+    /// </summary>
+    [DataField("bodyPartType")] // It can't support the "type" tag.
+    public BodyPartType Type = BodyPartType.None;
+
+    /// <summary>
+    /// Child body parts attached to this body part.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, BodyPartSlot> BodyParts = new();
+
+    /// <summary>
+    /// Bones attached to this body part.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, BoneSlot> Bones = new();
+
+    /// <summary>
+    /// Organs attached to this body part.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, OrganSlot> Organs = new();
+
+    /// <summary>
+    /// Parent body for this part.
+    /// </summary>
+    [ViewVariables]
+    public EntityUid? Body;
+
+    /// <summary>
+    /// Parent body part for this part.
+    /// </summary>
+    [ViewVariables]
+    public EntityUid? Parent;
+}
+
+/// <summary>
+/// Defines various types of body parts that can be manipulated.
+/// </summary>
+[Flags]
+public enum BodyPartType
+{
+    None = 0,
+
+    // --- Sides ---
+
+
+    /// <summary>
+    /// Left side.
+    /// </summary>
+    Left = 1 << 0,
+
+    /// <summary>
+    /// Middle part.
+    /// </summary>
+    Middle = 1 << 1,
+
+    /// <summary>
+    /// Right part.
+    /// </summary>
+    Right = 1 << 2,
+
+
+    // --- Main parts ---
+
+
+    /// <summary>
+    /// Head.
+    /// </summary>
+    Head = 1 << 3,
+
+    /// <summary>
+    /// Chest.
+    /// </summary>
+    Chest = 1 << 4,
+
+    /// <summary>
+    /// Groin.
+    /// </summary>
+    Groin = 1 << 5,
+
+    /// <summary>
+    /// Arm.
+    /// </summary>
+    Arm = 1 << 6,
+
+    /// <summary>
+    /// Hand.
+    /// </summary>
+    Hand = 1 << 7,
+
+    /// <summary>
+    /// Leg.
+    /// </summary>
+    Leg = 1 << 8,
+
+    /// <summary>
+    /// Foot.
+    /// </summary>
+    Foot = 1 << 9,
+
+    /// <summary>
+    /// Tail.
+    /// </summary>
+    Tail = 1 << 10,
+
+    /// <summary>
+    /// Wings.
+    /// </summary>
+    Wings = 1 << 11,
+
+    /// <summary>
+    /// Eyes.
+    /// </summary>
+    Eyes = 1 << 12,
+
+    /// <summary>
+    /// Mouth.
+    /// </summary>
+    Mouth = 1 << 13,
+
+
+    // --- Combined parts ---
+
+    // -- Arms --
+
+    /// <summary>
+    /// Left Arm.
+    /// </summary>
+    LeftArm = Left | Arm,
+
+    /// <summary>
+    /// Middle Arm.
+    /// </summary>
+    MiddleArm = Middle | Arm,
+
+    /// <summary>
+    /// Right Arm.
+    /// </summary>
+    RightArm = Right | Arm,
+
+    // -- Hands --
+
+    /// <summary>
+    /// Left Hand.
+    /// </summary>
+    LeftHand = Left | Hand,
+
+    /// <summary>
+    /// Middle Hand.
+    /// </summary>
+    MiddleHand = Middle | Hand,
+
+    /// <summary>
+    /// Right Hand.
+    /// </summary>
+    RightHand = Right | Hand,
+
+    // -- Legs --
+
+    /// <summary>
+    /// Left Leg.
+    /// </summary>
+    LeftLeg = Left | Leg,
+
+    /// <summary>
+    /// Middle Leg.
+    /// </summary>
+    MiddleLeg = Middle | Leg,
+
+    /// <summary>
+    /// Right Leg.
+    /// </summary>
+    RightLeg = Right | Leg,
+
+    // -- Foots --
+
+    /// <summary>
+    /// Left Foot
+    /// </summary>
+    LeftFoot = Left | Foot,
+
+    /// <summary>
+    /// Middle Foot
+    /// </summary>
+    MiddleFoot = Middle | Foot,
+
+    /// <summary>
+    /// Right Foot
+    /// </summary>
+    RightFoot = Right | Foot,
+
+    // -- Other --
+
+    /// <summary>
+    /// Torso.
+    /// </summary>
+    Torso = Chest | Groin,
+
+    /// <summary>
+    /// Face.
+    /// </summary>
+    Face = Head | Eyes | Mouth,
+
+    /// <summary>
+    /// All arms.
+    /// </summary>
+    Arms = Arm | Left | Middle | Right,
+
+    /// <summary>
+    /// All hands.
+    /// </summary>
+    Hands = Hand | Left | Middle | Right,
+
+    /// <summary>
+    /// All legs.
+    /// </summary>
+    Legs = Leg | Left | Middle | Right,
+
+    /// <summary>
+    /// All foots.
+    /// </summary>
+    Foots = Foot | Left | Middle | Right,
+
+    /// <summary>
+    /// The entire left limb, including the arm and hand.
+    /// </summary>
+    FullLeftArm  = LeftArm | LeftHand,
+
+    /// <summary>
+    /// The entire right limb, including the arm and hand.
+    /// </summary>
+    FullRightArm  = RightArm | RightHand,
+
+    /// <summary>
+    /// The entire left limb, including the leg and foot.
+    /// </summary>
+    FullLeftLeg  = LeftLeg | LeftFoot,
+
+    /// <summary>
+    /// The entire right limb, including the leg and foot.
+    /// </summary>
+    FullRightLeg  = RightLeg | RightFoot,
+
+    /// <summary>
+    /// All upper limbs, including arms and hands.
+    /// </summary>
+    FullArms  = Arms | Hands,
+
+    /// <summary>
+    /// All lower limbs, including the legs and foots.
+    /// </summary>
+    FullLegs  = Legs | Foots,
+
+    /// <summary>
+    /// All Limbs.
+    /// </summary>
+    AllLimbs = FullArms | FullLegs | Tail,
+
+    /// <summary>
+    /// All Parts.
+    /// </summary>
+    All = Torso | Face | AllLimbs
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class BodyPartSlot
+{
+    public BodyPartSlot() { }
+
+    public BodyPartSlot(BodyPartSlot other)
+    {
+        CopyFrom(other);
+    }
+
+    public BodyPartSlot(
+        BodyPartType type,
+        HashSet<string> connections,
+        Dictionary<string, BoneSlot> bones,
+        Dictionary<string, OrganSlot> organs,
+        EntProtoId? startingBodyPart
+        )
+    {
+        Type = type;
+        Connections = connections;
+        Bones = bones;
+        Organs = organs;
+        StartingBodyPart = startingBodyPart;
+    }
+
+    [DataField]
+    public BodyPartType Type = BodyPartType.None;
+
+    [DataField]
+    public HashSet<string> Connections = new();
+
+    [DataField]
+    public Dictionary<string, BoneSlot> Bones = new();
+
+    [DataField]
+    public Dictionary<string, OrganSlot> Organs = new();
+
+    [DataField(readOnly: true)]
+    public EntProtoId? StartingBodyPart;
+
+    [ViewVariables, NonSerialized]
+    public ContainerSlot? ContainerSlot;
+
+    public string? Id => ContainerSlot?.ID;
+    public bool HasBodyPart => ContainerSlot?.ContainedEntity != null;
+    public EntityUid? BodyPartUid => ContainerSlot?.ContainedEntity;
+
+    public void CopyFrom(BodyPartSlot other)
+    {
+        Type = other.Type;
+        Connections = other.Connections;
+        Bones = other.Bones.ToDictionary(x => x.Key, x => new BoneSlot(x.Value));
+        Organs = other.Organs.ToDictionary(x => x.Key, x => new OrganSlot(x.Value));
+        StartingBodyPart = other.StartingBodyPart;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class BodyPartComponentState : ComponentState
+{
+    public BodyPartComponentState(BodyPartComponent component, EntityManager entityManager)
+    {
+        Type = component.Type;
+
+        BodyParts = new();
+        foreach (var (stateKey, stateSlot) in component.BodyParts)
+            BodyParts.Add(stateKey, stateSlot);
+
+        Bones = new();
+        foreach (var (stateKey, stateSlot) in component.Bones)
+            Bones.Add(stateKey, stateSlot);
+
+        Organs = new();
+        foreach (var (stateKey, stateSlot) in component.Organs)
+            Organs.Add(stateKey, stateSlot);
+
+        Body = entityManager.GetNetEntity(component.Body);
+        Parent = entityManager.GetNetEntity(component.Parent);
+    }
+
+    public readonly BodyPartType Type;
+
+    public readonly Dictionary<string, BodyPartSlot> BodyParts;
+
+    public readonly Dictionary<string, BoneSlot> Bones;
+
+    public readonly Dictionary<string, OrganSlot> Organs;
+
+    public readonly NetEntity? Body;
+
+    public readonly NetEntity? Parent;
+}
diff --git a/Content.Shared/_White/Body/Components/BoneComponent.cs b/Content.Shared/_White/Body/Components/BoneComponent.cs
new file mode 100644
index 00000000000..239235e9cce
--- /dev/null
+++ b/Content.Shared/_White/Body/Components/BoneComponent.cs
@@ -0,0 +1,232 @@
+using System.Linq;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class BoneComponent : Component
+{
+    [DataField("boneType")] // It can't support the "type" tag.
+    public BoneType Type = BoneType.None;
+
+    [DataField]
+    public Dictionary<string, OrganSlot> Organs = new();
+
+    /// <summary>
+    /// Relevant body this bone is attached to.
+    /// </summary>
+    [DataField]
+    public EntityUid? Body;
+
+    /// <summary>
+    /// Parent body part for this bone.
+    /// </summary>
+    [DataField]
+    public EntityUid? Parent;
+}
+
+
+/// <summary>
+/// Defines various types of bones that can be manipulated.
+/// </summary>
+[Flags]
+public enum BoneType
+{
+    None = 0,
+
+    // --- Sides ---
+
+
+    /// <summary>
+    /// Left side.
+    /// </summary>
+    Left = 1 << 0,
+
+    /// <summary>
+    /// Middle part.
+    /// </summary>
+    Middle = 1 << 1,
+
+    /// <summary>
+    /// Right part.
+    /// </summary>
+    Right = 1 << 2,
+
+
+    // --- Main bones ---
+
+
+    /// <summary>
+    /// The cranium, the part of the skull that encloses the brain.
+    /// </summary>
+    Сranium = 1 << 0,
+
+    /// <summary>
+    /// The thorax, consisting of the rib cage and sternum, protecting the heart and lungs.
+    /// </summary>
+    Thorax = 1 << 1,
+
+    /// <summary>
+    /// The coxae, the hip bones (pelvic bones).
+    /// </summary>
+    Coxae = 1 << 2,
+
+    /// <summary>
+    /// The antebrachium, the bones of the forearm (radius and ulna), but within the framework of one bone - one body part also includes Humerus.
+    /// </summary>
+    Antebrachium = 1 << 3,
+
+    /// <summary>
+    /// The manus, the bones of the hand (carpals, metacarpals, phalanges).
+    /// </summary>
+    Manus = 1 << 4,
+
+    /// <summary>
+    /// The crus, the bones of the lower leg (tibia and fibula), but within the framework of one bone - one body part also includes Femur.
+    /// </summary>
+    Crus = 1 << 5,
+
+    /// <summary>
+    /// The pedis, the bones of the foot (tarsals, metatarsals, phalanges).
+    /// </summary>
+    Pedis = 1 << 6,
+
+
+    // --- Combined bones ---
+
+    // -- Antebrachium --
+
+    /// <summary>
+    /// Left Antebrachium.
+    /// </summary>
+    LeftAntebrachium = Left | Antebrachium,
+
+    /// <summary>
+    /// Middle Antebrachium.
+    /// </summary>
+    MiddleAntebrachium = Middle | Antebrachium,
+
+    /// <summary>
+    /// Right Antebrachium.
+    /// </summary>
+    RightAntebrachium = Right | Antebrachium,
+
+    // -- Manus --
+
+    /// <summary>
+    /// Left Manus.
+    /// </summary>
+    LeftManus = Left | Manus,
+
+    /// <summary>
+    /// Middle Manus.
+    /// </summary>
+    MiddleManus = Middle | Manus,
+
+    /// <summary>
+    /// Right Manus.
+    /// </summary>
+    RightManus = Right | Manus,
+
+    // -- Crus --
+
+    /// <summary>
+    /// Left Crus.
+    /// </summary>
+    LeftCrus = Left | Crus,
+
+    /// <summary>
+    /// Middle Crus.
+    /// </summary>
+    MiddleCrus = Middle | Crus,
+
+    /// <summary>
+    /// Right Crus.
+    /// </summary>
+    RightCrus = Right | Crus,
+
+    // -- Pedis --
+
+    /// <summary>
+    /// Left Pedis.
+    /// </summary>
+    LeftPedis = Left | Pedis,
+
+    /// <summary>
+    /// Middle Pedis.
+    /// </summary>
+    MiddlePedis = Middle | Pedis,
+
+    /// <summary>
+    /// Right Pedis.
+    /// </summary>
+    RightPedis = Right | Pedis,
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class BoneSlot
+{
+    public BoneSlot() { }
+
+    public BoneSlot(BoneSlot other)
+    {
+        CopyFrom(other);
+    }
+
+    public BoneSlot(BoneType type, Dictionary<string, OrganSlot> organs, EntProtoId? startingBone)
+    {
+        Type = type;
+        Organs = organs;
+        StartingBone = startingBone;
+    }
+
+    [DataField]
+    public BoneType Type = BoneType.None;
+
+    [DataField]
+    public Dictionary<string, OrganSlot> Organs = new();
+
+    [DataField(readOnly: true)]
+    public EntProtoId? StartingBone;
+
+    [ViewVariables, NonSerialized]
+    public ContainerSlot? ContainerSlot;
+
+    public string? Id => ContainerSlot?.ID;
+    public bool HasBone => ContainerSlot?.ContainedEntity != null;
+    public EntityUid? BoneUid => ContainerSlot?.ContainedEntity;
+
+    public void CopyFrom(BoneSlot other)
+    {
+        Type = other.Type;
+        Organs = other.Organs.ToDictionary(x => x.Key, x => new OrganSlot(x.Value));
+        StartingBone = other.StartingBone;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class BoneComponentState : ComponentState
+{
+    public BoneComponentState(BoneComponent component, EntityManager entityManager)
+    {
+        Type = component.Type;
+
+        Organs = new();
+        foreach (var (stateKey, stateSlot) in component.Organs)
+            Organs.Add(stateKey, stateSlot);
+
+        Body = entityManager.GetNetEntity(component.Body);
+        Parent = entityManager.GetNetEntity(component.Parent);
+    }
+
+    public readonly BoneType Type;
+
+    public readonly Dictionary<string, OrganSlot> Organs;
+
+    public readonly NetEntity? Body;
+
+    public readonly NetEntity? Parent;
+}
diff --git a/Content.Shared/_White/Body/Components/OrganAppearanceComponent.cs b/Content.Shared/_White/Body/Components/OrganAppearanceComponent.cs
new file mode 100644
index 00000000000..5c200557d63
--- /dev/null
+++ b/Content.Shared/_White/Body/Components/OrganAppearanceComponent.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._White.Body.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+public sealed partial class OrganAppearanceComponent : Component
+{
+    /// <summary>
+    /// Determines whether an organ should change color when the organ color changes
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanChangeColor = true;
+
+    /// <summary>
+    /// Sprite the color of this organ.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color Color { get => LayerInfo.Color; set => LayerInfo.Color = value; }
+
+    /// <summary>
+    /// Display layer for this organ.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public Enum Layer;
+
+    /// <summary>
+    /// Markings of this organ.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<MarkingLayerInfo> MarkingsLayers { get => LayerInfo.MarkingsLayers; set => LayerInfo.MarkingsLayers = value; }
+
+    /// <summary>
+    /// Path to sprite of this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ResPath Sprite { get => LayerInfo.Sprite; set => LayerInfo.Sprite = value; }
+
+    /// <summary>
+    /// Sprite state of this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string State { get => LayerInfo.State; set => LayerInfo.State = value; }
+
+    public BodyAppearanceLayerInfo LayerInfo = new();
+}
diff --git a/Content.Shared/_White/Body/Components/OrganComponent.cs b/Content.Shared/_White/Body/Components/OrganComponent.cs
new file mode 100644
index 00000000000..0cbb16e33d0
--- /dev/null
+++ b/Content.Shared/_White/Body/Components/OrganComponent.cs
@@ -0,0 +1,140 @@
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class OrganComponent : Component
+{
+    /// <summary>
+    /// Relevant body this organ is attached to.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Body;
+
+    /// <summary>
+    /// Parent body part for this organ.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? Parent;
+
+    [DataField("organType"), AutoNetworkedField] // It can't support the "type" tag.
+    public OrganType Type = OrganType.None;
+
+    [ViewVariables, AutoNetworkedField]
+    public bool Enable;
+}
+
+/// <summary>
+/// Defines various types of organs that can be manipulated.
+/// </summary>
+[Flags]
+public enum OrganType
+{
+    None = 0,
+
+    /// <summary>
+    /// The brain, the central organ of the nervous system.
+    /// </summary>
+    Brain = 1 << 0,
+
+    /// <summary>
+    /// The heart, responsible for pumping blood throughout the body.
+    /// </summary>
+    Heart = 1 << 1,
+
+    /// <summary>
+    /// The eyes, used for sight.
+    /// </summary>
+    Eyes = 1 << 2,
+
+    /// <summary>
+    /// The tongue, used for speech.
+    /// </summary>
+    Tongue = 1 << 3,
+
+    /// <summary>
+    /// The appendix, used for explosion.
+    /// </summary>
+    Appendix = 1 << 4,
+
+    /// <summary>
+    /// The ears, used for hearing.
+    /// </summary>
+    Ears = 1 << 5,
+
+    /// <summary>
+    /// The lungs, used for respirating.
+    /// </summary>
+    Lungs = 1 << 6,
+
+    /// <summary>
+    /// The stomach, used for digesting.
+    /// </summary>
+    Stomach = 1 << 7,
+
+    /// <summary>
+    /// The liver, used for metabolism.
+    /// </summary>
+    Liver = 1 << 8,
+
+    /// <summary>
+    /// The kidneys, used for blood filtering.
+    /// </summary>
+    Kidneys = 1 << 9,
+
+    /// <summary>
+    /// The infection, used for introduce infection/disease into the body.
+    /// </summary>
+    Infection = 1 << 10,
+
+    /// <summary>
+    /// The gland, used to isolate various substances.
+    /// </summary>
+    Gland = 1 << 11,
+
+    Specific = 1 << 12,
+
+    /// <summary>
+    /// The core, used for the metabolization of reagents, is also the center of the nervous system.
+    /// </summary>
+    Core = Brain | Heart | Stomach | Liver | Kidneys
+}
+
+[DataDefinition, Serializable, NetSerializable]
+public sealed partial class OrganSlot
+{
+    public OrganSlot() { }
+
+    public OrganSlot(OrganSlot other)
+    {
+        CopyFrom(other);
+    }
+
+    public OrganSlot(OrganType type, EntProtoId? startingOrgan)
+    {
+        Type = type;
+        StartingOrgan = startingOrgan;
+    }
+
+    [DataField]
+    public OrganType Type = OrganType.None;
+
+    [DataField(readOnly: true)]
+    public EntProtoId? StartingOrgan;
+
+    [ViewVariables, NonSerialized]
+    public ContainerSlot? ContainerSlot;
+
+    public string? Id => ContainerSlot?.ID;
+    public bool HasOrgan => ContainerSlot?.ContainedEntity != null;
+    public EntityUid? OrganUid => ContainerSlot?.ContainedEntity;
+
+    public void CopyFrom(OrganSlot other)
+    {
+        Type = other.Type;
+        StartingOrgan = other.StartingOrgan;
+    }
+}
diff --git a/Content.Shared/_White/Body/Organs/Metabolizer/MetabolizerComponent.cs b/Content.Shared/_White/Body/Organs/Metabolizer/MetabolizerComponent.cs
new file mode 100644
index 00000000000..377b9fb8938
--- /dev/null
+++ b/Content.Shared/_White/Body/Organs/Metabolizer/MetabolizerComponent.cs
@@ -0,0 +1,112 @@
+using Content.Shared._White.Body.Prototypes;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Organs.Metabolizer;
+
+/// <summary>
+/// Handles metabolizing various reagents with given effects.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MetabolizerComponent : Component
+{
+    /// <summary>
+    /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on curent organ health.
+    /// </summary>
+    [DataField]
+    public float UpdateIntervalHealthMultiplier = 1f;
+
+    /// <summary>
+    /// Multiplier applied to <see cref="UpdateInterval"/> for adjusting based on metabolic rate multiplier.
+    /// </summary>
+    [DataField]
+    public float UpdateIntervalMultiplier = 1f;
+
+    /// <summary>
+    /// List of metabolizer types that this organ is. Ex. Human, Slime, Felinid, w/e.
+    /// </summary>
+    [DataField]
+    public HashSet<ProtoId<MetabolizerTypePrototype>> Types = new();
+
+    /// <summary>
+    /// A list of metabolism stages that this metabolizer will act on, in order of precedence.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<MetabolismStagePrototype>, MetabolismStageEntry> Stages = new();
+
+    /// <summary>
+    /// How many reagents can this metabolizer process at once?
+    /// Used to nerf 'stacked poisons' where having 5+ different poisons in a syringe, even at low
+    /// quantity, would be much better than just one poison acting.
+    /// </summary>
+    [DataField]
+    public int MaxReagentsProcessable = 3;
+
+    /// <summary>
+    /// How often to metabolize reagents.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+
+    [ViewVariables]
+    public bool Enable;
+
+    [ViewVariables]
+    public EntityUid? Body;
+
+    /// <summary>
+    /// The next time that reagents will be metabolized.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan NextUpdate;
+
+    /// <summary>
+    /// Adjusted update interval based off of the multiplier value.
+    /// </summary>
+    [ViewVariables]
+    public TimeSpan AdjustedUpdateInterval => UpdateInterval * UpdateIntervalMultiplier * UpdateIntervalHealthMultiplier;
+}
+
+[DataDefinition]
+public sealed partial class MetabolismStageEntry
+{
+    /// <summary>
+    /// When true, this solution will be metabolized entirely instead of at a certain rate
+    /// </summary>
+    [DataField]
+    public bool MetabolizeAll;
+
+    /// <summary>
+    /// Does this component use a solution on its parent entity (the body) or itself?
+    /// </summary>
+    /// <remarks>
+    /// Most things will use the parent entity (bloodstream).
+    /// </remarks>
+    [DataField]
+    public bool SolutionOnBody = true;
+
+    /// <summary>
+    /// The percentage of transferred reagents that actually make it to the next step in metabolism if they don't have explicit metabolites
+    /// </summary>
+    [DataField]
+    public FixedPoint2 TransferEfficacy = 1;
+
+    /// <summary>
+    /// Reagents transferred by this metabolizer will transfer at this rate if they don't have a metabolism
+    /// </summary>
+    [DataField]
+    public FixedPoint2 TransferRate = 0.25;
+
+    /// <summary>
+    /// From which solution will this metabolizer attempt to metabolize chemicals?
+    /// </summary>
+    [DataField(required: true)]
+    public string SolutionName;
+
+    [ViewVariables]
+    public Entity<SolutionComponent>? Solution;
+
+    [ViewVariables]
+    public EntityUid? SolutionOwner;
+}
diff --git a/Content.Shared/_White/Body/Organs/Metabolizer/SharedMetabolizerSystem.cs b/Content.Shared/_White/Body/Organs/Metabolizer/SharedMetabolizerSystem.cs
new file mode 100644
index 00000000000..77108673fad
--- /dev/null
+++ b/Content.Shared/_White/Body/Organs/Metabolizer/SharedMetabolizerSystem.cs
@@ -0,0 +1,58 @@
+namespace Content.Shared._White.Body.Organs.Metabolizer;
+
+public abstract class SharedMetabolizerSystem : EntitySystem
+{
+    /// <summary>
+    /// Updates the metabolic rate for a given entity,
+    /// Raises to retrieve the base rate, to find the active multiplier, and then to update relevant components based on these results.
+    /// </summary>
+    /// <param name="uid"></param>
+    public void UpdateMetabolicRate(EntityUid uid)
+    {
+        var getRateEv = new GetMetabolicRateEvent();
+        RaiseLocalEvent(uid, ref getRateEv);
+
+        var getMultiplierEv = new GetMetabolicMultiplierEvent(getRateEv.Rate);
+        RaiseLocalEvent(uid, ref getMultiplierEv);
+
+        var applyEv = new ApplyMetabolicRateEvent(getMultiplierEv.Multiplier);
+        RaiseLocalEvent(uid, ref applyEv);
+    }
+}
+
+/// <summary>
+/// Raised on an entity to determine their metabolic rate.
+/// </summary>
+[ByRefEvent]
+public record struct GetMetabolicRateEvent(float Rate = 0f)
+{
+    /// <summary>
+    /// What the metabolism's rate.
+    /// </summary>
+    public float Rate = Rate;
+}
+
+/// <summary>
+/// Raised on an entity to determine their metabolic multiplier.
+/// </summary>
+[ByRefEvent]
+public record struct GetMetabolicMultiplierEvent(float Multiplier = 1f)
+{
+    /// <summary>
+    /// What the metabolism's rate will be multiplied by.
+    /// </summary>
+    public float Multiplier = Multiplier;
+}
+
+/// <summary>
+/// Raised on an entity to apply their metabolic multiplier to relevant systems.
+/// Note that you should be storing this value as to not accrue precision errors when it's modified.
+/// </summary>
+[ByRefEvent]
+public readonly record struct ApplyMetabolicRateEvent(float Rate)
+{
+    /// <summary>
+    /// What the metabolism's rate.
+    /// </summary>
+    public readonly float Rate = Rate;
+}
diff --git a/Content.Shared/_White/Body/Pain/Components/PainThresholdsComponent.cs b/Content.Shared/_White/Body/Pain/Components/PainThresholdsComponent.cs
new file mode 100644
index 00000000000..f4f032a2edc
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Components/PainThresholdsComponent.cs
@@ -0,0 +1,101 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared.Alert;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Pain.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
+public sealed partial class PainThresholdsComponent : Component
+{
+    /// <summary>
+    /// The health alert that should be displayed for player controlled entities.
+    /// Used for alternate health alerts (silicons, for example)
+    /// </summary>
+    [DataField]
+    public Dictionary<MobState, ProtoId<AlertPrototype>> StateAlertDict = new()
+    {
+        {MobState.Alive, "HumanHealth"},
+        {MobState.Critical, "HumanCrit"},
+        {MobState.SoftCritical, "HumanCrit"},
+        {MobState.Dead, "HumanDead"},
+    };
+
+    [DataField]
+    public ProtoId<AlertCategoryPrototype> AlertCategory = "Health";
+
+    [DataField]
+    public ProtoId<AlertPrototype> BodyStatusAlert = "BodyStatus";
+
+    /// <summary>
+    /// The mob state to apply depending on the amount of pain. The highest threshold is selected.
+    /// </summary>
+    [DataField(required: true)]
+    public SortedDictionary<FixedPoint2, MobState> MobStateThresholds;
+
+    /// <summary>
+    /// Effects applied to the entity at the appropriate level of pain.
+    /// </summary>
+    [DataField(serverOnly: true)] // TODO: Remove serverOnly when we move EntityEffect to shared
+    public Dictionary<PainLevel, List<EntityEffect>> PainEffects = new();
+
+    /// <summary>
+    /// The pain level to apply depending on the amount of pain. the highest threshold is selected.
+    /// </summary>
+    [DataField(required: true)]
+    public SortedDictionary<FixedPoint2, PainLevel> PainLevelThresholds;
+
+    [ViewVariables, AutoNetworkedField]
+    public Dictionary<BodyPartType, PainLevel> PainStatus = new()
+    {
+        { BodyPartType.Head, PainLevel.Zero },
+        { BodyPartType.Chest, PainLevel.Zero },
+        { BodyPartType.Groin, PainLevel.Zero },
+        { BodyPartType.LeftArm, PainLevel.Zero },
+        { BodyPartType.LeftHand, PainLevel.Zero },
+        { BodyPartType.RightArm, PainLevel.Zero },
+        { BodyPartType.RightHand, PainLevel.Zero },
+        { BodyPartType.LeftLeg, PainLevel.Zero },
+        { BodyPartType.LeftFoot, PainLevel.Zero },
+        { BodyPartType.RightLeg, PainLevel.Zero },
+        { BodyPartType.RightFoot, PainLevel.Zero },
+    };
+
+    [ViewVariables, AutoNetworkedField]
+    public MobState CurrentMobStateThreshold = MobState.Alive;
+
+    [ViewVariables, AutoNetworkedField]
+    public PainLevel CurrentPainLevelThreshold = PainLevel.Zero;
+}
+
+[Serializable, NetSerializable]
+public enum PainLevel : byte
+{
+    None,
+    Zero,
+    Mild,
+    Moderate,
+    Severe,
+    Excruciating,
+    Mortal,
+}
+
+[NetSerializable, Serializable]
+public enum BodyStatusVisualLayers : byte
+{
+    Head,
+    Chest,
+    Groin,
+    LeftArm,
+    LeftHand,
+    RightArm,
+    RightHand,
+    LeftLeg,
+    LeftFoot,
+    RightLeg,
+    RightFoot,
+}
diff --git a/Content.Shared/_White/Body/Pain/Components/PainfulBodyPartComponent.cs b/Content.Shared/_White/Body/Pain/Components/PainfulBodyPartComponent.cs
new file mode 100644
index 00000000000..508f01263e8
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Components/PainfulBodyPartComponent.cs
@@ -0,0 +1,40 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Body.Pain.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PainfulBodyPartComponent : Component
+{
+    /// <summary>
+    /// The maximum amount of pain.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 MaximumPain = 100;
+
+    /// <summary>
+    /// The current amount of pain.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 Pain = FixedPoint2.Zero;
+
+    /// <summary>
+    /// The current level of pain in this body part.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public PainLevel PainLevel = PainLevel.Zero;
+
+    /// <summary>
+    /// Threshold values for determining the current pain level of a body part depending on pain.
+    /// </summary>
+    [DataField]
+    public SortedDictionary<FixedPoint2, PainLevel> Thresholds = new()
+    {
+        {0, PainLevel.Zero},
+        {10, PainLevel.Mild},
+        {25, PainLevel.Moderate},
+        {50, PainLevel.Severe},
+        {80, PainLevel.Excruciating},
+        {95, PainLevel.Mortal},
+    };
+}
diff --git a/Content.Shared/_White/Body/Pain/Components/PainfulComponent.cs b/Content.Shared/_White/Body/Pain/Components/PainfulComponent.cs
new file mode 100644
index 00000000000..19412b496a8
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Components/PainfulComponent.cs
@@ -0,0 +1,64 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Pain.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PainfulComponent : Component
+{
+    /// <summary>
+    /// The current amount of pain.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 Pain = FixedPoint2.Zero;
+
+    /// <summary>
+    /// A multiplier that is applied to the current pain level.
+    /// </summary>
+    [DataField]
+    public float PainMultiplier = 1f;
+
+    /// <summary>
+    /// The multiplier applied to the current update intervals.
+    /// </summary>
+    [DataField]
+    public float UpdateIntervalMultiplier = 1f;
+
+    /// <summary>
+    /// How often the pain is recalculated.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// How fast the pain can increase per second
+    /// </summary>
+    [DataField]
+    public float MaxPainIncreasePerSecond = 36f;
+
+    /// <summary>
+    /// How fast the pain can decrease per second
+    /// </summary>
+    [DataField]
+    public float MaxPainDecreasePerSecond = 12f;
+
+    [ViewVariables]
+    public FixedPoint2 CurrentPain => Pain * PainMultiplier;
+
+    [ViewVariables]
+    public TimeSpan CurrentUpdateInterval => UpdateInterval * UpdateIntervalMultiplier;
+
+    [ViewVariables]
+    public TimeSpan LastUpdate = TimeSpan.Zero;
+}
+
+[Serializable, NetSerializable]
+public sealed class PainfulComponentState(PainfulComponent component) : ComponentState
+{
+    public readonly FixedPoint2 Pain = component.Pain;
+
+    public readonly float PainMultiplier = component.PainMultiplier;
+
+    public readonly TimeSpan LastUpdate = component.LastUpdate;
+}
diff --git a/Content.Shared/_White/Body/Pain/Components/PainfulWoundComponent.cs b/Content.Shared/_White/Body/Pain/Components/PainfulWoundComponent.cs
new file mode 100644
index 00000000000..53a169cd0c6
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Components/PainfulWoundComponent.cs
@@ -0,0 +1,29 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Body.Pain.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PainfulWoundComponent : Component
+{
+    /// <summary>
+    /// How much pain does a wound cause, regardless of the amount of damage.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 Pain = FixedPoint2.Zero;
+
+    /// <summary>
+    /// Coefficients for damage to pain.
+    /// </summary>
+    [DataField(required: true)]
+    public float PainCoefficients;
+
+    /// <summary>
+    /// Coefficients for damage to initial pain.
+    /// </summary>
+    [DataField(required: true)]
+    public float FreshPainCoefficients;
+
+    [DataField]
+    public double FreshPainDecreasePerSecond = 0.15d;
+}
diff --git a/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.BodyPart.cs b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.BodyPart.cs
new file mode 100644
index 00000000000..fe6bb31d6bd
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.BodyPart.cs
@@ -0,0 +1,30 @@
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Threshold;
+using Content.Shared.FixedPoint;
+
+namespace Content.Shared._White.Body.Pain.Systems;
+
+public abstract partial class SharedPainSystem
+{
+    private void InitializeBodyPart() => SubscribeLocalEvent<PainfulBodyPartComponent, BodyPartRelayedEvent<GetPainEvent>>(OnBodyPartGetPain);
+
+    #region Event Handling
+
+    private void OnBodyPartGetPain(Entity<PainfulBodyPartComponent> painfulBodyPart, ref BodyPartRelayedEvent<GetPainEvent> args)
+    {
+        painfulBodyPart.Comp.Pain = FixedPoint2.Zero;
+        foreach (var wound in _wound.GetWounds<PainfulWoundComponent>(painfulBodyPart, scar: true))
+            painfulBodyPart.Comp.Pain += GetWoundPain(wound.AsNullable());
+
+        painfulBodyPart.Comp.Pain = FixedPoint2.Clamp(painfulBodyPart.Comp.Pain, FixedPoint2.Zero, painfulBodyPart.Comp.MaximumPain);
+        painfulBodyPart.Comp.PainLevel = painfulBodyPart.Comp.Thresholds.HighestMatch(painfulBodyPart.Comp.Pain) ?? PainLevel.Zero;
+        Dirty(painfulBodyPart);
+
+        SetPainStatus(args.Args.Painful.Owner, painfulBodyPart.Owner, painfulBodyPart.Comp.PainLevel);
+
+        args.Args = args.Args with { Pain = args.Args.Pain + painfulBodyPart.Comp.Pain, };
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Painful.cs b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Painful.cs
new file mode 100644
index 00000000000..75225a80e21
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Painful.cs
@@ -0,0 +1,86 @@
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared.FixedPoint;
+using Content.Shared.Rejuvenate;
+
+namespace Content.Shared._White.Body.Pain.Systems;
+
+public abstract partial class SharedPainSystem
+{
+    private void InitializePainful()
+    {
+        SubscribeLocalEvent<PainfulComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<PainfulComponent, RejuvenateEvent>(OnRejuvenate);
+        SubscribeLocalEvent<PainfulComponent, WoundableDamageChangedEvent>(OnWoundableDamageChange);
+    }
+
+    #region Event Handling
+
+    private void OnMapInit(Entity<PainfulComponent> painful, ref MapInitEvent args) =>
+        painful.Comp.LastUpdate = GameTiming.CurTime;
+
+    private void OnRejuvenate(Entity<PainfulComponent> painful, ref RejuvenateEvent args)
+    {
+        RaiseLocalEvent(painful, new AfterPainChangedEvent(painful, 0, painful.Comp.CurrentPain));
+        painful.Comp.Pain = 0;
+        Dirty(painful);
+    }
+
+    private void OnWoundableDamageChange(Entity<PainfulComponent> painful, ref WoundableDamageChangedEvent args) =>
+        UpdatePain(painful.AsNullable(), false);
+
+    #endregion
+
+    #region Private API
+
+    protected void UpdatePain(Entity<PainfulComponent?> painful, bool sync = true)
+    {
+        if (!Resolve(painful, ref painful.Comp) || GameTiming is { IsFirstTimePredicted: false, InPrediction: true, })
+            return;
+
+        var delta = GameTiming.CurTime - painful.Comp.LastUpdate;
+        painful.Comp.LastUpdate = GameTiming.CurTime;
+
+        var getPain = new GetPainEvent((painful, painful.Comp), FixedPoint2.Zero);
+        RaiseLocalEvent(painful, ref getPain);
+
+        var oldPain = painful.Comp.CurrentPain;
+
+        if (painful.Comp.Pain < getPain.Pain)
+        {
+            var maxIncrease = delta.TotalSeconds * painful.Comp.MaxPainIncreasePerSecond;
+            painful.Comp.Pain += FixedPoint2.Min(getPain.Pain - painful.Comp.Pain, maxIncrease);
+        }
+
+        if (painful.Comp.Pain > getPain.Pain)
+        {
+            var maxDecrease = delta.TotalSeconds * painful.Comp.MaxPainDecreasePerSecond;
+            painful.Comp.Pain -= FixedPoint2.Min(painful.Comp.Pain - getPain.Pain, maxDecrease);
+        }
+
+        if (painful.Comp.Pain < 0)
+            painful.Comp.Pain = 0;
+
+        if (painful.Comp.CurrentPain == oldPain)
+            return;
+
+        RaiseLocalEvent(painful, new AfterPainChangedEvent(painful, painful.Comp.CurrentPain, oldPain), true);
+
+        if (sync)
+            Dirty(painful);
+    }
+
+    #endregion
+
+    #region Public API
+
+    public FixedPoint2 GetCurrentPain(Entity<PainfulComponent?> painful)
+    {
+        if (!Resolve(painful, ref painful.Comp))
+            return FixedPoint2.Zero;
+
+        return painful.Comp.CurrentPain;
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Thresholds.cs b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Thresholds.cs
new file mode 100644
index 00000000000..4373ca432e2
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Thresholds.cs
@@ -0,0 +1,207 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Threshold;
+using Content.Shared.EntityEffects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Systems;
+
+namespace Content.Shared._White.Body.Pain.Systems;
+
+public abstract partial class SharedPainSystem
+{
+    private void InitializeThresholds()
+    {
+        SubscribeLocalEvent<PainThresholdsComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<PainThresholdsComponent, ComponentShutdown>(OnShutdown);
+
+        SubscribeLocalEvent<PainThresholdsComponent, UpdateMobStateEvent>(OnUpdateMobState);
+        SubscribeLocalEvent<PainThresholdsComponent, MobStateChangedEvent>(OnMobStateChanged);
+
+        SubscribeLocalEvent<PainThresholdsComponent, AfterPainChangedEvent>(OnAfterPainChanged);
+    }
+
+    #region Event Handling
+
+    private void OnStartup(Entity<PainThresholdsComponent> painThresholds, ref ComponentStartup args)
+    {
+        var currentPain = GetCurrentPain(painThresholds.Owner);
+
+        _alerts.ShowAlert(painThresholds, painThresholds.Comp.BodyStatusAlert);
+
+        ChekMobStateThresholds(painThresholds.AsNullable(), currentPain);
+        ChekPainLevelThresholds(painThresholds.AsNullable(), currentPain);
+        UpdateAlerts(painThresholds.AsNullable(), currentPain);
+    }
+
+    private void OnShutdown(Entity<PainThresholdsComponent> painThresholds, ref ComponentShutdown args)
+    {
+        _alerts.ClearAlertCategory(painThresholds, painThresholds.Comp.AlertCategory);
+        _alerts.ClearAlert(painThresholds, painThresholds.Comp.BodyStatusAlert);
+    }
+
+    private void OnUpdateMobState(Entity<PainThresholdsComponent> painThresholds, ref UpdateMobStateEvent args)
+    {
+        args.State = painThresholds.Comp.CurrentMobStateThreshold;
+    }
+
+    private void OnMobStateChanged(Entity<PainThresholdsComponent> painThresholds, ref MobStateChangedEvent args)
+    {
+        var currentPain = GetCurrentPain(painThresholds.Owner);
+        UpdateAlerts(painThresholds.Owner, currentPain);
+    }
+
+    private void OnAfterPainChanged(Entity<PainThresholdsComponent> painThresholds, ref AfterPainChangedEvent args)
+    {
+        ChekMobStateThresholds(painThresholds.AsNullable(), args.CurrentPain);
+        ChekPainLevelThresholds(painThresholds.AsNullable(), args.CurrentPain);
+        UpdateAlerts(painThresholds.AsNullable(), args.CurrentPain);
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void ChekMobStateThresholds(Entity<PainThresholdsComponent?> painThresholds, FixedPoint2 currentPain)
+    {
+        if (!Resolve(painThresholds, ref painThresholds.Comp)
+            || painThresholds.Comp.CurrentMobStateThreshold == MobState.Dead)
+            return;
+
+        var mobState = painThresholds.Comp.MobStateThresholds.HighestMatch(currentPain) ?? MobState.Alive;
+        if (mobState == painThresholds.Comp.CurrentMobStateThreshold)
+            return;
+
+        painThresholds.Comp.CurrentMobStateThreshold = mobState;
+        DirtyField(painThresholds, nameof(PainThresholdsComponent.CurrentMobStateThreshold));
+
+        _mobState.UpdateMobState(painThresholds);
+    }
+
+    private void ChekPainLevelThresholds(Entity<PainThresholdsComponent?> painThresholds, FixedPoint2 currentPain)
+    {
+        if (!Resolve(painThresholds, ref painThresholds.Comp)
+            || painThresholds.Comp.CurrentMobStateThreshold == MobState.Dead)
+            return;
+
+        var painLevel = painThresholds.Comp.PainLevelThresholds.HighestMatch(currentPain) ?? PainLevel.Zero;
+        if (painLevel == painThresholds.Comp.CurrentPainLevelThreshold)
+            return;
+
+        painThresholds.Comp.CurrentPainLevelThreshold = painLevel;
+        DirtyField(painThresholds, nameof(PainThresholdsComponent.CurrentPainLevelThreshold));
+
+        if (!painThresholds.Comp.PainEffects.TryGetValue(painLevel, out var effects))
+            return;
+
+        var effectsArgs = new EntityEffectBaseArgs(painThresholds, EntityManager);
+        foreach (var effect in effects)
+            effect.Effect(effectsArgs);
+    }
+
+    private void UpdateAlerts(Entity<PainThresholdsComponent?> painThresholds, FixedPoint2 currentPain)
+    {
+        if (!Resolve(painThresholds, ref painThresholds.Comp))
+            return;
+
+        if (!painThresholds.Comp.StateAlertDict.TryGetValue(painThresholds.Comp.CurrentMobStateThreshold, out var currentAlert))
+        {
+            Log.Error($"No alert alert for mob state {painThresholds.Comp.CurrentMobStateThreshold} for entity {ToPrettyString(painThresholds)}");
+            return;
+        }
+
+        if (!_alerts.TryGet(currentAlert, out var alertPrototype))
+        {
+            Log.Error($"Invalid alert type {currentAlert}");
+            return;
+        }
+
+        if (alertPrototype.SupportsSeverity)
+        {
+            var severity = _alerts.GetMinSeverity(currentAlert);
+            if (TryGetNextState(painThresholds.Comp.MobStateThresholds, painThresholds.Comp.CurrentMobStateThreshold, out var nextState)
+                && TryGetThresholdFromState(painThresholds.Comp.MobStateThresholds, nextState.Value, out var threshold)
+                && threshold != 0)
+            {
+                threshold = FixedPoint2.Clamp(currentPain / threshold.Value, 0, 1);
+
+                severity = (short) MathF.Round(
+                    MathHelper.Lerp(
+                        _alerts.GetMinSeverity(currentAlert),
+                        _alerts.GetMaxSeverity(currentAlert),
+                        threshold.Value.Float()));
+            }
+
+            _alerts.ShowAlert(painThresholds, currentAlert, severity);
+        }
+        else
+        {
+            _alerts.ShowAlert(painThresholds, currentAlert);
+        }
+    }
+
+    private void SetPainStatus(Entity<PainThresholdsComponent?> painThresholds, Entity<BodyPartComponent?> bodyPart, PainLevel painLevel)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return;
+
+        SetPainStatus(painThresholds, bodyPart.Comp.Type, painLevel);
+    }
+
+    private void SetPainStatus(Entity<PainThresholdsComponent?> painThresholds, BodyPartType bodyPartType, PainLevel painLevel)
+    {
+        if (!Resolve(painThresholds, ref painThresholds.Comp)
+            || !painThresholds.Comp.PainStatus.ContainsKey(bodyPartType))
+            return;
+
+        painThresholds.Comp.PainStatus[bodyPartType] = painLevel;
+        Dirty(painThresholds);
+    }
+
+    private MobState? GetNextState(SortedDictionary<FixedPoint2, MobState> thresholds, MobState currentState)
+    {
+        foreach (var state in thresholds.Values)
+        {
+            if (state <= currentState)
+                continue;
+
+            return state;
+        }
+
+        return null;
+    }
+
+    private FixedPoint2? GetThresholdFromState(SortedDictionary<FixedPoint2, MobState> thresholds, MobState currentState)
+    {
+        foreach (var (threshold, state) in thresholds)
+        {
+            if (state == currentState)
+                return threshold;
+        }
+
+        return null;
+    }
+
+    #endregion
+
+    #region Public API
+
+    public bool TryGetNextState(SortedDictionary<FixedPoint2, MobState> thresholds, MobState currentState, [NotNullWhen(true)] out MobState? state)
+    {
+        state = GetNextState(thresholds, currentState);
+        return state.HasValue;
+    }
+
+    public bool TryGetThresholdFromState(
+        SortedDictionary<FixedPoint2, MobState> thresholds,
+        MobState currentState,
+        [NotNullWhen(true)] out FixedPoint2? threshold
+    )
+    {
+        threshold = GetThresholdFromState(thresholds, currentState);
+        return threshold.HasValue;
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Wound.cs b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Wound.cs
new file mode 100644
index 00000000000..8b81a7d9834
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.Wound.cs
@@ -0,0 +1,22 @@
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared.FixedPoint;
+
+namespace Content.Shared._White.Body.Pain.Systems;
+
+public abstract partial class SharedPainSystem
+{
+    private FixedPoint2 GetWoundPain(Entity<WoundComponent?, PainfulWoundComponent?> wound)
+    {
+        if (!Resolve(wound, ref wound.Comp1, ref wound.Comp2))
+            return FixedPoint2.Zero;
+
+        var lastingPain = wound.Comp2.PainCoefficients * wound.Comp1.DamageAmount;
+        var freshPain = wound.Comp2.FreshPainCoefficients * wound.Comp1.DamageAmount;
+
+        var delta = GameTiming.CurTime - wound.Comp1.WoundedAt;
+        freshPain = FixedPoint2.Max(0, freshPain - delta.TotalSeconds * wound.Comp2.FreshPainDecreasePerSecond);
+
+        return lastingPain + freshPain + wound.Comp2.Pain;
+    }
+}
diff --git a/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.cs b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.cs
new file mode 100644
index 00000000000..d4f92617ff5
--- /dev/null
+++ b/Content.Shared/_White/Body/Pain/Systems/SharedPainSystem.cs
@@ -0,0 +1,37 @@
+using Content.Shared._White.Body.Pain.Components;
+using Content.Shared._White.Body.Wounds.Systems;
+using Content.Shared.Alert;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._White.Body.Pain.Systems;
+
+public abstract partial class SharedPainSystem : EntitySystem
+{
+    [Dependency] protected readonly IGameTiming GameTiming = default!;
+
+    [Dependency] private readonly AlertsSystem _alerts = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedWoundSystem _wound = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeBodyPart();
+        InitializePainful();
+        InitializeThresholds();
+    }
+}
+
+/// <summary>
+/// Raised on an entity after its pain has changed.
+/// </summary>
+public record struct AfterPainChangedEvent(EntityUid Target, FixedPoint2 CurrentPain, FixedPoint2 OldPain);
+
+/// <summary>
+/// Raised on an entity to get the sum total of pain.
+/// </summary>
+[ByRefEvent]
+public record struct GetPainEvent(Entity<PainfulComponent> Painful, FixedPoint2 Pain);
diff --git a/Content.Shared/_White/Body/Prototypes/BodyPrototype.cs b/Content.Shared/_White/Body/Prototypes/BodyPrototype.cs
new file mode 100644
index 00000000000..1a8b56a1842
--- /dev/null
+++ b/Content.Shared/_White/Body/Prototypes/BodyPrototype.cs
@@ -0,0 +1,29 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Prototypes;
+
+[Prototype]
+public sealed partial class BodyPrototype : IPrototype
+{
+    [IdDataField] public string ID { get; } = default!;
+
+    [DataField]
+    public string Root { get; private set; } = string.Empty;
+
+    [DataField]
+    public Dictionary<string, BodyPartSlot> BodyParts { get; private set; } = new();
+
+    [DataField]
+    public Dictionary<string, OrganSlot> Organs { get; private set; } = new();
+
+    private BodyPrototype() { }
+
+    public BodyPrototype(string id, string root, Dictionary<string, BodyPartSlot> bodyParts, Dictionary<string, OrganSlot> organs)
+    {
+        ID = id;
+        Root = root;
+        BodyParts = bodyParts;
+        Organs = organs;
+    }
+}
diff --git a/Content.Shared/_White/Body/Prototypes/BodyPrototypeSerializer.cs b/Content.Shared/_White/Body/Prototypes/BodyPrototypeSerializer.cs
new file mode 100644
index 00000000000..43513cb3d12
--- /dev/null
+++ b/Content.Shared/_White/Body/Prototypes/BodyPrototypeSerializer.cs
@@ -0,0 +1,226 @@
+using System.Linq;
+using Content.Shared._White.Body.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Markdown.Mapping;
+using Robust.Shared.Serialization.Markdown.Sequence;
+using Robust.Shared.Serialization.Markdown.Validation;
+using Robust.Shared.Serialization.Markdown.Value;
+using Robust.Shared.Serialization.TypeSerializers.Interfaces;
+
+namespace Content.Shared._White.Body.Prototypes;
+
+[TypeSerializer]
+public sealed class BodyPrototypeSerializer : ITypeReader<BodyPrototype, MappingDataNode>
+{
+    public ValidationNode Validate(
+        ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        ISerializationContext? context = null
+        )
+    {
+        var nodes = new List<ValidationNode>();
+        var prototypes = dependencies.Resolve<IPrototypeManager>();
+
+        if (node.TryGet("bodyParts", out MappingDataNode? bodyPartsNode) && !bodyPartsNode.IsEmpty)
+        {
+            if (!node.TryGet("root", out ValueDataNode? root))
+            {
+                nodes.Add(new ErrorNode(node, $"No root value data node found"));
+                return new ValidatedSequenceNode(nodes);
+            }
+
+            if (!bodyPartsNode.TryGet(root.Value, out MappingDataNode? _))
+            {
+                nodes.Add(new ErrorNode(bodyPartsNode, $"No slot found with id {root.Value}"));
+                return new ValidatedSequenceNode(nodes);
+            }
+
+            foreach (var (_, bodyPartValue) in bodyPartsNode)
+            {
+                if (bodyPartValue is not MappingDataNode bodyPartNode)
+                {
+                    nodes.Add(new ErrorNode(bodyPartValue, $"Slot is not a mapping data node"));
+                    continue;
+                }
+
+                if (bodyPartNode.TryGet<ValueDataNode>("type", out var bodyPartTypeNode)
+                    && !Enum.TryParse(bodyPartTypeNode.Value, out BodyPartType _))
+                    nodes.Add(new ErrorNode(bodyPartValue, $"Can't parse {bodyPartTypeNode.Value} to {typeof(BodyPartType)}"));
+
+                if (bodyPartNode.TryGet("connections", out SequenceDataNode? connectionsNode))
+                {
+                    foreach (var connectionValue in connectionsNode)
+                    {
+                        if (connectionValue is not ValueDataNode connectionNode)
+                        {
+                            nodes.Add(new ErrorNode(connectionValue, $"Connection is not a value data node"));
+                            continue;
+                        }
+
+                        if (!bodyPartsNode.TryGet(connectionNode.Value, out MappingDataNode? _))
+                            nodes.Add(new ErrorNode(connectionValue, $"No slot found with id {connectionNode.Value}"));
+                    }
+                }
+
+                if (bodyPartNode.TryGet("bones", out MappingDataNode? bonesNode))
+                {
+                    foreach (var (_, boneValue) in bonesNode)
+                    {
+                        if (boneValue is not MappingDataNode bone)
+                        {
+                            nodes.Add(new ErrorNode(boneValue, $"Value is not a value data node"));
+                            continue;
+                        }
+
+                        if (bone.TryGet("organs", out MappingDataNode? boneOrgansNode))
+                            nodes.Add(ValidateOrgan(boneOrgansNode, prototypes));
+
+                        if (bone.TryGet("startingBone", out ValueDataNode? startingBone)
+                            && !prototypes.HasIndex(startingBone.Value))
+                            nodes.Add(new ErrorNode(boneValue, $"No bone entity prototype found with id {startingBone.Value}"));
+                    }
+                }
+
+                if (bodyPartNode.TryGet("organs", out MappingDataNode? bodyPartOrgansNode))
+                    nodes.Add(ValidateOrgan(bodyPartOrgansNode, prototypes));
+
+                if (bodyPartNode.TryGet("startingBodyPart", out ValueDataNode? startingBodyPart)
+                    && !prototypes.HasIndex(startingBodyPart.Value))
+                    nodes.Add(new ErrorNode(bodyPartValue, $"No bone entity prototype found with id {startingBodyPart.Value}"));
+            }
+        }
+
+        if (node.TryGet("organs", out MappingDataNode? organsNode))
+            nodes.Add(ValidateOrgan(organsNode, prototypes));
+
+        return new ValidatedSequenceNode(nodes);
+    }
+
+    private static ValidationNode ValidateOrgan(MappingDataNode organsNode, IPrototypeManager prototypes)
+    {
+        var nodes = new List<ValidationNode>();
+
+        foreach (var (_, organValue) in organsNode)
+        {
+            if (organValue is not MappingDataNode organNode)
+            {
+                nodes.Add(new ErrorNode(organValue, $"Value is not a value data node"));
+                continue;
+            }
+
+            if (organNode.TryGet<ValueDataNode>("type", out var organTypeNode) && !Enum.TryParse(organTypeNode.Value, out OrganType _))
+                nodes.Add(new ErrorNode(organValue, $"Can't parse {organTypeNode.Value} to {typeof(OrganType)}"));
+
+            if (organNode.TryGet("startingOrgan", out ValueDataNode? startingOrgan) && !prototypes.HasIndex(startingOrgan.Value))
+                nodes.Add(new ErrorNode(organValue, $"No organ entity prototype found with id {startingOrgan.Value}"));
+        }
+
+        var validation = new ValidatedSequenceNode(nodes);
+        return validation;
+    }
+
+    public BodyPrototype Read(
+        ISerializationManager serializationManager,
+        MappingDataNode node,
+        IDependencyCollection dependencies,
+        SerializationHookContext hookCtx,
+        ISerializationContext? context = null,
+        ISerializationManager.InstantiationDelegate<BodyPrototype>? instanceProvider = null
+        )
+    {
+        var id = node.Get<ValueDataNode>("id").Value;
+        var root = string.Empty;
+        var bodyParts = new Dictionary<string, BodyPartSlot>();
+        var organs = new Dictionary<string, OrganSlot>();
+
+        if (node.TryGet("bodyParts", out MappingDataNode? bodyPartsNode))
+        {
+            root = node.Get<ValueDataNode>("root").Value;
+            foreach (var (bodyPartId, bodyPartValue) in bodyPartsNode)
+            {
+                var bodyPartNode = (MappingDataNode) bodyPartValue;
+
+                var bodyPartType = BodyPartType.None;
+                if (bodyPartNode.TryGet<ValueDataNode>("type", out var bodyPartTypeNode))
+                    Enum.TryParse(bodyPartTypeNode.Value, out bodyPartType);
+
+                string? startingBodyPart = null;
+                if (bodyPartNode.TryGet<ValueDataNode>("startingBodyPart", out var value))
+                    startingBodyPart = value.Value;
+
+                HashSet<string> connections = new();
+                if (bodyPartNode.TryGet("connections", out SequenceDataNode? connectionsNode))
+                {
+                    foreach (var connection in connectionsNode.Cast<ValueDataNode>())
+                        connections.Add(connection.Value);
+                }
+
+                Dictionary<string, BoneSlot> bones = new();
+                if (bodyPartNode.TryGet("bones", out MappingDataNode? bonesNode))
+                {
+                    foreach (var (boneId, boneValue) in bonesNode)
+                    {
+                        var boneNode = (MappingDataNode) boneValue;
+
+                        var boneType = BoneType.None;
+                        if (boneNode.TryGet<ValueDataNode>("type", out var organTypeNode))
+                            Enum.TryParse(organTypeNode.Value, out boneType);
+
+                        var boneOrgans = new Dictionary<string, OrganSlot>();
+                        if (boneNode.TryGet("organs", out MappingDataNode? boneOrgansNode))
+                            boneOrgans = ReadOrgan(boneOrgansNode);
+
+                        string? startingBone = null;
+                        if (boneNode.TryGet<ValueDataNode>("startingBone", out var startingBoneNode))
+                            startingBone = startingBoneNode.Value;
+
+                        bones.Add(boneId, new BoneSlot(boneType, boneOrgans, startingBone));
+                    }
+                }
+
+                Dictionary<string, OrganSlot> bodyPartOrgans = new();
+                if (bodyPartNode.TryGet("organs", out MappingDataNode? bodyPartOrgansNode))
+                    bodyPartOrgans = ReadOrgan(bodyPartOrgansNode);
+
+                var bodyPart = new BodyPartSlot(bodyPartType, connections, bones, bodyPartOrgans, startingBodyPart);
+                bodyParts.Add(bodyPartId, bodyPart);
+            }
+
+            foreach (var (bodyPartsSlotId, bodyPartsSlot) in bodyParts)
+            {
+                foreach (var connection in bodyPartsSlot.Connections.ToList())
+                    bodyParts[connection].Connections.Add(bodyPartsSlotId);
+            }
+        }
+
+        if (node.TryGet("organs", out MappingDataNode? organsNode))
+            organs = ReadOrgan(organsNode);
+
+        return new BodyPrototype(id, root, bodyParts, organs);
+    }
+
+    private Dictionary<string, OrganSlot> ReadOrgan(MappingDataNode organsNode)
+    {
+        var organs = new Dictionary<string, OrganSlot>();
+
+        foreach (var (organKey, organValueNode) in organsNode)
+        {
+            var organNode = (MappingDataNode) organValueNode;
+
+            var organType = OrganType.None;
+            if (organNode.TryGet<ValueDataNode>("type", out var organTypeNode))
+                Enum.TryParse(organTypeNode.Value, out organType);
+
+            string? startingOrgan = null;
+            if (organNode.TryGet<ValueDataNode>("startingOrgan", out var startingOrganNode))
+                startingOrgan = startingOrganNode.Value;
+
+            organs.Add(organKey, new OrganSlot(organType, startingOrgan));
+        }
+
+        return organs;
+    }
+}
diff --git a/Content.Shared/_White/Body/Prototypes/MetabolismStagePrototype.cs b/Content.Shared/_White/Body/Prototypes/MetabolismStagePrototype.cs
new file mode 100644
index 00000000000..163473f6e9d
--- /dev/null
+++ b/Content.Shared/_White/Body/Prototypes/MetabolismStagePrototype.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Prototypes;
+
+[Prototype]
+public sealed partial class MetabolismStagePrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField(required: true)]
+    private LocId Name { get; set; }
+
+    [ViewVariables]
+    public string LocalizedName => Loc.GetString(Name);
+}
diff --git a/Content.Shared/_White/Body/Prototypes/MetabolizerTypePrototype.cs b/Content.Shared/_White/Body/Prototypes/MetabolizerTypePrototype.cs
new file mode 100644
index 00000000000..13067b4c43f
--- /dev/null
+++ b/Content.Shared/_White/Body/Prototypes/MetabolizerTypePrototype.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Prototypes;
+
+[Prototype]
+public sealed partial class MetabolizerTypePrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField(required: true)]
+    private LocId Name { get; set; }
+
+    [ViewVariables]
+    public string LocalizedName => Loc.GetString(Name);
+}
diff --git a/Content.Shared/_White/Body/Systems/SharedBodySystem.Appearance.cs b/Content.Shared/_White/Body/Systems/SharedBodySystem.Appearance.cs
new file mode 100644
index 00000000000..1e0af9a1a74
--- /dev/null
+++ b/Content.Shared/_White/Body/Systems/SharedBodySystem.Appearance.cs
@@ -0,0 +1,291 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Shared._White.Body.Components;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._White.Body.Systems;
+
+public abstract partial class SharedBodySystem
+{
+    private void InitializeAppearance()
+    {
+        SubscribeLocalEvent<BodyAppearanceComponent, BodyPartAddedEvent>(OnBodyPartAdded);
+        SubscribeLocalEvent<BodyAppearanceComponent, BodyPartRemovedEvent>(OnBodyPartRemoved);
+
+        SubscribeLocalEvent<BodyAppearanceComponent, OrganAddedEvent>(OnOrganAdded);
+        SubscribeLocalEvent<BodyAppearanceComponent, OrganRemovedEvent>(OnOrganRemoved);
+    }
+
+    #region Event Handling
+
+    private void OnBodyPartAdded(Entity<BodyAppearanceComponent> bodyAppearance, ref BodyPartAddedEvent args)
+    {
+        if (!TryComp<BodyPartAppearanceComponent>(args.Part, out var bodyPartAppearance))
+            return;
+
+        bodyAppearance.Comp.Layers[bodyPartAppearance.Layer] = bodyPartAppearance.LayerInfo;
+        Dirty(bodyAppearance);
+    }
+
+    protected virtual void OnBodyPartRemoved(Entity<BodyAppearanceComponent> bodyAppearance, ref BodyPartRemovedEvent args)
+    {
+        if (!TryComp<BodyPartAppearanceComponent>(args.Part, out var bodyPartAppearance))
+            return;
+
+        bodyAppearance.Comp.Layers[bodyPartAppearance.Layer] = null;
+        Dirty(bodyAppearance);
+    }
+
+    private void OnOrganAdded(Entity<BodyAppearanceComponent> bodyAppearance, ref OrganAddedEvent args)
+    {
+        if (!TryComp<OrganAppearanceComponent>(args.Organ, out var organAppearance))
+            return;
+
+        bodyAppearance.Comp.Layers[organAppearance.Layer] = organAppearance.LayerInfo;
+        Dirty(bodyAppearance);
+    }
+
+    protected virtual void OnOrganRemoved(Entity<BodyAppearanceComponent> bodyAppearance, ref OrganRemovedEvent args)
+    {
+        if (!TryComp<OrganAppearanceComponent>(args.Organ, out var organAppearance))
+            return;
+
+        bodyAppearance.Comp.Layers[organAppearance.Layer] = null;
+        Dirty(bodyAppearance);
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void SetupBodyPartAppearance(Entity<HumanoidAppearanceComponent> humanoid, Entity<BodyPartComponent?, BodyPartAppearanceComponent?> bodyPart, bool sync = true)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp1) || !Resolve(bodyPart, ref bodyPart.Comp2, false))
+            return;
+
+        bodyPart.Comp2.BodyType = humanoid.Comp.BodyType;
+        bodyPart.Comp2.Color = humanoid.Comp.SkinColor;
+        bodyPart.Comp2.Sex = humanoid.Comp.Sex;
+
+        if (sync)
+            Dirty(bodyPart, bodyPart.Comp2);
+    }
+
+    private void SetupOrganAppearance(Entity<HumanoidAppearanceComponent> humanoid, Entity<OrganComponent?, OrganAppearanceComponent?> organ, bool sync = true)
+    {
+        if (!Resolve(organ, ref organ.Comp1) || !Resolve(organ, ref organ.Comp2, false))
+            return;
+
+        switch (organ.Comp1.Type)
+        {
+            case OrganType.Eyes:
+                organ.Comp2.Color = humanoid.Comp.EyeColor;
+                break;
+            default:
+                return;
+        }
+
+        if (sync)
+            Dirty(organ, organ.Comp2);
+    }
+
+    protected bool TryGetMarkingLayer(List<MarkingLayerInfo> markingLayers, string markingId, string state, [NotNullWhen(true)] out MarkingLayerInfo? info)
+    {
+        info = null;
+
+        foreach (var markingLayer in markingLayers)
+        {
+            if (markingLayer.MarkingId != markingId || markingLayer.State != state)
+                continue;
+
+            info = markingLayer;
+            return true;
+        }
+
+        return false;
+    }
+
+    #endregion
+
+    #region Public API
+
+    public virtual void SetupBodyAppearance(Entity<BodyComponent?, BodyAppearanceComponent?, HumanoidAppearanceComponent?> body, bool sync = true)
+    {
+        if (!Resolve(body, ref body.Comp1, false)
+            || !Resolve(body, ref body.Comp2, false)
+            || !Resolve(body, ref body.Comp3, false))
+            return;
+
+        foreach (var bodyPart in GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1)))
+        {
+            SetupBodyPartAppearance((body, body.Comp3), bodyPart.AsNullable(), sync);
+            body.Comp2.Layers[bodyPart.Comp2.Layer] = bodyPart.Comp2.LayerInfo;
+        }
+
+        foreach (var organ in GetOrgans<OrganAppearanceComponent>((body, body.Comp1)))
+        {
+            SetupOrganAppearance((body, body.Comp3), organ.AsNullable(), sync);
+            body.Comp2.Layers[organ.Comp2.Layer] = organ.Comp2.LayerInfo;
+        }
+
+        foreach (var marking in body.Comp3.MarkingSet.GetForwardEnumerator().ToList())
+            AddMarking((body, body.Comp1, body.Comp3), marking);
+
+        if (sync)
+            Dirty(body, body.Comp2);
+    }
+
+    public virtual void SetBodyPartColor(Entity<BodyPartAppearanceComponent?> bodyPartAppearance, Color color, bool sync = true)
+    {
+        if (!Resolve(bodyPartAppearance, ref bodyPartAppearance.Comp) || !bodyPartAppearance.Comp.CanChangeColor)
+            return;
+
+        bodyPartAppearance.Comp.Color = color;
+
+        if (sync)
+            Dirty(bodyPartAppearance);
+    }
+
+    public virtual void SetBodyColor(Entity<BodyComponent?, BodyAppearanceComponent?> body, Color color, bool sync = true)
+    {
+        if (!Resolve(body, ref body.Comp1) || !Resolve(body, ref body.Comp2))
+            return;
+
+        foreach (var bodyPart in GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1)))
+            SetBodyPartColor((bodyPart, bodyPart.Comp2), color, false);
+
+        if (sync)
+            Dirty(body, body.Comp2);
+    }
+
+    public virtual void SetOrganColor(Entity<OrganAppearanceComponent?> organAppearance, Color color, bool sync = true)
+    {
+        if (!Resolve(organAppearance, ref organAppearance.Comp) || !organAppearance.Comp.CanChangeColor)
+            return;
+
+        organAppearance.Comp.Color = color;
+
+        if (sync)
+            Dirty(organAppearance);
+    }
+
+    public virtual void SetBodyOrganColor(Entity<BodyComponent?, BodyAppearanceComponent?> body, Color color, OrganType type = OrganType.None, bool sync = true)
+    {
+        if (!Resolve(body, ref body.Comp1) || !Resolve(body, ref body.Comp2))
+            return;
+
+        foreach (var organ in GetOrgans<OrganAppearanceComponent>((body, body.Comp1), type))
+            SetOrganColor((organ, organ.Comp2), color, false);
+
+        if (sync)
+            Dirty(body, body.Comp2);
+    }
+
+    public virtual void AddMarking(Entity<BodyComponent?, HumanoidAppearanceComponent?> body, Marking marking)
+    {
+        if (!Resolve(body, ref body.Comp1, false)
+            || !Resolve(body, ref body.Comp2, false)
+            || !_marking.TryGetMarking(marking, out var markingPrototype))
+            return;
+
+        for (var i = 0; i < markingPrototype.Sprites.Count; i++)
+        {
+            var markingSprite = new MarkingLayerInfo(markingPrototype.Sprites[i]);
+
+            markingSprite.Color = marking.MarkingColors[i];
+
+            if (markingSprite.Organ != OrganType.None && GetOrgans<OrganAppearanceComponent>((body, body.Comp1), markingSprite.Organ).FirstOrNull() is { } organ)
+            {
+                organ.Comp2.MarkingsLayers.Add(markingSprite);
+                continue;
+            }
+
+            if (markingSprite.BodyPart == BodyPartType.None)
+                continue;
+
+            if (GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1), markingSprite.BodyPart).FirstOrNull() is not { } bodyPart)
+            {
+                if (!markingSprite.ReplacementBodyPart.HasValue)
+                    continue;
+
+                var bodyPartUid = Spawn(markingSprite.ReplacementBodyPart);
+
+                if (!TryComp<BodyPartComponent>(bodyPartUid, out var bodyPartComponent)
+                    || !TryComp<BodyPartAppearanceComponent>(bodyPartUid, out var bodyPartAppearanceComponent)
+                    || !TryAttachBodyPart((body, body.Comp1), (bodyPartUid, bodyPartComponent)))
+                {
+                    QueueDel(bodyPartUid);
+                    continue;
+                }
+
+                bodyPartAppearanceComponent.IsMarking = true;
+                bodyPart = (bodyPartUid, bodyPartComponent, bodyPartAppearanceComponent);
+            }
+
+            if (markingSprite.ReplacementBodyPart.HasValue && bodyPart.Comp2.Visible)
+                bodyPart.Comp2.Visible = false;
+
+            bodyPart.Comp2.MarkingsLayers.Add(markingSprite);
+        }
+    }
+
+    public virtual void RemoveMarking(Entity<BodyComponent?, HumanoidAppearanceComponent?> body, Marking marking)
+    {
+        if (!Resolve(body, ref body.Comp1, false)
+            || !Resolve(body, ref body.Comp2, false)
+            || !_marking.TryGetMarking(marking, out var markingPrototype))
+            return;
+
+        foreach (var markingSprite in markingPrototype.Sprites)
+        {
+            if (markingSprite.Organ != OrganType.None && GetOrgans<OrganAppearanceComponent>((body, body.Comp1), markingSprite.Organ).FirstOrNull() is { } organ)
+            {
+                organ.Comp2.MarkingsLayers.Remove(markingSprite);
+                continue;
+            }
+
+            if (markingSprite.BodyPart == BodyPartType.None || GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1), markingSprite.BodyPart).FirstOrNull() is not { } bodyPart)
+                continue;
+
+            bodyPart.Comp2.MarkingsLayers.Remove(markingSprite);
+
+            if (markingSprite.ReplacementBodyPart.HasValue && !bodyPart.Comp2.Visible)
+                bodyPart.Comp2.Visible = true;
+
+            if (!markingSprite.ReplacementBodyPart.HasValue || !bodyPart.Comp2.IsMarking)
+                continue;
+
+            QueueDel(bodyPart);
+        }
+    }
+
+    public virtual void UpdateMarking(Entity<BodyComponent?, HumanoidAppearanceComponent?> body, Marking marking)
+    {
+        if (!Resolve(body, ref body.Comp1, false)
+            || !Resolve(body, ref body.Comp2, false)
+            || !_marking.TryGetMarking(marking, out var markingPrototype))
+            return;
+
+        for (var i = 0; i < markingPrototype.Sprites.Count; i++)
+        {
+            var prototypeMarkingSprite = new MarkingLayerInfo(markingPrototype.Sprites[i]);
+
+            List<MarkingLayerInfo> markingLayers;
+            if (GetBodyParts<BodyPartAppearanceComponent>((body, body.Comp1), prototypeMarkingSprite.BodyPart).FirstOrNull() is { } bodyPart)
+                markingLayers = bodyPart.Comp2.MarkingsLayers;
+            else if (GetOrgans<OrganAppearanceComponent>((body, body.Comp1), prototypeMarkingSprite.Organ).FirstOrNull() is { } organ)
+                markingLayers = organ.Comp2.MarkingsLayers;
+            else
+                continue;
+
+            if (!TryGetMarkingLayer(markingLayers, prototypeMarkingSprite.MarkingId, prototypeMarkingSprite.State, out var markingSprite))
+                continue;
+
+            markingSprite.Color = marking.MarkingColors[i];
+        }
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/_White/Body/Systems/SharedBodySystem.Body.cs
new file mode 100644
index 00000000000..dfa1def3e7e
--- /dev/null
+++ b/Content.Shared/_White/Body/Systems/SharedBodySystem.Body.cs
@@ -0,0 +1,101 @@
+using System.Linq;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Prototypes;
+using Content.Shared.Humanoid;
+using Robust.Shared.Containers;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._White.Body.Systems;
+
+public abstract partial class SharedBodySystem
+{
+    private void InitializeBody() => SubscribeLocalEvent<BodyComponent, MapInitEvent>(OnBodyMapInit);
+
+    #region Event Handling
+
+    private void OnBodyMapInit(Entity<BodyComponent> body, ref MapInitEvent args)
+    {
+        var bodyPrototype = Prototype.Index(body.Comp.Prototype);
+
+        if (bodyPrototype.BodyParts.Count != 0)
+            SetupBody(body,  bodyPrototype);
+
+        if (bodyPrototype.Organs.Count == 0)
+            return;
+
+        body.Comp.Organs = bodyPrototype.Organs.ToDictionary(x => x.Key, x => new OrganSlot(x.Value));
+        SetupOrgans(body, body.Comp.Organs);
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void SetupBody(Entity<BodyComponent> body, BodyPrototype bodyPrototype)
+    {
+        var humanoidComponent = CompOrNull<HumanoidAppearanceComponent>(body);
+        var coordinates = Comp<TransformComponent>(body).Coordinates;
+
+        var processedBodyPart = new List<string> { bodyPrototype.Root, };
+        var queue = new Queue<(string BodyPartId, EntityUid BodyPartParent)>();
+        queue.Enqueue((bodyPrototype.Root, body));
+
+        while (queue.TryDequeue(out var id))
+        {
+            var bodyPartSlot = new BodyPartSlot(bodyPrototype.BodyParts[id.BodyPartId])
+            {
+                ContainerSlot = _container.EnsureContainer<ContainerSlot>(id.BodyPartParent, GetBodyPartSlotContainerId(id.BodyPartId))
+            };
+
+            body.Comp.BodyParts.Add(id.BodyPartId, bodyPartSlot);
+
+            if (TryComp<BodyPartComponent>(id.BodyPartParent, out var parentBodyPartComponent))
+            {
+                parentBodyPartComponent.BodyParts.Add(id.BodyPartId, bodyPartSlot);
+                Dirty(id.BodyPartParent, parentBodyPartComponent);
+            }
+
+            if (string.IsNullOrEmpty(bodyPartSlot.StartingBodyPart))
+                continue;
+
+            var bodyPart = Spawn(bodyPartSlot.StartingBodyPart, coordinates);
+            if (!TryComp<BodyPartComponent>(bodyPart, out var bodyPartComponent))
+            {
+                _sawmill.Error($"Body part {ToPrettyString(bodyPart)} does not have {typeof(BodyPartComponent)}");
+                QueueDel(bodyPart);
+                continue;
+            }
+
+            if (humanoidComponent != null)
+                SetupBodyPartAppearance((body.Owner, humanoidComponent), (bodyPart, bodyPartComponent, null));
+
+            if (!_container.Insert(bodyPart, bodyPartSlot.ContainerSlot))
+            {
+                _sawmill.Error($"Couldn't insert {ToPrettyString(bodyPart)} to {ToPrettyString(id.BodyPartParent)}");
+                QueueDel(bodyPart);
+                continue;
+            }
+
+            bodyPartComponent.Bones = bodyPartSlot.Bones;
+            SetupBones(bodyPart, bodyPartComponent.Bones);
+
+            bodyPartComponent.Organs = bodyPartSlot.Organs;
+            SetupOrgans(bodyPart, bodyPartComponent.Organs);
+
+            Dirty(bodyPart, bodyPartComponent);
+
+            foreach (var childBodyPart in bodyPartSlot.Connections)
+            {
+                if (processedBodyPart.Contains(childBodyPart))
+                    continue;
+
+                queue.Enqueue((childBodyPart, bodyPart));
+                processedBodyPart.Add(childBodyPart);
+            }
+        }
+
+        Timer.Spawn(200, () => Dirty(body));
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Systems/SharedBodySystem.BodyPart.cs b/Content.Shared/_White/Body/Systems/SharedBodySystem.BodyPart.cs
new file mode 100644
index 00000000000..267e960ab0a
--- /dev/null
+++ b/Content.Shared/_White/Body/Systems/SharedBodySystem.BodyPart.cs
@@ -0,0 +1,628 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Shared._White.Body.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Shared._White.Body.Systems;
+
+public abstract partial class SharedBodySystem
+{
+    private void InitializeBodyPart()
+    {
+        SubscribeLocalEvent<BodyPartComponent, MapInitEvent>(OnBodyPartMapInit);
+
+        SubscribeLocalEvent<BodyPartComponent, EntGotInsertedIntoContainerMessage>(OnBodyPartGotInserted);
+        SubscribeLocalEvent<BodyPartComponent, EntGotRemovedFromContainerMessage>(OnBodyPartGotRemoved);
+    }
+
+    #region Event Handling
+
+    private void OnBodyPartMapInit(Entity<BodyPartComponent> bodyPart, ref MapInitEvent args)
+    {
+        SetupBodyParts(bodyPart, bodyPart.Comp.BodyParts);
+
+        SetupBones(bodyPart, bodyPart.Comp.Bones);
+
+        SetupOrgans(bodyPart, bodyPart.Comp.Organs);
+    }
+
+    private void OnBodyPartGotInserted(Entity<BodyPartComponent> bodyPart, ref EntGotInsertedIntoContainerMessage args)
+    {
+        var containerSlotId = args.Container.ID;
+        if (containerSlotId.IndexOf(BodyPartSlotContainerIdPrefix, StringComparison.Ordinal) == -1)
+            return;
+
+        var parent = args.Container.Owner;
+        Entity<BodyComponent> body;
+
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            body = (parent, bodyComponent);
+        else if (TryComp<BodyPartComponent>(parent, out var parentBodyPartComponent))
+        {
+            if (!parentBodyPartComponent.Body.HasValue || !Resolve(parentBodyPartComponent.Body.Value, ref bodyComponent))
+            {
+                bodyPart.Comp.Parent = parent;
+                Dirty(bodyPart);
+
+                RaiseLocalEvent(bodyPart, new BodyPartAddedEvent(bodyPart, null, parent, containerSlotId));
+
+                return;
+            }
+
+            body = (parentBodyPartComponent.Body.Value, bodyComponent);
+        }
+        else
+            return;
+
+        SetBodyPartsBody(body, bodyPart, GetBodyParts(bodyPart.AsNullable()));
+        SetBonesBody(body, bodyPart, GetBones(bodyPart.AsNullable()));
+        SetOrgansBody(body, bodyPart, GetOrgans(bodyPart.AsNullable()));
+
+        foreach (var bodyPartSlot in GetBodyPartSlots(bodyPart.AsNullable()))
+        {
+            if (string.IsNullOrEmpty(bodyPartSlot.Id))
+                continue;
+
+            var slotId = GetBodyPartSlotId(bodyPartSlot.Id);
+
+            if (!body.Comp.BodyParts.TryAdd(slotId, bodyPartSlot))
+                body.Comp.BodyParts[slotId] = bodyPartSlot;
+        }
+
+        bodyPart.Comp.Body = body;
+        bodyPart.Comp.Parent = parent;
+        Dirty(bodyPart);
+
+        var ev = new BodyPartAddedEvent(
+            bodyPart,
+            body,
+            parent,
+            args.Container.ID);
+
+        RaiseLocalEvent(bodyPart, ev);
+        RaiseLocalEvent(body, ev);
+    }
+
+    private void OnBodyPartGotRemoved(Entity<BodyPartComponent> bodyPart, ref EntGotRemovedFromContainerMessage args)
+    {
+        var containerSlotId = args.Container.ID;
+        if (containerSlotId.IndexOf(BodyPartSlotContainerIdPrefix, StringComparison.Ordinal) == -1)
+            return;
+
+        var parent = args.Container.Owner;
+        Entity<BodyComponent> body;
+
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            body = (parent, bodyComponent);
+        else if (TryComp<BodyPartComponent>(parent, out var parentBodyPartComponent))
+        {
+            if (!parentBodyPartComponent.Body.HasValue || !Resolve(parentBodyPartComponent.Body.Value, ref bodyComponent))
+            {
+                bodyPart.Comp.Parent = null;
+                Dirty(bodyPart);
+
+                RaiseLocalEvent(bodyPart, new BodyPartRemovedEvent(bodyPart, null, parent, containerSlotId));
+
+                return;
+            }
+
+            body = (parentBodyPartComponent.Body.Value, bodyComponent);
+        }
+        else
+            return;
+
+        SetBodyPartsBody(null, bodyPart, GetBodyParts(bodyPart.AsNullable()));
+        SetBonesBody(null, bodyPart, GetBones(bodyPart.AsNullable()));
+        SetOrgansBody(null, bodyPart, GetOrgans(bodyPart.AsNullable()));
+
+        foreach (var bodyPartSlot in GetBodyPartSlots(bodyPart.AsNullable()))
+        {
+            if (string.IsNullOrEmpty(bodyPartSlot.Id))
+                continue;
+
+            body.Comp.BodyParts.Remove(GetBodyPartSlotId(bodyPartSlot.Id));
+        }
+
+        bodyPart.Comp.Body = null;
+        bodyPart.Comp.Parent = null;
+        Dirty(bodyPart);
+
+        var ev = new BodyPartRemovedEvent(
+            bodyPart,
+            body,
+            parent,
+            args.Container.ID);
+
+        RaiseLocalEvent(bodyPart, ev);
+        RaiseLocalEvent(body, ev);
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void SetupBodyParts(EntityUid parentUid, Dictionary<string, BodyPartSlot> bodyPartSlots)
+    {
+        foreach (var (bodyPartId, bodyPartSlot) in bodyPartSlots)
+        {
+            if (bodyPartSlot.HasBodyPart || string.IsNullOrEmpty(bodyPartSlot.StartingBodyPart))
+                return;
+
+            bodyPartSlot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(parentUid, GetBodyPartSlotContainerId(bodyPartId));
+
+            var bodyPart = Spawn(bodyPartSlot.StartingBodyPart);
+            if (!TryComp<BodyPartComponent>(bodyPart, out var bodyPartComponent))
+            {
+                _sawmill.Error($"Body part {ToPrettyString(bodyPart)} does not have {typeof(BodyPartComponent)} {bodyPartSlot.StartingBodyPart}");
+                QueueDel(bodyPart);
+                return;
+            }
+
+            if (!_container.Insert(bodyPart, bodyPartSlot.ContainerSlot))
+            {
+                _sawmill.Error($"Couldn't insert {ToPrettyString(bodyPart)} to {ToPrettyString(parentUid)}");
+                QueueDel(bodyPart);
+                return;
+            }
+
+            bodyPartComponent.Bones = bodyPartSlot.Bones;
+            SetupBones(bodyPart, bodyPartComponent.Bones);
+
+            bodyPartComponent.Organs = bodyPartSlot.Organs;
+            SetupOrgans(bodyPart, bodyPartComponent.Organs);
+        }
+    }
+
+    private void SetBodyPartsBody(Entity<BodyComponent>? body, EntityUid parent, List<Entity<BodyPartComponent>> bodyParts)
+    {
+        foreach (var bodyPart in bodyParts)
+        {
+            if (!_container.TryGetContainingContainer((bodyPart, null, null), out var container) || container.Owner != parent)
+                continue;
+
+            if (body.HasValue)
+            {
+                var ev = new BodyPartAddedEvent(bodyPart, body, parent, container.ID);
+                RaiseLocalEvent(bodyPart, ev);
+                RaiseLocalEvent(body.Value, ev);
+            }
+            else if (TryComp<BodyComponent>(bodyPart.Comp.Body, out var bodyComponent))
+            {
+                var ev = new BodyPartRemovedEvent(bodyPart, (bodyPart.Comp.Body.Value, bodyComponent), parent, container.ID);
+                RaiseLocalEvent(bodyPart, ev);
+                RaiseLocalEvent(bodyPart.Comp.Body.Value, ev);
+            }
+
+            bodyPart.Comp.Body = body;
+            Dirty(bodyPart);
+
+            SetBodyPartsBody(body, bodyPart, GetBodyParts(bodyPart.AsNullable()));
+            SetBonesBody(body, bodyPart, GetBones(bodyPart.AsNullable()));
+            SetOrgansBody(body, bodyPart, GetOrgans(bodyPart.AsNullable()));
+        }
+    }
+
+    #endregion
+
+    #region Public API
+
+    #region GetBodyParts
+
+    /// <summary>
+    /// Gets the body parts of this body.
+    /// </summary>
+    public List<Entity<BodyPartComponent>> GetBodyParts(Entity<BodyComponent?> body, BodyPartType type = BodyPartType.All)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return new List<Entity<BodyPartComponent>>();
+
+        var bodyParts = new List<Entity<BodyPartComponent>>();
+        foreach (var bodyPartSlot in body.Comp.BodyParts.Values)
+        {
+            if (!TryComp<BodyPartComponent>(bodyPartSlot.BodyPartUid, out var bodyPartComponent)
+                || !type.HasFlag(bodyPartSlot.Type))
+                continue;
+
+            bodyParts.Add((bodyPartSlot.BodyPartUid.Value, bodyPartComponent));
+        }
+
+        return bodyParts;
+    }
+
+    /// <summary>
+    /// Gets the body parts of this body part.
+    /// </summary>
+    public List<Entity<BodyPartComponent>> GetBodyParts(Entity<BodyPartComponent?> bodyPart, BodyPartType type = BodyPartType.All)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return new List<Entity<BodyPartComponent>>();
+
+        var bodyParts = new List<Entity<BodyPartComponent>>();
+        foreach (var bodyPartSlot in bodyPart.Comp.BodyParts.Values)
+        {
+            if (!TryComp<BodyPartComponent>(bodyPartSlot.BodyPartUid, out var bodyPartComponent)
+                || !type.HasFlag(bodyPartSlot.Type))
+                continue;
+
+            bodyParts.Add((bodyPartSlot.BodyPartUid.Value, bodyPartComponent));
+            bodyParts.AddRange(GetBodyParts((bodyPartSlot.BodyPartUid.Value, bodyPartComponent), type));
+        }
+
+        return bodyParts;
+    }
+
+    /// <summary>
+    /// Gets the body parts of this entity.
+    /// </summary>
+    public List<Entity<BodyPartComponent>> GetBodyParts(EntityUid parent, BodyPartType type = BodyPartType.All)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return GetBodyParts((parent, bodyComponent), type);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return GetBodyParts((parent, bodyPartComponent), type);
+
+        return new List<Entity<BodyPartComponent>>();
+    }
+
+    #endregion
+
+    #region GetBodyParts<T>
+
+    /// <summary>
+    /// Gets the body parts of this body with the given component.
+    /// </summary>
+    public List<Entity<BodyPartComponent, T>> GetBodyParts<T>(Entity<BodyComponent?> body, BodyPartType type = BodyPartType.All) where T : IComponent
+    {
+        var bodyParts = new List<Entity<BodyPartComponent, T>>();
+        foreach (var bodyPart in GetBodyParts(body, type))
+        {
+            if (!TryComp<T>(bodyPart, out var component))
+                continue;
+
+            bodyParts.Add((bodyPart.Owner, bodyPart.Comp, component));
+        }
+
+        return bodyParts;
+    }
+
+    /// <summary>
+    /// Gets the body parts of this body part with the given component.
+    /// </summary>
+    public List<Entity<BodyPartComponent, T>> GetBodyParts<T>(Entity<BodyPartComponent?> bodyPart, BodyPartType type = BodyPartType.All) where T : IComponent
+    {
+        var bodyParts = new List<Entity<BodyPartComponent, T>>();
+        foreach (var childBodyPart in GetBodyParts(bodyPart, type))
+        {
+            if (!TryComp<T>(childBodyPart, out var component))
+                continue;
+
+            bodyParts.Add((bodyPart.Owner, childBodyPart.Comp, component));
+        }
+
+        return bodyParts;
+    }
+
+    /// <summary>
+    /// Gets the body parts of this body part with the given component.
+    /// </summary>
+    public List<Entity<BodyPartComponent, T>> GetBodyParts<T>(EntityUid parent, BodyPartType type = BodyPartType.All) where T : IComponent
+    {
+        var bodyParts = new List<Entity<BodyPartComponent, T>>();
+        foreach (var bodyPart in GetBodyParts(parent, type))
+        {
+            if (!TryComp<T>(bodyPart, out var component))
+                continue;
+
+            bodyParts.Add((bodyPart.Owner, bodyPart.Comp, component));
+        }
+
+        return bodyParts;
+    }
+
+    #endregion
+
+    #region GetBodyPartSlots
+
+    /// <summary>
+    /// Gets the body part slots of this body.
+    /// </summary>
+    public List<BodyPartSlot> GetBodyPartSlots(Entity<BodyComponent?> body, BodyPartType type = BodyPartType.All, string? slotId = null)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return new List<BodyPartSlot>();
+
+        var bodyPartSlots = new List<BodyPartSlot>();
+        foreach (var bodyPartSlot in body.Comp.BodyParts.Values)
+        {
+            if (!type.HasFlag(bodyPartSlot.Type) || !string.IsNullOrEmpty(slotId) && bodyPartSlot.Id != slotId)
+                continue;
+
+            bodyPartSlots.Add(bodyPartSlot);
+        }
+
+        return bodyPartSlots;
+    }
+
+    /// <summary>
+    /// Gets the body part slots of this body part.
+    /// </summary>
+    public List<BodyPartSlot> GetBodyPartSlots(Entity<BodyPartComponent?> bodyPart, BodyPartType type = BodyPartType.All, string? slotId = null)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return new List<BodyPartSlot>();
+
+        var bodyPartSlots = new List<BodyPartSlot>();
+        foreach (var bodyPartSlot in bodyPart.Comp.BodyParts.Values)
+        {
+            if (!type.HasFlag(bodyPartSlot.Type) || !string.IsNullOrEmpty(slotId) && bodyPartSlot.Id != slotId)
+                continue;
+
+            if (bodyPartSlot.BodyPartUid.HasValue)
+                bodyPartSlots.AddRange(GetBodyPartSlots(bodyPartSlot.BodyPartUid.Value, type, slotId));
+
+            bodyPartSlots.Add(bodyPartSlot);
+        }
+
+        return bodyPartSlots;
+    }
+
+    /// <summary>
+    /// Gets the body part slots of this entity.
+    /// </summary>
+    public List<BodyPartSlot> GetBodyPartSlots(EntityUid parent, BodyPartType type = BodyPartType.All, string? slotId = null)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return GetBodyPartSlots((parent, bodyComponent), type, slotId);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return GetBodyPartSlots((parent, bodyPartComponent), type, slotId);
+
+        return new List<BodyPartSlot>();
+    }
+
+    #endregion
+
+    #region TryGetBodyParts
+
+    /// <summary>
+    /// Returns the body parts of this body.
+    /// </summary>
+    public bool TryGetBodyParts(Entity<BodyComponent?> body, out List<Entity<BodyPartComponent>> bodyParts, BodyPartType type = BodyPartType.All)
+    {
+        bodyParts = GetBodyParts(body, type);
+        return bodyParts.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the body parts of this body part.
+    /// </summary>
+    public bool TryGetBodyParts(Entity<BodyPartComponent?> bodyPart, out List<Entity<BodyPartComponent>> bodyParts, BodyPartType type = BodyPartType.All)
+    {
+        bodyParts = GetBodyParts(bodyPart, type);
+        return bodyParts.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the body parts of this entity.
+    /// </summary>
+    public bool TryGetBodyParts(EntityUid parent, out List<Entity<BodyPartComponent>> bodyParts, BodyPartType type = BodyPartType.All)
+    {
+        bodyParts = GetBodyParts(parent, type);
+        return bodyParts.Count != 0;
+    }
+
+    #endregion
+
+    #region TryGetBodyParts<T>
+
+    /// <summary>
+    /// Returns the body parts of this body with the given component.
+    /// </summary>
+    public bool TryGetBodyParts<T>(Entity<BodyComponent?> body, out List<Entity<BodyPartComponent, T>> bodyParts, BodyPartType type = BodyPartType.All) where T : IComponent
+    {
+        bodyParts = GetBodyParts<T>(body, type);
+        return bodyParts.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the body parts of this body part with the given component.
+    /// </summary>
+    public bool TryGetBodyParts<T>(Entity<BodyPartComponent?> bodyPart, out List<Entity<BodyPartComponent, T>> bodyParts, BodyPartType type = BodyPartType.All) where T : IComponent
+    {
+        bodyParts = GetBodyParts<T>(bodyPart, type);
+        return bodyParts.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the body parts of this entity with the given component.
+    /// </summary>
+    public bool TryGetBodyParts<T>(EntityUid parent, out List<Entity<BodyPartComponent, T>> bodyParts, BodyPartType type = BodyPartType.All) where T : IComponent
+    {
+        bodyParts = GetBodyParts<T>(parent, type);
+        return bodyParts.Count != 0;
+    }
+
+    #endregion
+
+    #region TryCreateBodyPartSlot
+
+    /// <summary>
+    /// Trying to create an body part slot for this body.
+    /// </summary>
+    public bool TryCreateBodyPartSlot(Entity<BodyComponent?> body, string bodyPartId, BodyPartType type)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return false;
+
+        var bodyPartSlot = new BodyPartSlot
+        {
+            Type = type,
+            ContainerSlot = _container.EnsureContainer<ContainerSlot>(body, GetBodyPartSlotContainerId(bodyPartId))
+        };
+
+        if (!body.Comp.BodyParts.TryAdd(bodyPartId, bodyPartSlot))
+            return false;
+
+        Dirty(body);
+        return true;
+    }
+
+    /// <summary>
+    /// Trying to create an body part slot for this body part.
+    /// </summary>
+    public bool TryCreateBodyPartSlot(Entity<BodyPartComponent?> bodyPart, string bodyPartId, BodyPartType type)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return false;
+
+        var bodyPartSlot = new BodyPartSlot
+        {
+            Type = type,
+            ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetBodyPartSlotContainerId(bodyPartId))
+        };
+
+        if (TryComp<BodyComponent>(bodyPart.Comp.Body, out var bodyComponent) && !bodyComponent.BodyParts.TryAdd(bodyPartId, bodyPartSlot))
+            return false;
+
+        if (!bodyPart.Comp.BodyParts.TryAdd(bodyPartId, bodyPartSlot))
+        {
+            bodyComponent?.BodyParts.Remove(bodyPartId);
+            return false;
+        }
+
+        Dirty(bodyPart);
+        return true;
+    }
+
+    /// <summary>
+    /// Trying to create an entity slot for this body part.
+    /// </summary>
+    public bool TryCreateBodyPartSlot(EntityUid parent, string bodyPartId, BodyPartType type)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return TryCreateBodyPartSlot((parent, bodyComponent), bodyPartId, type);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return TryCreateBodyPartSlot((parent, bodyPartComponent), bodyPartId, type);
+
+        return false;
+    }
+
+    #endregion
+
+    #region TryAttachBodyPart
+
+    /// <summary>
+    /// Trying to attach a body part to this body.
+    /// </summary>
+    public bool TryAttachBodyPart(Entity<BodyComponent?> body, Entity<BodyPartComponent?> bodyPart, string? slotId = null)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp)
+            || GetBodyPartSlots(body, bodyPart.Comp.Type, slotId).FirstOrDefault() is not {} bodyPartSlot
+            || bodyPartSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(bodyPart.Owner, bodyPartSlot.ContainerSlot);
+    }
+
+    /// <summary>
+    /// Trying to attach a body part to this body part.
+    /// </summary>
+    public bool TryAttachBodyPart(Entity<BodyPartComponent?> parentBodyPart, Entity<BodyPartComponent?> childBodyPart, string? slotId = null)
+    {
+        if (!Resolve(childBodyPart, ref childBodyPart.Comp)
+            || GetBodyPartSlots(parentBodyPart, childBodyPart.Comp.Type, slotId).FirstOrDefault() is not {} bodyPartSlot
+            || bodyPartSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(childBodyPart.Owner, bodyPartSlot.ContainerSlot);
+    }
+
+    /// <summary>
+    /// Trying to attach a body part to this entity.
+    /// </summary>
+    public bool TryAttachBodyPart(EntityUid parent, Entity<BodyPartComponent?> bodyPart, string? slotId = null)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp)
+            || GetBodyPartSlots(parent, bodyPart.Comp.Type, slotId).FirstOrDefault() is not {} bodyPartSlot
+            || bodyPartSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(bodyPart.Owner, bodyPartSlot.ContainerSlot);
+    }
+
+    #endregion
+
+    #region TryDetachBodyPart
+
+    /// <summary>
+    /// Trying to detach a body part.
+    /// </summary>
+    public bool TryDetachBodyPart(EntityUid bodyPart)
+    {
+        if (!_container.TryGetContainingContainer((bodyPart, null, null), out var container))
+            return false;
+
+        return _container.Remove(bodyPart, container);
+    }
+
+    #endregion
+
+    #region TryCreateBodyPartSlotAndAttachBodyPart
+
+    /// <summary>
+    /// Trying to create an body part slot for this body and attach an body part to this body.
+    /// </summary>
+    public bool TryCreateBodyPartSlotAndAttachBodyPart(
+        Entity<BodyComponent?> body,
+        Entity<BodyPartComponent?> bodyPart,
+        string slotId,
+        BodyPartType type
+    ) =>
+        TryCreateBodyPartSlot(body, slotId, type) && TryAttachBodyPart(body, bodyPart, slotId);
+
+    /// <summary>
+    /// Trying to create an body part slot for this body part and attach an body part to this body part.
+    /// </summary>
+    public bool TryCreateBodyPartSlotAndAttachBodyPart(
+        Entity<BodyPartComponent?> parentBodyPart,
+        Entity<BodyPartComponent?> childBodyPart,
+        string slotId,
+        BodyPartType type
+    ) =>
+        TryCreateBodyPartSlot(parentBodyPart, slotId, type) && TryAttachBodyPart(parentBodyPart, childBodyPart, slotId);
+
+    /// <summary>
+    /// Trying to create an body part slot for this entity and attach an body part to this entity.
+    /// </summary>
+    public bool TryCreateBodyPartSlotAndAttachBodyPart(
+        EntityUid parent,
+        Entity<BodyPartComponent?> bodyPart,
+        string slotId,
+        BodyPartType type
+    ) =>
+        TryCreateBodyPartSlot(parent, slotId, type) && TryAttachBodyPart(parent, bodyPart, slotId);
+
+    #endregion
+
+    /// <summary>
+    /// Trying to get the root body part of this body.
+    /// </summary>
+    public bool TryGetRootBodyPart(Entity<BodyComponent?> body, [NotNullWhen(true)] out EntityUid? bodyPart)
+    {
+        bodyPart = null;
+        if (!Resolve(body, ref body.Comp))
+            return false;
+
+        var rootBodyPartId = Prototype.Index(body.Comp.Prototype).Root;
+
+        if (body.Comp.BodyParts.TryGetValue(rootBodyPartId, out var bodyPartSlot))
+            return false;
+
+        bodyPart = bodyPartSlot?.BodyPartUid;
+        return bodyPart.HasValue;
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Systems/SharedBodySystem.Bone.cs b/Content.Shared/_White/Body/Systems/SharedBodySystem.Bone.cs
new file mode 100644
index 00000000000..fb37b424436
--- /dev/null
+++ b/Content.Shared/_White/Body/Systems/SharedBodySystem.Bone.cs
@@ -0,0 +1,398 @@
+using System.Linq;
+using Content.Shared._White.Body.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Shared._White.Body.Systems;
+
+public abstract partial class SharedBodySystem
+{
+    private void InitializeBone()
+    {
+        SubscribeLocalEvent<BoneComponent, MapInitEvent>(OnBoneMapInit);
+
+        SubscribeLocalEvent<BoneComponent, EntGotInsertedIntoContainerMessage>(OnBoneGotInserted);
+        SubscribeLocalEvent<BoneComponent, EntGotRemovedFromContainerMessage>(OnBoneGotRemoved);
+    }
+
+    #region Event Handling
+
+    private void OnBoneMapInit(Entity<BoneComponent> bone, ref MapInitEvent args) => SetupOrgans(bone, bone.Comp.Organs);
+
+    private void OnBoneGotInserted(Entity<BoneComponent> bone, ref EntGotInsertedIntoContainerMessage args)
+    {
+        var containerSlotId = args.Container.ID;
+        if (containerSlotId.IndexOf(BoneSlotContainerIdPrefix, StringComparison.Ordinal) == -1)
+            return;
+
+        var parent = args.Container.Owner;
+
+        if (!TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return;
+
+        bone.Comp.Parent = parent;
+
+        if (!TryComp<BodyComponent>(bodyPartComponent.Body, out var bodyComponent))
+        {
+            Dirty(bone);
+
+            RaiseLocalEvent(bone, new BoneAddedEvent(bone, null, parent, containerSlotId));
+
+            return;
+        }
+
+        Entity<BodyComponent> body = (bodyPartComponent.Body.Value, bodyComponent);
+
+        SetOrgansBody(body, bone, GetOrgans(bone.AsNullable()));
+
+        bone.Comp.Body = body;
+        Dirty(bone);
+
+        var ev = new BoneAddedEvent(
+            bone,
+            body,
+            parent,
+            args.Container.ID);
+
+        RaiseLocalEvent(bone, ev);
+        RaiseLocalEvent(body, ev);
+    }
+
+    private void OnBoneGotRemoved(Entity<BoneComponent> bone, ref EntGotRemovedFromContainerMessage args)
+    {
+        var containerSlotId = args.Container.ID;
+        if (containerSlotId.IndexOf(BoneSlotContainerIdPrefix, StringComparison.Ordinal) == -1)
+            return;
+
+        var parent = args.Container.Owner;
+
+        if (!TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return;
+
+        bone.Comp.Parent = null;
+
+        if (!TryComp<BodyComponent>(bodyPartComponent.Body, out var bodyComponent))
+        {
+            Dirty(bone);
+
+            RaiseLocalEvent(bone, new BoneAddedEvent(bone, null, parent, containerSlotId));
+
+            return;
+        }
+
+        Entity<BodyComponent> body = (bodyPartComponent.Body.Value, bodyComponent);
+
+        SetOrgansBody(null, bone, GetOrgans(bone.AsNullable()));
+
+        bone.Comp.Body = null;
+        Dirty(bone);
+
+        var ev = new BoneRemovedEvent(
+            bone,
+            body,
+            parent,
+            args.Container.ID);
+
+        RaiseLocalEvent(bone, ev);
+        RaiseLocalEvent(body, ev);
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void SetupBones(EntityUid parentUid, Dictionary<string, BoneSlot> boneSlots)
+    {
+        foreach (var (boneId, boneSlot) in boneSlots)
+        {
+            if (boneSlot.HasBone || string.IsNullOrEmpty(boneSlot.StartingBone))
+                continue;
+
+            boneSlot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(parentUid, GetBoneContainerId(boneId));
+
+            var bone = Spawn(boneSlot.StartingBone);
+            if (!TryComp<BoneComponent>(bone, out var boneComponent))
+            {
+                _sawmill.Error($"Bone {ToPrettyString(bone)} does not have {typeof(BoneComponent)}");
+                QueueDel(bone);
+                continue;
+            }
+
+            if (!_container.Insert(bone, boneSlot.ContainerSlot))
+            {
+                _sawmill.Error($"Couldn't insert {ToPrettyString(bone)} to {ToPrettyString(parentUid)}");
+                QueueDel(bone);
+                continue;
+            }
+
+            boneComponent.Organs = boneSlot.Organs;
+            SetupOrgans(bone, boneComponent.Organs);
+        }
+    }
+
+    private void SetBonesBody(Entity<BodyComponent>? body, EntityUid parent, List<Entity<BoneComponent>> bones)
+    {
+        foreach (var bone in bones)
+        {
+            if (!_container.TryGetContainingContainer((bone, null, null), out var container) || container.Owner != parent)
+                continue;
+
+            if (body.HasValue)
+            {
+                var ev = new BoneAddedEvent(bone, body, parent, container.ID);
+                RaiseLocalEvent(bone, ev);
+                RaiseLocalEvent(body.Value, ev);
+            }
+            else if (TryComp<BodyComponent>(bone.Comp.Body, out var bodyComponent))
+            {
+                var ev = new BoneRemovedEvent(bone, (bone.Comp.Body.Value, bodyComponent), parent, container.ID);
+                RaiseLocalEvent(bone, ev);
+                RaiseLocalEvent(bone.Comp.Body.Value, ev);
+            }
+
+            bone.Comp.Body = body;
+            Dirty(bone);
+
+            SetOrgansBody(body, bone, GetOrgans(bone.AsNullable()));
+        }
+    }
+
+    #endregion
+
+    #region Public API
+
+    #region GetBones
+
+    /// <summary>
+    /// Gets the bones of this body.
+    /// </summary>
+    public List<Entity<BoneComponent>> GetBones(Entity<BodyComponent?> body, BoneType type = BoneType.None)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return new List<Entity<BoneComponent>>();
+
+        var bones = new List<Entity<BoneComponent>>();
+        foreach (var bodyPartSlot in body.Comp.BodyParts.Values)
+        {
+            if (!TryComp<BodyPartComponent>(bodyPartSlot.BodyPartUid, out var bodyPartComponent))
+                continue;
+
+            bones.AddRange(GetBones((bodyPartSlot.BodyPartUid.Value, bodyPartComponent), type));
+        }
+
+        return bones;
+    }
+
+    /// <summary>
+    /// Gets the bones of this body part.
+    /// </summary>
+    public List<Entity<BoneComponent>> GetBones(Entity<BodyPartComponent?> bodyPart, BoneType type = BoneType.None)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return new List<Entity<BoneComponent>>();
+
+        var bones = new List<Entity<BoneComponent>>();
+        foreach (var boneSlot in bodyPart.Comp.Bones.Values)
+        {
+            if (!TryComp<BoneComponent>(boneSlot.BoneUid, out var boneComponent) || !boneComponent.Type.HasFlag(type))
+                continue;
+
+            bones.Add((boneSlot.BoneUid.Value, boneComponent));
+        }
+
+        return bones;
+    }
+
+    /// <summary>
+    /// Gets the bones of this entity.
+    /// </summary>
+    public List<Entity<BoneComponent>> GetBones(EntityUid parent, BoneType type = BoneType.None)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return GetBones((parent, bodyComponent), type);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return GetBones((parent, bodyPartComponent), type);
+
+        return new List<Entity<BoneComponent>>();
+    }
+
+    #endregion
+
+    #region GetBones<T>
+
+    /// <summary>
+    /// Gets the bones of this body with the given component.
+    /// </summary>
+    public List<Entity<BoneComponent, T>> GetBones<T>(Entity<BodyComponent?> body, BoneType type = BoneType.None) where T : IComponent
+    {
+        var bones = new List<Entity<BoneComponent, T>>();
+        foreach (var bone in GetBones(body, type))
+        {
+            if (!TryComp<T>(bone, out var component))
+                continue;
+
+            bones.Add((bone.Owner, bone.Comp, component));
+        }
+
+        return bones;
+    }
+
+    /// <summary>
+    /// Gets the bones of this body part with the given component.
+    /// </summary>
+    public List<Entity<BoneComponent, T>> GetBones<T>(Entity<BodyPartComponent?> bodyPart, BoneType type = BoneType.None) where T : IComponent
+    {
+        var bones = new List<Entity<BoneComponent, T>>();
+        foreach (var bone in GetBones(bodyPart, type))
+        {
+            if (!TryComp<T>(bone, out var component))
+                continue;
+
+            bones.Add((bone.Owner, bone.Comp, component));
+        }
+
+        return bones;
+    }
+
+    /// <summary>
+    /// Gets the bones of this entity with the given component.
+    /// </summary>
+    public List<Entity<BoneComponent, T>> GetBones<T>(EntityUid parent, BoneType type = BoneType.None) where T : IComponent
+    {
+        var bones = new List<Entity<BoneComponent, T>>();
+        foreach (var bone in GetBones(parent, type))
+        {
+            if (!TryComp<T>(bone, out var component))
+                continue;
+
+            bones.Add((bone.Owner, bone.Comp, component));
+        }
+
+        return bones;
+    }
+
+    #endregion
+
+    #region GetBoneSlots
+
+    /// <summary>
+    /// Gets the bone slots of this body.
+    /// </summary>
+    public List<BoneSlot> GetBoneSlots(Entity<BodyComponent?> body, BoneType type = BoneType.None, string? slotId = null)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return new List<BoneSlot>();
+
+        var bodyPartSlots = new List<BoneSlot>();
+        foreach (var bodyPart in GetBodyParts(body))
+            bodyPartSlots.AddRange(GetBoneSlots(bodyPart.AsNullable(), type, slotId));
+
+        return bodyPartSlots;
+    }
+
+    /// <summary>
+    /// Gets the bone slots of this body part.
+    /// </summary>
+    public List<BoneSlot> GetBoneSlots(Entity<BodyPartComponent?> bodyPart, BoneType type = BoneType.None, string? slotId = null)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return new List<BoneSlot>();
+
+        var boneSlots = new List<BoneSlot>();
+        foreach (var boneSlot in bodyPart.Comp.Bones.Values)
+        {
+            if (!boneSlot.Type.HasFlag(type) || !string.IsNullOrEmpty(slotId) && boneSlot.Id != slotId)
+                continue;
+
+            boneSlots.Add(boneSlot);
+        }
+
+        return boneSlots;
+    }
+
+    /// <summary>
+    /// Gets the bone slots of this entity.
+    /// </summary>
+    public List<BoneSlot> GetBoneSlots(EntityUid parent, BoneType type = BoneType.None, string? slotId = null)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return GetBoneSlots((parent, bodyComponent), type, slotId);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return GetBoneSlots((parent, bodyPartComponent), type, slotId);
+
+        return new List<BoneSlot>();
+    }
+
+    #endregion
+
+    #region TryCreateBoneSlot
+
+    /// <summary>
+    /// Trying to create an bone slot for this body.
+    /// </summary>
+    public bool TryCreateBoneSlot(Entity<BodyPartComponent?> bodyPart, string boneId, BoneType type)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return false;
+
+        var boneSlot = new BoneSlot
+        {
+            Type = type,
+            ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetBoneContainerId(boneId))
+        };
+
+        if (!bodyPart.Comp.Bones.TryAdd(boneId, boneSlot))
+            return false;
+
+        Dirty(bodyPart);
+        return true;
+    }
+
+    #endregion
+
+    #region TryAttachBone
+
+    /// <summary>
+    /// Trying to attach a bone to this body.
+    /// </summary>
+    public bool TryAttachBone(Entity<BoneComponent?> body, Entity<BoneComponent?> bone, string slotId)
+    {
+        if (!Resolve(bone, ref bone.Comp)
+            || GetBoneSlots(body, bone.Comp.Type, slotId).FirstOrDefault() is not {} boneSlot
+            || boneSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(bone.Owner, boneSlot.ContainerSlot);
+    }
+
+    /// <summary>
+    /// Trying to attach a bone to this body part.
+    /// </summary>
+    public bool TryAttachBone(Entity<BodyPartComponent?> bodyPart, Entity<BoneComponent?> bone, string slotId)
+    {
+        if (!Resolve(bone, ref bone.Comp)
+            || GetBoneSlots(bodyPart, bone.Comp.Type, slotId).FirstOrDefault() is not {} boneSlot
+            || boneSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(bone.Owner, boneSlot.ContainerSlot);
+    }
+
+    /// <summary>
+    /// Trying to attach a bone to this entity.
+    /// </summary>
+    public bool TryAttachBone(EntityUid parent, Entity<BoneComponent?> bone, string slotId)
+    {
+        if (!Resolve(bone, ref bone.Comp)
+            || GetBoneSlots(parent, bone.Comp.Type, slotId).FirstOrDefault() is not {} boneSlot
+            || boneSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(bone.Owner, boneSlot.ContainerSlot);
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Systems/SharedBodySystem.Organ.cs b/Content.Shared/_White/Body/Systems/SharedBodySystem.Organ.cs
new file mode 100644
index 00000000000..8cb2f5fdd7a
--- /dev/null
+++ b/Content.Shared/_White/Body/Systems/SharedBodySystem.Organ.cs
@@ -0,0 +1,734 @@
+using System.Linq;
+using Content.Shared._White.Body.Components;
+using Content.Shared.Rejuvenate;
+using Robust.Shared.Containers;
+
+namespace Content.Shared._White.Body.Systems;
+
+public abstract partial class SharedBodySystem
+{
+    private void InitializeOrgan()
+    {
+        SubscribeLocalEvent<OrganComponent, EntGotInsertedIntoContainerMessage>(OnOrganGotInserted);
+        SubscribeLocalEvent<OrganComponent, EntGotRemovedFromContainerMessage>(OnOrganGotRemoved);
+        SubscribeLocalEvent<OrganComponent, OrganRelayedEvent<RejuvenateEvent>>(OnOrganRejuvenate);
+    }
+
+    #region Event Handling
+
+    private void OnOrganGotInserted(Entity<OrganComponent> ent, ref EntGotInsertedIntoContainerMessage args)
+    {
+        var containerSlotId = args.Container.ID;
+        if (containerSlotId.IndexOf(OrganSlotContainerIdPrefix, StringComparison.Ordinal) == -1)
+            return;
+
+        var parent = args.Container.Owner;
+        Entity<BodyComponent> body;
+
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            body = (parent, bodyComponent);
+        else if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+        {
+            if (!bodyPartComponent.Body.HasValue || !Resolve(bodyPartComponent.Body.Value, ref bodyComponent))
+            {
+                ent.Comp.Parent = parent;
+                Dirty(ent);
+
+                RaiseLocalEvent(ent, new OrganAddedEvent(ent, null, parent, args.Container.ID));
+
+                return;
+            }
+
+            body = (bodyPartComponent.Body.Value, bodyComponent);
+        }
+        else if (TryComp<BoneComponent>(parent, out var boneComponent))
+        {
+            if (!boneComponent.Body.HasValue || !Resolve(boneComponent.Body.Value, ref bodyComponent))
+            {
+                ent.Comp.Parent = parent;
+                Dirty(ent);
+
+                RaiseLocalEvent(ent, new OrganAddedEvent(ent, null, parent, containerSlotId));
+
+                return;
+            }
+
+            body = (boneComponent.Body.Value, bodyComponent);
+        }
+        else
+            return;
+
+        ent.Comp.Body = body;
+        ent.Comp.Parent = parent;
+        Dirty(ent);
+
+        SetOrganEnable(ent.AsNullable(), true);
+
+        var ev = new OrganAddedEvent(
+            ent,
+            body,
+            parent,
+            args.Container.ID);
+
+        RaiseLocalEvent(ent, ev);
+        RaiseLocalEvent(body, ev);
+    }
+
+    private void OnOrganGotRemoved(Entity<OrganComponent> ent, ref EntGotRemovedFromContainerMessage args)
+    {
+        var containerSlotId = args.Container.ID;
+        if (containerSlotId.IndexOf(OrganSlotContainerIdPrefix, StringComparison.Ordinal) == -1)
+            return;
+
+        var parent = args.Container.Owner;
+        Entity<BodyComponent> body;
+
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            body = (parent, bodyComponent);
+        else if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+        {
+            if (!bodyPartComponent.Body.HasValue || !Resolve(bodyPartComponent.Body.Value, ref bodyComponent))
+            {
+                ent.Comp.Parent = null;
+                Dirty(ent);
+
+                RaiseLocalEvent(ent, new OrganRemovedEvent(ent, null, parent, containerSlotId));
+
+                return;
+            }
+
+            body = (bodyPartComponent.Body.Value, bodyComponent);
+        }
+        else if (TryComp<BoneComponent>(parent, out var boneComponent))
+        {
+            if (!boneComponent.Body.HasValue || !Resolve(boneComponent.Body.Value, ref bodyComponent))
+            {
+                ent.Comp.Parent = null;
+                Dirty(ent);
+
+                RaiseLocalEvent(ent, new OrganRemovedEvent(ent, null, parent, args.Container.ID));
+
+                return;
+            }
+
+            body = (boneComponent.Body.Value, bodyComponent);
+        }
+        else
+            return;
+
+        ent.Comp.Body = null;
+        ent.Comp.Parent = null;
+        Dirty(ent);
+
+        SetOrganEnable(ent.AsNullable(), false);
+
+        var ev = new OrganRemovedEvent(
+            ent,
+            body,
+            parent,
+            args.Container.ID);
+
+        RaiseLocalEvent(ent, ev);
+        RaiseLocalEvent(body, ev);
+    }
+
+    private void OnOrganRejuvenate(Entity<OrganComponent> ent, ref OrganRelayedEvent<RejuvenateEvent> args) =>
+        SetOrganEnable(ent.AsNullable(), true);
+
+    #endregion
+
+    #region Private API
+
+    private void SetupOrgans(EntityUid parentUid, Dictionary<string, OrganSlot> organSlots)
+    {
+        foreach (var (organId, organSlot) in organSlots)
+        {
+            if (organSlot.HasOrgan || string.IsNullOrEmpty(organSlot.StartingOrgan))
+                continue;
+
+            organSlot.ContainerSlot = _container.EnsureContainer<ContainerSlot>(parentUid, GetOrganContainerId(organId));
+
+            var organ = Spawn(organSlot.StartingOrgan);
+
+            if (_container.Insert(organ, organSlot.ContainerSlot))
+                continue;
+
+            _sawmill.Error($"Couldn't insert {ToPrettyString(organ)} to {ToPrettyString(parentUid)}");
+            QueueDel(organ);
+        }
+    }
+
+    private void SetOrgansBody(Entity<BodyComponent>? body, EntityUid parent, IEnumerable<Entity<OrganComponent>> organs)
+    {
+        foreach (var organ in organs)
+        {
+            if (!_container.TryGetContainingContainer((organ, null, null), out var container) || container.Owner != parent)
+                continue;
+
+            if (body.HasValue)
+            {
+                var ev = new OrganAddedEvent(organ, body, parent, container.ID);
+                RaiseLocalEvent(organ, ev);
+                RaiseLocalEvent(body.Value, ev);
+            }
+            else if (TryComp<BodyComponent>(organ.Comp.Body, out var bodyComponent))
+            {
+                var ev = new OrganRemovedEvent(organ, (organ.Comp.Body.Value, bodyComponent), parent, container.ID);
+                RaiseLocalEvent(organ, ev);
+                RaiseLocalEvent(organ.Comp.Body.Value, ev);
+            }
+
+            organ.Comp.Body = body;
+            Dirty(organ);
+        }
+    }
+
+    #endregion
+
+    #region Public API
+
+    #region GetOrgans
+
+    /// <summary>
+    /// Gets the organs of this body.
+    /// </summary>
+    public List<Entity<OrganComponent>> GetOrgans(Entity<BodyComponent?> body, OrganType type = OrganType.None)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return new List<Entity<OrganComponent>>();
+
+        var organs = new List<Entity<OrganComponent>>();
+        foreach (var bodyPartSlot in body.Comp.BodyParts.Values)
+        {
+            if (!TryComp<BodyPartComponent>(bodyPartSlot.BodyPartUid, out var bodyPartComponent))
+                continue;
+
+            organs.AddRange(GetOrgans((bodyPartSlot.BodyPartUid.Value, bodyPartComponent), type));
+        }
+
+        foreach (var organSlot in body.Comp.Organs.Values)
+        {
+            if (!TryComp<OrganComponent>(organSlot.OrganUid, out var organComponent) || !organComponent.Type.HasFlag(type))
+                continue;
+
+            organs.Add((organSlot.OrganUid.Value, organComponent));
+        }
+
+        return organs;
+    }
+
+    /// <summary>
+    /// Gets the organs of this body part.
+    /// </summary>
+    public List<Entity<OrganComponent>> GetOrgans(Entity<BodyPartComponent?> bodyPart, OrganType type = OrganType.None)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return new List<Entity<OrganComponent>>();
+
+        var organs = new List<Entity<OrganComponent>>();
+        foreach (var organSlot in bodyPart.Comp.Organs.Values)
+        {
+            if (!TryComp<OrganComponent>(organSlot.OrganUid, out var organComponent) || !organComponent.Type.HasFlag(type))
+                continue;
+
+            organs.Add((organSlot.OrganUid.Value, organComponent));
+        }
+
+        foreach (var boneSlot in bodyPart.Comp.Bones.Values)
+        {
+            if (!TryComp<BoneComponent>(boneSlot.BoneUid, out var bone))
+                continue;
+
+            organs.AddRange(GetOrgans((boneSlot.BoneUid.Value, bone), type));
+        }
+
+        return organs;
+    }
+
+    /// <summary>
+    /// Gets the organs of this bone.
+    /// </summary>
+    public List<Entity<OrganComponent>> GetOrgans(Entity<BoneComponent?> bone, OrganType type = OrganType.None)
+    {
+        if (!Resolve(bone, ref bone.Comp))
+            return new List<Entity<OrganComponent>>();
+
+        var organs = new List<Entity<OrganComponent>>();
+        foreach (var organSlot in bone.Comp.Organs.Values)
+        {
+            if (!TryComp<OrganComponent>(organSlot.OrganUid, out var organComponent)
+                || !organComponent.Type.HasFlag(type))
+                continue;
+
+            organs.Add((organSlot.OrganUid.Value, organComponent));
+        }
+
+        return organs;
+    }
+
+    /// <summary>
+    /// Gets the organs of this entity.
+    /// </summary>
+    public List<Entity<OrganComponent>> GetOrgans(EntityUid parent, OrganType type = OrganType.None)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return GetOrgans((parent, bodyComponent), type);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return GetOrgans((parent, bodyPartComponent), type);
+
+        if (TryComp<BoneComponent>(parent, out var boneComponent))
+            return GetOrgans((parent, boneComponent), type);
+
+        return new List<Entity<OrganComponent>>();
+    }
+
+    #endregion
+
+    #region GetOrgans<T>
+
+    /// <summary>
+    /// Gets the organs of this body with the given component.
+    /// </summary>
+    public List<Entity<OrganComponent, T>> GetOrgans<T>(Entity<BodyComponent?> body, OrganType type = OrganType.None) where T : IComponent
+    {
+        var organs = new List<Entity<OrganComponent, T>>();
+        foreach (var organ in GetOrgans(body, type))
+        {
+            if (!TryComp<T>(organ, out var component))
+                continue;
+
+            organs.Add((organ.Owner, organ.Comp, component));
+        }
+
+        return organs;
+    }
+
+    /// <summary>
+    /// Gets the organs of this body part with the given component.
+    /// </summary>
+    public List<Entity<OrganComponent, T>> GetOrgans<T>(Entity<BodyPartComponent?> bodyPart, OrganType type = OrganType.None) where T : IComponent
+    {
+        var organs = new List<Entity<OrganComponent, T>>();
+        foreach (var organ in GetOrgans(bodyPart, type))
+        {
+            if (!TryComp<T>(organ, out var component))
+                continue;
+
+            organs.Add((organ.Owner, organ.Comp, component));
+        }
+
+        return organs;
+    }
+
+    /// <summary>
+    /// Gets the organs of this bone with the given component.
+    /// </summary>
+    public List<Entity<OrganComponent, T>> GetOrgans<T>(Entity<BoneComponent?> bone, OrganType type = OrganType.None) where T : IComponent
+    {
+        var organs = new List<Entity<OrganComponent, T>>();
+        foreach (var organ in GetOrgans(bone, type))
+        {
+            if (!TryComp<T>(organ, out var component))
+                continue;
+
+            organs.Add((organ.Owner, organ.Comp, component));
+        }
+
+        return organs;
+    }
+
+    /// <summary>
+    /// Gets the organs of this entity with the given component.
+    /// </summary>
+    public List<Entity<OrganComponent, T>> GetOrgans<T>(EntityUid parent, OrganType type = OrganType.None) where T : IComponent
+    {
+        var organs = new List<Entity<OrganComponent, T>>();
+        foreach (var organ in GetOrgans(parent, type))
+        {
+            if (!TryComp<T>(organ, out var component))
+                continue;
+
+            organs.Add((organ.Owner, organ.Comp, component));
+        }
+
+        return organs;
+    }
+
+    #endregion
+
+    #region GetOrganSlots
+
+    /// <summary>
+    /// Gets the organ slots of this body.
+    /// </summary>
+    public List<OrganSlot> GetOrganSlots(Entity<BodyComponent?> body, OrganType type = OrganType.None, string? slotId = null)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return new List<OrganSlot>();
+
+        var organSlots = new List<OrganSlot>();
+        foreach (var bodyPart in GetBodyParts(body))
+            organSlots.AddRange(GetOrganSlots(bodyPart.AsNullable(), type, slotId));
+
+        foreach (var organSlot in body.Comp.Organs.Values)
+        {
+            if (!organSlot.Type.HasFlag(type) || !string.IsNullOrEmpty(slotId) && organSlot.Id != slotId)
+                continue;
+
+            organSlots.Add(organSlot);
+        }
+
+        return organSlots;
+    }
+
+    /// <summary>
+    /// Gets the organ slots of this body part.
+    /// </summary>
+    public List<OrganSlot> GetOrganSlots(Entity<BodyPartComponent?> bodyPart, OrganType type = OrganType.None, string? slotId = null)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return new List<OrganSlot>();
+
+        var organSlots = new List<OrganSlot>();
+        foreach (var bone in GetBones(bodyPart))
+            organSlots.AddRange(GetOrganSlots(bone.AsNullable(), type, slotId));
+
+        foreach (var organSlot in bodyPart.Comp.Organs.Values)
+        {
+            if (!organSlot.Type.HasFlag(type) || !string.IsNullOrEmpty(slotId) && organSlot.Id != slotId)
+                continue;
+
+            organSlots.Add(organSlot);
+        }
+
+        return organSlots;
+    }
+
+    /// <summary>
+    /// Gets the organ slots of this bone.
+    /// </summary>
+    public List<OrganSlot> GetOrganSlots(Entity<BoneComponent?> bone, OrganType type = OrganType.None, string? slotId = null)
+    {
+        if (!Resolve(bone, ref bone.Comp))
+            return new List<OrganSlot>();
+
+        var organSlots = new List<OrganSlot>();
+        foreach (var organSlot in bone.Comp.Organs.Values)
+        {
+            if (!organSlot.Type.HasFlag(type) || !string.IsNullOrEmpty(slotId) && organSlot.Id != slotId)
+                continue;
+
+            organSlots.Add(organSlot);
+        }
+
+        return organSlots;
+    }
+
+    /// <summary>
+    /// Gets the organ slots of this entity.
+    /// </summary>
+    public List<OrganSlot> GetOrganSlots(EntityUid parent, OrganType type = OrganType.None, string? slotId = null)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return GetOrganSlots((parent, bodyComponent), type, slotId);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return GetOrganSlots((parent, bodyPartComponent), type, slotId);
+
+        return new List<OrganSlot>();
+    }
+
+    #endregion
+
+    #region TryGetOrgans
+
+    /// <summary>
+    /// Returns the organs of this body.
+    /// </summary>
+    public bool TryGetOrgans(Entity<BodyComponent?> body, out List<Entity<OrganComponent>> organs, OrganType type = OrganType.None)
+    {
+        organs = GetOrgans(body, type);
+        return organs.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the organs of this body part.
+    /// </summary>
+    public bool TryGetOrgans(Entity<BodyPartComponent?> bodyPart, out List<Entity<OrganComponent>> organs, OrganType type = OrganType.None)
+    {
+        organs = GetOrgans(bodyPart, type);
+        return organs.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the organs of this bone.
+    /// </summary>
+    public bool TryGetOrgans(Entity<BoneComponent?> bone, out List<Entity<OrganComponent>> organs, OrganType type = OrganType.None)
+    {
+        organs = GetOrgans(bone, type);
+        return organs.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the organs of this entity.
+    /// </summary>
+    public bool TryGetOrgans(EntityUid parent, out List<Entity<OrganComponent>> organs, OrganType type = OrganType.None)
+    {
+        organs = GetOrgans(parent, type);
+        return organs.Count != 0;
+    }
+
+    #endregion
+
+    #region TryGetOrgans<T>
+
+    /// <summary>
+    /// Returns the organs of this body with the given component.
+    /// </summary>
+    public bool TryGetOrgans<T>(Entity<BodyComponent?> body, out List<Entity<OrganComponent, T>> organs, OrganType type = OrganType.None) where T : IComponent
+    {
+        organs = GetOrgans<T>(body, type);
+        return organs.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the organs of this body part with the given component.
+    /// </summary>
+    public bool TryGetOrgans<T>(Entity<BodyPartComponent?> bodyPart, out List<Entity<OrganComponent, T>> organs, OrganType type = OrganType.None) where T : IComponent
+    {
+        organs = GetOrgans<T>(bodyPart, type);
+        return organs.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the organs of this bone with the given component.
+    /// </summary>
+    public bool TryGetOrgans<T>(Entity<BoneComponent?> bone, out List<Entity<OrganComponent, T>> organs, OrganType type = OrganType.None) where T : IComponent
+    {
+        organs = GetOrgans<T>(bone, type);
+        return organs.Count != 0;
+    }
+
+    /// <summary>
+    /// Returns the organs of this entity with the given component.
+    /// </summary>
+    public bool TryGetOrgans<T>(EntityUid parent, out List<Entity<OrganComponent, T>> organs, OrganType type = OrganType.None) where T : IComponent
+    {
+        organs = GetOrgans<T>(parent, type);
+        return organs.Count != 0;
+    }
+
+    #endregion
+
+    #region TryCreateOrganSlot
+
+    /// <summary>
+    /// Trying to create an organ slot for this body.
+    /// </summary>
+    public bool TryCreateOrganSlot(Entity<BodyComponent?> body, string organId, OrganType type)
+    {
+        if (!Resolve(body, ref body.Comp))
+            return false;
+
+        if (body.Comp.Organs.ContainsKey(organId))
+            return true;
+
+        var organSlot = new OrganSlot
+        {
+            Type = type,
+            ContainerSlot = _container.EnsureContainer<ContainerSlot>(body, GetOrganContainerId(organId))
+        };
+
+        if (!body.Comp.Organs.TryAdd(organId, organSlot))
+            return false;
+
+        Dirty(body);
+        return true;
+    }
+
+    /// <summary>
+    /// Trying to create an organ slot for this body part.
+    /// </summary>
+    public bool TryCreateOrganSlot(Entity<BodyPartComponent?> bodyPart, string organId, OrganType type)
+    {
+        if (!Resolve(bodyPart, ref bodyPart.Comp))
+            return false;
+
+        if (bodyPart.Comp.Organs.ContainsKey(organId))
+            return true;
+
+        var organSlot = new OrganSlot
+        {
+            Type = type,
+            ContainerSlot = _container.EnsureContainer<ContainerSlot>(bodyPart, GetOrganContainerId(organId))
+        };
+
+        if (!bodyPart.Comp.Organs.TryAdd(organId, organSlot))
+            return false;
+
+        Dirty(bodyPart);
+        return true;
+    }
+
+    /// <summary>
+    /// Trying to create an organ slot for this bone.
+    /// </summary>
+    public bool TryCreateOrganSlot(Entity<BoneComponent?> bone, string organId, OrganType type)
+    {
+        if (!Resolve(bone, ref bone.Comp))
+            return false;
+
+        if (bone.Comp.Organs.ContainsKey(organId))
+            return true;
+
+        var organSlot = new OrganSlot
+        {
+            Type = type,
+            ContainerSlot = _container.EnsureContainer<ContainerSlot>(bone, GetOrganContainerId(organId))
+        };
+
+        if (!bone.Comp.Organs.TryAdd(organId, organSlot))
+            return false;
+
+        Dirty(bone);
+        return true;
+    }
+
+    /// <summary>
+    /// Trying to create an organ slot for this entity.
+    /// </summary>
+    public bool TryCreateOrganSlot(EntityUid parent, string organId, OrganType type)
+    {
+        if (TryComp<BodyComponent>(parent, out var bodyComponent))
+            return TryCreateOrganSlot((parent, bodyComponent), organId, type);
+
+        if (TryComp<BodyPartComponent>(parent, out var bodyPartComponent))
+            return TryCreateOrganSlot((parent, bodyPartComponent), organId, type);
+
+        if (TryComp<BoneComponent>(parent, out var boneComponent))
+            return TryCreateOrganSlot((parent, boneComponent), organId, type);
+
+        return false;
+    }
+
+    #endregion
+
+    #region TryAttachOrgan
+
+    /// <summary>
+    /// Trying to attach an organ to this body.
+    /// </summary>
+    public bool TryAttachOrgan(Entity<BodyComponent?> body, Entity<OrganComponent?> organ, string slotId)
+    {
+        if (!Resolve(organ, ref organ.Comp)
+            || GetOrganSlots(body, organ.Comp.Type, slotId).FirstOrDefault() is not {} organSlot
+            || organSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(organ.Owner, organSlot.ContainerSlot);
+    }
+
+    /// <summary>
+    /// Trying to attach an organ to this body part.
+    /// </summary>
+    public bool TryAttachOrgan(Entity<BodyPartComponent?> bodyPart, Entity<OrganComponent?> organ, string slotId)
+    {
+        if (!Resolve(organ, ref organ.Comp)
+            || GetOrganSlots(bodyPart, organ.Comp.Type, slotId).FirstOrDefault() is not {} organSlot
+            || organSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(organ.Owner, organSlot.ContainerSlot);
+    }
+
+    /// <summary>
+    /// Trying to attach an organ to this bone.
+    /// </summary>
+    public bool TryAttachOrgan(Entity<BoneComponent?> bone, Entity<OrganComponent?> organ, string slotId)
+    {
+        if (!Resolve(organ, ref organ.Comp)
+            || GetOrganSlots(bone, organ.Comp.Type, slotId).FirstOrDefault() is not {} organSlot
+            || organSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(organ.Owner, organSlot.ContainerSlot);
+    }
+
+    /// <summary>
+    /// Trying to attach an organ to this entity.
+    /// </summary>
+    public bool TryAttachOrgan(EntityUid parent, Entity<OrganComponent?> organ, string slotId)
+    {
+        if (!Resolve(organ, ref organ.Comp)
+            || GetOrganSlots(parent, organ.Comp.Type, slotId).FirstOrDefault() is not {} organSlot
+            || organSlot.ContainerSlot is null)
+            return false;
+
+        return _container.Insert(organ.Owner, organSlot.ContainerSlot);
+    }
+
+    #endregion
+
+    #region TryCreateOrganSlotAndAttachOrgan
+
+    /// <summary>
+    /// Trying to create an organ slot for this body and attach an organ to this body.
+    /// </summary>
+    public bool TryCreateOrganSlotAndAttachOrgan(
+        Entity<BodyComponent?> body,
+        Entity<OrganComponent?> organ,
+        string slotId,
+        OrganType type
+        ) =>
+        TryCreateOrganSlot(body, slotId, type) && TryAttachOrgan(body, organ, slotId);
+
+    /// <summary>
+    /// Trying to create an organ slot for this body part and attach an organ to this body part.
+    /// </summary>
+    public bool TryCreateOrganSlotAndAttachOrgan(
+        Entity<BodyPartComponent?> bodyPart,
+        Entity<OrganComponent?> organ,
+        string slotId,
+        OrganType type
+        ) =>
+        TryCreateOrganSlot(bodyPart, slotId, type) && TryAttachOrgan(bodyPart, organ, slotId);
+
+    /// <summary>
+    /// Trying to create an organ slot for this bone and attach an organ to this bone.
+    /// </summary>
+    public bool TryCreateOrganSlotAndAttachOrgan(
+        Entity<BoneComponent?> bone,
+        Entity<OrganComponent?> organ,
+        string slotId,
+        OrganType type
+        ) =>
+        TryCreateOrganSlot(bone, slotId, type) && TryAttachOrgan(bone, organ, slotId);
+
+    /// <summary>
+    /// Trying to create an organ slot for this entity and attach an organ to this entity.
+    /// </summary>
+    public bool TryCreateOrganSlotAndAttachOrgan(
+        EntityUid parent,
+        Entity<OrganComponent?> organ,
+        string slotId,
+        OrganType type
+        ) =>
+        TryCreateOrganSlot(parent, slotId, type) && TryAttachOrgan(parent, organ, slotId);
+
+    #endregion
+
+    /// <summary>
+    /// Toggles the organ's functionality.
+    /// </summary>
+    public void SetOrganEnable(Entity<OrganComponent?> organ, bool value)
+    {
+        if (!Resolve(organ, ref organ.Comp) || organ.Comp.Enable == value)
+            return;
+
+        organ.Comp.Enable = value;
+        RaiseLocalEvent(organ, new AfterOrganToggledEvent(value));
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Systems/SharedBodySystem.Relay.cs b/Content.Shared/_White/Body/Systems/SharedBodySystem.Relay.cs
new file mode 100644
index 00000000000..81c06e7c806
--- /dev/null
+++ b/Content.Shared/_White/Body/Systems/SharedBodySystem.Relay.cs
@@ -0,0 +1,83 @@
+using Content.Shared._White.Body.Bloodstream.Systems;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Organs.Metabolizer;
+using Content.Shared._White.Body.Pain.Systems;
+using Content.Shared.Rejuvenate;
+
+namespace Content.Shared._White.Body.Systems;
+
+public abstract partial class SharedBodySystem
+{
+    private void InitializeRelay()
+    {
+        SubscribeLocalEvent<BodyComponent, GetBleedEvent>(RelayEventToBodyParts);
+        SubscribeLocalEvent<BodyComponent, GetPainEvent>(RelayEventToBodyParts);
+
+        SubscribeLocalEvent<BodyComponent, AfterBloodAmountChangedEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, ApplyMetabolicRateEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, GetMetabolicMultiplierEvent>(RelayEventToOrgans);
+        SubscribeLocalEvent<BodyComponent, GetMetabolicRateEvent>(RelayEventToOrgans);
+
+        SubscribeLocalEvent<BodyComponent, GetBloodReductionEvent>(RelayEventToAll);
+        SubscribeLocalEvent<BodyComponent, RejuvenateEvent>(RelayEventToAll);
+    }
+
+    protected void RelayEventToBones<T>(Entity<BodyComponent> body, ref T args) where T : struct
+    {
+        var ev = new BoneRelayedEvent<T>(body, args);
+        foreach (var organ in GetBones(body.AsNullable()))
+            RaiseLocalEvent(organ, ref ev);
+        args = ev.Args;
+    }
+
+    protected void RelayEventToBones<T>(EntityUid uid, BodyComponent component, T args) where T : class
+    {
+        var ev = new BoneRelayedEvent<T>((uid, component), args);
+        foreach (var organ in GetBones((uid, component)))
+            RaiseLocalEvent(organ, ref ev);
+    }
+
+    protected void RelayEventToBodyParts<T>(Entity<BodyComponent> body, ref T args) where T : struct
+    {
+        var ev = new BodyPartRelayedEvent<T>(body, args);
+        foreach (var organ in GetBodyParts(body.AsNullable()))
+            RaiseLocalEvent(organ, ref ev);
+        args = ev.Args;
+    }
+
+    protected void RelayEventToBodyParts<T>(EntityUid uid, BodyComponent component, T args) where T : class
+    {
+        var ev = new BodyPartRelayedEvent<T>((uid, component), args);
+        foreach (var organ in GetBodyParts((uid, component)))
+            RaiseLocalEvent(organ, ref ev);
+    }
+
+    protected void RelayEventToOrgans<T>(Entity<BodyComponent> body, ref T args) where T : struct
+    {
+        var ev = new OrganRelayedEvent<T>(body, args);
+        foreach (var organ in GetOrgans(body.AsNullable()))
+            RaiseLocalEvent(organ, ref ev);
+        args = ev.Args;
+    }
+
+    protected void RelayEventToOrgans<T>(EntityUid uid, BodyComponent component, T args) where T : class
+    {
+        var ev = new OrganRelayedEvent<T>((uid, component), args);
+        foreach (var organ in GetOrgans((uid, component)))
+            RaiseLocalEvent(organ, ref ev);
+    }
+
+    protected void RelayEventToAll<T>(Entity<BodyComponent> body, ref T args) where T : struct
+    {
+        RelayEventToBodyParts(body, ref args);
+        RelayEventToBones(body, ref args);
+        RelayEventToOrgans(body, ref args);
+    }
+
+    protected void RelayEventToAll<T>(EntityUid uid, BodyComponent component, T args) where T : class
+    {
+        RelayEventToBodyParts(uid, component, args);
+        RelayEventToBones(uid, component, args);
+        RelayEventToOrgans(uid, component, args);
+    }
+}
diff --git a/Content.Shared/_White/Body/Systems/SharedBodySystem.cs b/Content.Shared/_White/Body/Systems/SharedBodySystem.cs
new file mode 100644
index 00000000000..ae366d4e238
--- /dev/null
+++ b/Content.Shared/_White/Body/Systems/SharedBodySystem.cs
@@ -0,0 +1,180 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared.Humanoid.Markings;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Systems;
+
+public abstract partial class SharedBodySystem : EntitySystem
+{
+    /// <summary>
+    /// Container ID prefix for any organs.
+    /// </summary>
+    public const string OrganSlotContainerIdPrefix = "organ_slot_";
+
+    /// <summary>
+    /// Container ID prefix for any body parts.
+    /// </summary>
+    public const string BodyPartSlotContainerIdPrefix = "body_part_slot_";
+
+    /// <summary>
+    /// Container ID prefix for any bones.
+    /// </summary>
+    public const string BoneSlotContainerIdPrefix = "bone_slot_";
+
+    [Dependency] private readonly MarkingManager _marking = default!;
+    [Dependency] protected new readonly IPrototypeManager Prototype = default!;
+
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+
+    private ISawmill _sawmill = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _sawmill = Logger.GetSawmill("body");
+
+        InitializeAppearance();
+        InitializeBody();
+        InitializeBodyPart();
+        InitializeBone();
+        InitializeOrgan();
+        InitializeRelay();
+    }
+
+    /// <summary>
+    /// Gets the container id for the specified slotId.
+    /// </summary>
+    public static string GetBodyPartSlotContainerId(string slotId) => BodyPartSlotContainerIdPrefix + slotId;
+
+    /// <summary>
+    /// Gets the slot id for the specified container id.
+    /// </summary>
+    public string GetBodyPartSlotId(string containerSlotId)
+    {
+        var slotIndex = containerSlotId.IndexOf(BodyPartSlotContainerIdPrefix, StringComparison.Ordinal);
+
+        if (slotIndex < 0)
+            return string.Empty;
+
+        return containerSlotId.Remove(slotIndex, BodyPartSlotContainerIdPrefix.Length);
+    }
+
+    /// <summary>
+    /// Gets the container id for the specified slotId.
+    /// </summary>
+    public static string GetOrganContainerId(string slotId) => OrganSlotContainerIdPrefix + slotId;
+
+    /// <summary>
+    /// Gets the slot id for the specified container id.
+    /// </summary>
+    public string GetOrganSlotId(string containerSlotId)
+    {
+        var slotIndex = containerSlotId.IndexOf(OrganSlotContainerIdPrefix, StringComparison.Ordinal);
+
+        if (slotIndex < 0)
+            return string.Empty;
+
+        return containerSlotId.Remove(slotIndex, OrganSlotContainerIdPrefix.Length);
+    }
+
+    /// <summary>
+    /// Gets the container id for the specified slotId.
+    /// </summary>
+    public static string GetBoneContainerId(string slotId) => BoneSlotContainerIdPrefix + slotId;
+
+    /// <summary>
+    /// Gets the slot id for the specified container id.
+    /// </summary>
+    public string GetBoneSlotId(string containerSlotId)
+    {
+        var slotIndex = containerSlotId.IndexOf(BoneSlotContainerIdPrefix, StringComparison.Ordinal);
+
+        if (slotIndex < 0)
+            return string.Empty;
+
+        return containerSlotId.Remove(slotIndex, BoneSlotContainerIdPrefix.Length);
+    }
+}
+
+/// <summary>
+/// Raised on an organ after its toggled.
+/// </summary>
+public record struct AfterOrganToggledEvent(bool Enable);
+
+/// <summary>
+/// An event wrapper for passing events related to body parts.
+/// </summary>
+[ByRefEvent]
+public record struct BodyPartRelayedEvent<TEvent>(Entity<BodyComponent> Body, TEvent Args);
+
+/// <summary>
+/// An event wrapper for passing events related to bones.
+/// </summary>
+[ByRefEvent]
+public record struct BoneRelayedEvent<TEvent>(Entity<BodyComponent> Body, TEvent Args);
+
+/// <summary>
+/// An event wrapper for passing events related to organs.
+/// </summary>
+[ByRefEvent]
+public record struct OrganRelayedEvent<TEvent>(Entity<BodyComponent> Body, TEvent Args);
+
+/// <summary>
+/// Raised when a body part is attached to body.
+/// </summary>
+/// <param name="Part">The attached body part.</param>
+/// <param name="Body">The body to which the body part was attached.</param>
+/// <param name="SlotId">Container ID of Part.</param>
+public readonly record struct BodyPartAddedEvent(
+    Entity<BodyPartComponent> Part,
+    Entity<BodyComponent>? Body,
+    EntityUid Parent,
+    string SlotId);
+
+/// <summary>
+/// Raised when a body part is detached from body.
+/// </summary>
+/// <param name="Part">The detached body part.</param>
+/// <param name="Body">The body from which the body part was detached.</param>
+/// <param name="SlotId">Container ID of Part.</param>
+public readonly record struct BodyPartRemovedEvent(
+    Entity<BodyPartComponent> Part,
+    Entity<BodyComponent>? Body,
+    EntityUid Parent,
+    string SlotId);
+
+public readonly record struct BoneAddedEvent(
+    Entity<BoneComponent> Bone,
+    Entity<BodyComponent>? Body,
+    EntityUid Parent,
+    string SlotId);
+
+public readonly record struct BoneRemovedEvent(
+    Entity<BoneComponent> Bone,
+    Entity<BodyComponent>? Body,
+    EntityUid Parent,
+    string SlotId);
+
+/// <summary>
+/// Raised when an organ attaches to body.
+/// </summary>
+/// <param name="Body">The body to which the organ is attached.</param>
+/// <param name="Parent">The parent to which the organ is attached.</param>
+public readonly record struct OrganAddedEvent(
+    Entity<OrganComponent> Organ,
+    Entity<BodyComponent>? Body,
+    EntityUid Parent,
+    string SlotId);
+
+/// <summary>
+/// Raised when an organ detaches from body.
+/// </summary>
+/// <param name="Body">The body from which the organ is detached.</param>
+/// <param name="Parent">The parent from which the organ is detached.</param>
+public readonly record struct OrganRemovedEvent(
+    Entity<OrganComponent> Organ,
+    Entity<BodyComponent>? Body,
+    EntityUid Parent,
+    string SlotId);
diff --git a/Content.Shared/_White/Body/Wounds/Components/WoundComponent.cs b/Content.Shared/_White/Body/Wounds/Components/WoundComponent.cs
new file mode 100644
index 00000000000..f9133601365
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Components/WoundComponent.cs
@@ -0,0 +1,80 @@
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Wounds.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause, EntityCategory("Wounds")]
+public sealed partial class WoundComponent : Component
+{
+    /// <summary>
+    /// Indicates whether the wound is a scar or not.
+    /// </summary>
+    [DataField]
+    public bool IsScar;
+
+    /// <summary>
+    /// Damage type of this wound.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<DamageTypePrototype> DamageType;
+
+    /// <summary>
+    /// The description to use for this wound. Highest threshold used.
+    /// </summary>
+    [DataField]
+    public SortedDictionary<WoundSeverity, LocId> Descriptions = new();
+
+    /// <summary>
+    /// Thresholds for determining the severity of a wound relative to the damage received.
+    /// </summary>
+    [DataField]
+    public SortedDictionary<FixedPoint2, WoundSeverity> Thresholds = new()
+    {
+        {0, WoundSeverity.Healthy},
+        {15, WoundSeverity.Minor},
+        {40, WoundSeverity.Moderate},
+        {70, WoundSeverity.Severe},
+        {90, WoundSeverity.Critical},
+    };
+
+    /// <summary>
+    /// Body of this wound.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public EntityUid? Body;
+
+    /// <summary>
+    /// Parent body part for this wound.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public EntityUid? Parent;
+
+    /// <summary>
+    /// Actually, damage to this wound.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public FixedPoint2 DamageAmount;
+
+    /// <summary>
+    /// The time of the last positive change in the amount of damage.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField, AutoPausedField]
+    public TimeSpan WoundedAt = TimeSpan.Zero;
+
+    /// <summary>
+    /// The current severity of the wound.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public WoundSeverity WoundSeverity;
+}
+
+public enum WoundSeverity : byte
+{
+    Healthy,
+    Minor,
+    Moderate,
+    Severe,
+    Critical,
+}
diff --git a/Content.Shared/_White/Body/Wounds/Components/WoundableBodyPartComponent.cs b/Content.Shared/_White/Body/Wounds/Components/WoundableBodyPartComponent.cs
new file mode 100644
index 00000000000..5e123d3126d
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Components/WoundableBodyPartComponent.cs
@@ -0,0 +1,46 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Body.Wounds.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class WoundableBodyPartComponent : Component
+{
+    /// <summary>
+    /// Threshold values for determining the severity of wounds to a given body part in relation to the damage received.
+    /// </summary>
+    [DataField]
+    public SortedDictionary<FixedPoint2, WoundSeverity> Thresholds = new()
+    {
+        {0, WoundSeverity.Healthy},
+        {50, WoundSeverity.Minor},
+        {100, WoundSeverity.Moderate},
+        {150, WoundSeverity.Severe},
+        {200, WoundSeverity.Critical},
+    };
+
+    /// <summary>
+    /// A container that contains wounds.
+    /// </summary>
+    [ViewVariables]
+    public Container Container = new();
+
+    /// <summary>
+    /// Parent body for this part.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public EntityUid? Parent;
+
+    /// <summary>
+    /// List of all body part wounds.
+    /// </summary>
+    [ViewVariables]
+    public IReadOnlyList<EntityUid> Wounds => Container.ContainedEntities;
+
+    /// <summary>
+    /// The current severity of wounds to this body part.
+    /// </summary>
+    [ViewVariables, AutoNetworkedField]
+    public WoundSeverity WoundSeverity;
+}
diff --git a/Content.Shared/_White/Body/Wounds/Components/WoundableBoneComponent.cs b/Content.Shared/_White/Body/Wounds/Components/WoundableBoneComponent.cs
new file mode 100644
index 00000000000..ff467725779
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Components/WoundableBoneComponent.cs
@@ -0,0 +1,62 @@
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Wounds.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
+public sealed partial class WoundableBoneComponent : Component
+{
+    /// <summary>
+    /// Bone strength value depending on the current state of the bone.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<BoneStatus, float> StrengthThresholds;
+
+    /// <summary>
+    /// Bone health. The lower this value, the less the bone protects internal organs.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 Health = 100;
+
+    /// <summary>
+    /// Maximum bone health.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 MaximumHealth = 100;
+
+    /// <summary>
+    /// Bone strength multiplier. The higher this value, the less damage the bone takes and the better it protects internal organs.
+    /// </summary>
+    [DataField]
+    public float StrengthMultiplier = 1f;
+
+    /// <summary>
+    /// Damage that can affect bone health.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<DamageTypePrototype>> SupportedDamageType = new();
+
+    /// <summary>
+    /// Bone status which is applied depending on the current health. The lowest threshold is selected.
+    /// </summary>
+    [DataField(required: true)]
+    public SortedDictionary<FixedPoint2, BoneStatus> BoneStatusThresholds;
+
+    [ViewVariables, AutoNetworkedField]
+    public BoneStatus CurrentBoneStatusThreshold = BoneStatus.Whole;
+
+    [ViewVariables]
+    public float CurrentStrength => StrengthThresholds[CurrentBoneStatusThreshold] * StrengthMultiplier;
+}
+
+[Serializable, NetSerializable]
+public enum BoneStatus : byte
+{
+    Whole,
+    Damaged,
+    Cracked,
+    Broken
+}
diff --git a/Content.Shared/_White/Body/Wounds/Components/WoundableComponent.cs b/Content.Shared/_White/Body/Wounds/Components/WoundableComponent.cs
new file mode 100644
index 00000000000..f59fe1b3ed2
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Components/WoundableComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.Body.Wounds.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class WoundableComponent : Component
+{
+    /// <summary>
+    /// List of all body wounds.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public Dictionary<BodyPartType, IReadOnlyList<EntityUid>> Wounds = new();
+}
diff --git a/Content.Shared/_White/Body/Wounds/Components/WoundableOrganComponent.cs b/Content.Shared/_White/Body/Wounds/Components/WoundableOrganComponent.cs
new file mode 100644
index 00000000000..19f87304fea
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Components/WoundableOrganComponent.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Body.Wounds.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
+public sealed partial class WoundableOrganComponent : Component
+{
+    /// <summary>
+    /// Organ health.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public FixedPoint2 Health = 100;
+
+    /// <summary>
+    /// Maximum organ health.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 MaximumHealth = 100;
+
+    /// <summary>
+    /// Damage that can affect organ health.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<DamageTypePrototype>> SupportedDamageType = new();
+
+    /// <summary>
+    /// Organ status which is applied depending on the current health. The lowest threshold is selected.
+    /// </summary>
+    [DataField(required: true)]
+    public SortedDictionary<FixedPoint2, OrganStatus> OrganStatusThresholds;
+
+    [ViewVariables, AutoNetworkedField]
+    public OrganStatus CurrentOrganStatusThreshold = OrganStatus.Healthy;
+}
+
+[Serializable, NetSerializable]
+public enum OrganStatus : byte
+{
+    Healthy,
+    Bruised,
+    Damaged,
+    Critical,
+    Dead
+}
diff --git a/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.BodyPart.cs b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.BodyPart.cs
new file mode 100644
index 00000000000..33f63ee7310
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.BodyPart.cs
@@ -0,0 +1,178 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared._White.Gibbing;
+using Content.Shared._White.Threshold;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Rejuvenate;
+using Robust.Shared.Containers;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._White.Body.Wounds.Systems;
+
+public abstract partial class SharedWoundSystem
+{
+    private void InitializeBodyPart()
+    {
+        SubscribeLocalEvent<WoundableBodyPartComponent, AttemptEntityContentsGibEvent>(OnAttemptEntityContentsGib);
+        SubscribeLocalEvent<WoundableBodyPartComponent, ComponentInit>(OnBodyPartInit);
+        SubscribeLocalEvent<WoundableBodyPartComponent, DamageChangedEvent>(OnBodyPartDamageChanged);
+        SubscribeLocalEvent<WoundableBodyPartComponent, BodyPartRelayedEvent<RejuvenateEvent>>(OnBodyPartRejuvenate);
+    }
+
+    #region Event Handling
+
+    private void OnAttemptEntityContentsGib(Entity<WoundableBodyPartComponent> woundableBodyPart, ref AttemptEntityContentsGibEvent args)
+    {
+        foreach (var wound in GetWounds(woundableBodyPart.AsNullable(), scar:true))
+            PredictedQueueDel(wound.Owner);
+    }
+
+    private void OnBodyPartInit(Entity<WoundableBodyPartComponent> woundableBodyPart, ref ComponentInit args) =>
+        woundableBodyPart.Comp.Container = _container.EnsureContainer<Container>(woundableBodyPart.Owner, WoundsContainerId);
+
+    private void OnBodyPartDamageChanged(Entity<WoundableBodyPartComponent> woundableBodyPart, ref DamageChangedEvent args)
+    {
+        if (args.DamageDelta?.AnyPositive() != true)
+            return;
+
+        foreach (var bone in _body.GetBones<WoundableBoneComponent>(woundableBodyPart))
+            ApplyBoneDamage(bone.AsNullable(), args.DamageDelta);
+    }
+
+    private void OnBodyPartRejuvenate(Entity<WoundableBodyPartComponent> woundableBodyPart, ref BodyPartRelayedEvent<RejuvenateEvent> args)
+    {
+        if (!TryComp<DamageableComponent>(woundableBodyPart, out var damageable))
+            return;
+
+        foreach (var wound in GetWounds(woundableBodyPart.AsNullable(), scar:true))
+            PredictedQueueDel(wound.Owner);
+
+        Damageable.SetAllDamage(woundableBodyPart, damageable, FixedPoint2.Zero);
+    }
+
+    #endregion
+
+    #region Public API
+
+    public List<Entity<WoundableBodyPartComponent>> GetWoundableBodyParts(Entity<WoundableComponent?> woundable, string? damageType = null, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        if (!Resolve(woundable, ref woundable.Comp))
+            return new List<Entity<WoundableBodyPartComponent>>();
+
+        var woundableBodyParts = new List<Entity<WoundableBodyPartComponent>>();
+        foreach (var bodyPart in _body.GetBodyParts<WoundableBodyPartComponent>(woundable.Owner, bodyPartType))
+        {
+            if (!HasWounds((bodyPart, bodyPart.Comp2), damageType))
+                continue;
+
+            woundableBodyParts.Add((bodyPart, bodyPart.Comp2));
+        }
+
+        return woundableBodyParts;
+    }
+
+    public List<Entity<BodyPartComponent, WoundableBodyPartComponent>> GetWoundableBodyParts(Entity<WoundableComponent?> woundable, DamageSpecifier damage, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        if (!Resolve(woundable, ref woundable.Comp))
+            return new List<Entity<BodyPartComponent, WoundableBodyPartComponent>>();
+
+        var bodyParts = new List<Entity<BodyPartComponent, WoundableBodyPartComponent>>();
+        foreach (var bodyPart in _body.GetBodyParts<WoundableBodyPartComponent>(woundable.Owner, bodyPartType))
+        {
+            if (!HasWounds((bodyPart, bodyPart.Comp2), damage))
+                continue;
+
+            bodyParts.Add(bodyPart);
+        }
+
+        return bodyParts;
+    }
+
+    #endregion
+
+    #region Private API
+
+    private DamageSpecifier ApplyBodyPartDamage(
+        Entity<BodyPartComponent?, WoundableBodyPartComponent?, DamageableComponent?> bodyPart,
+        DamageSpecifier damage,
+        Entity<WoundableComponent?>? woundable = null,
+        bool ignoreResistance = false
+        )
+    {
+        var bodyPartDamage = new DamageSpecifier();
+
+        if (!Resolve(bodyPart, ref bodyPart.Comp1, ref bodyPart.Comp2, ref bodyPart.Comp3))
+            return bodyPartDamage;
+
+        woundable ??= bodyPart.Comp1.Body;
+
+        foreach (var (damageType, damageValue) in damage.DamageDict)
+        {
+            if (damageValue == 0
+                || !bodyPart.Comp3.Damage.DamageDict.ContainsKey(damageType)
+                || !_prototype.TryIndex<DamageTypePrototype>(damageType, out var damageTypePrototype))
+                continue;
+
+            var newDamageValue = damageValue;
+            if (!ignoreResistance)
+            {
+                if (_prototype.TryIndex(bodyPart.Comp3.DamageModifierSetId, out var modifierSet))
+                {
+                    var floatDamageValue = damageValue.Float();
+                    if (modifierSet.FlatReduction.TryGetValue(damageType, out var reduction))
+                        floatDamageValue = Math.Max(0f, floatDamageValue - reduction);
+
+                    if (modifierSet.Coefficients.TryGetValue(damageType, out var coefficient))
+                        floatDamageValue *= coefficient;
+
+                    newDamageValue = FixedPoint2.New(floatDamageValue);
+                }
+
+                var modifyDamage = new DamageSpecifier();
+                modifyDamage.DamageDict.Add(damageType, newDamageValue);
+
+                if (woundable.HasValue)
+                {
+                    var damageModify = new DamageModifyEvent(modifyDamage, woundable, bodyPart.Comp1.Type);
+                    RaiseLocalEvent(woundable.Value, damageModify);
+
+                    newDamageValue = damageModify.Damage[damageType];
+                }
+            }
+
+            var wound = GetWounds((bodyPart, bodyPart.Comp2), damageType).FirstOrNull();
+            if (!wound.HasValue
+                && (damageTypePrototype.Wound is not { } woundPrototype
+                    || !TryCreateWound(
+                        (bodyPart, bodyPart.Comp1, bodyPart.Comp2),
+                        woundPrototype,
+                        out wound,
+                        woundable)))
+                continue;
+
+            newDamageValue = ChangeWoundDamage(wound.Value.AsNullable(), newDamageValue);
+
+            if (!bodyPartDamage.DamageDict.TryAdd(damageType, newDamageValue))
+                bodyPartDamage.DamageDict[damageType] += newDamageValue;
+        }
+
+        bodyPart.Comp3.Damage.ApplyDamage(bodyPartDamage);
+        Damageable.DamageChanged(bodyPart, bodyPart.Comp3, bodyPartDamage);
+        bodyPart.Comp2.WoundSeverity = bodyPart.Comp2.Thresholds.HighestMatch(bodyPart.Comp3.TotalDamage) ?? WoundSeverity.Healthy;
+
+        foreach (var organSlot in bodyPart.Comp1.Organs.Values)
+        {
+            if (!TryComp<WoundableOrganComponent>(organSlot.OrganUid, out var woundableOrgan))
+                continue;
+
+            ApplyOrganDamage((organSlot.OrganUid.Value, null, woundableOrgan), bodyPartDamage);
+        }
+
+        return bodyPartDamage;
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Bone.cs b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Bone.cs
new file mode 100644
index 00000000000..7cfd1b57a09
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Bone.cs
@@ -0,0 +1,89 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared._White.Threshold;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Content.Shared.Rejuvenate;
+
+namespace Content.Shared._White.Body.Wounds.Systems;
+
+public abstract partial class SharedWoundSystem
+{
+    private void InitializeBone() =>
+        SubscribeLocalEvent<WoundableBoneComponent, BoneRelayedEvent<RejuvenateEvent>>(OnBoneRejuvenate);
+
+    #region Event Handling
+
+    private void OnBoneRejuvenate(Entity<WoundableBoneComponent> woundableBone, ref BoneRelayedEvent<RejuvenateEvent> args)
+    {
+        woundableBone.Comp.Health = woundableBone.Comp.MaximumHealth;
+        CheckBoneStatusThreshold((woundableBone, null, woundableBone));
+    }
+
+    #endregion
+
+    #region Private API
+
+    private void ApplyBoneDamage(Entity<BoneComponent?, WoundableBoneComponent?> bone, DamageSpecifier damage)
+    {
+        if (!Resolve(bone, ref bone.Comp1, ref bone.Comp2))
+            return;
+
+        var totalDamageDelta = FixedPoint2.Zero;
+        var organDamage = new DamageSpecifier();
+
+        foreach (var (damageType, damageValue) in damage.DamageDict)
+        {
+            if (damageValue <= 0 || !bone.Comp2.SupportedDamageType.Contains(damageType))
+                continue;
+
+            var damageDelta = FixedPoint2.Max(damageValue - bone.Comp2.CurrentStrength, FixedPoint2.Zero);
+            if (damageDelta == FixedPoint2.Zero)
+                continue;
+
+            var organDamageDelta = FixedPoint2.Max(damageDelta - bone.Comp2.CurrentStrength, FixedPoint2.Zero);
+            if (organDamageDelta > FixedPoint2.Zero)
+                organDamage.DamageDict.Add(damageType, organDamageDelta);
+
+            totalDamageDelta += damageDelta;
+        }
+
+        if (totalDamageDelta  == FixedPoint2.Zero)
+            return;
+
+        bone.Comp2.Health = FixedPoint2.Max(bone.Comp2.Health - totalDamageDelta, FixedPoint2.Zero);
+        DirtyField(bone, bone.Comp2, nameof(WoundableBoneComponent.Health));
+
+        RaiseLocalEvent(bone, new BoneHealthChangedEvent((bone, bone.Comp2), totalDamageDelta));
+
+        CheckBoneStatusThreshold(bone);
+
+        foreach (var organ in _body.GetOrgans<WoundableOrganComponent>((bone, bone.Comp1)))
+            ApplyOrganDamage(organ.AsNullable(), organDamage);
+    }
+
+    private void CheckBoneStatusThreshold(Entity<BoneComponent?, WoundableBoneComponent?> bone)
+    {
+        if (!Resolve(bone, ref bone.Comp1, ref bone.Comp2))
+            return;
+
+        var boneStatus = bone.Comp2.BoneStatusThresholds.LowestMatch(bone.Comp2.Health) ?? BoneStatus.Whole;
+        if (bone.Comp2.CurrentBoneStatusThreshold == boneStatus)
+            return;
+
+        bone.Comp2.CurrentBoneStatusThreshold = boneStatus;
+        DirtyField(bone, bone.Comp2, nameof(WoundableBoneComponent.CurrentBoneStatusThreshold));
+
+        var ev = new BoneStatusChangedEvent((bone, bone.Comp2), boneStatus);
+        RaiseLocalEvent(bone, ev);
+
+        if (bone.Comp1.Body.HasValue)
+            RaiseLocalEvent(bone.Comp1.Body.Value, ev);
+
+        if (bone.Comp1.Parent.HasValue)
+            RaiseLocalEvent(bone.Comp1.Parent.Value, ev);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Organ.cs b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Organ.cs
new file mode 100644
index 00000000000..53ca151fa14
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Organ.cs
@@ -0,0 +1,89 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared._White.Threshold;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Content.Shared.Rejuvenate;
+
+namespace Content.Shared._White.Body.Wounds.Systems;
+
+public abstract partial class SharedWoundSystem
+{
+    private void InitializeOrgan() =>
+        SubscribeLocalEvent<WoundableOrganComponent, OrganRelayedEvent<RejuvenateEvent>>(OnOrganRejuvenate);
+
+    #region Event Handling
+
+    private void OnOrganRejuvenate(Entity<WoundableOrganComponent> ent, ref OrganRelayedEvent<RejuvenateEvent> args) =>
+        ChangeOrganDamage((ent, null, ent), ent.Comp.Health - ent.Comp.MaximumHealth);
+
+    #endregion
+
+    #region Private API
+
+    private void CheckOrganStatusThreshold(Entity<OrganComponent?, WoundableOrganComponent?> organ)
+    {
+        if (!Resolve(organ, ref organ.Comp1, ref organ.Comp2))
+            return;
+
+        var organStatus = organ.Comp2.OrganStatusThresholds.LowestMatch(organ.Comp2.Health) ?? OrganStatus.Healthy;
+        if (organ.Comp2.CurrentOrganStatusThreshold == organStatus)
+            return;
+
+        organ.Comp2.CurrentOrganStatusThreshold = organStatus;
+        DirtyField(organ, organ.Comp2, nameof(WoundableOrganComponent.CurrentOrganStatusThreshold));
+
+        if (organStatus == OrganStatus.Dead)
+            _body.SetOrganEnable(organ, false);
+
+        var ev = new OrganStatusChangedEvent((organ, organ.Comp1, organ.Comp2), organStatus);
+        RaiseLocalEvent(organ, ev);
+
+        if (organ.Comp1.Body.HasValue)
+            RaiseLocalEvent(organ.Comp1.Body.Value, ev);
+
+        if (organ.Comp1.Parent.HasValue)
+            RaiseLocalEvent(organ.Comp1.Parent.Value, ev);
+    }
+
+    #endregion
+
+    #region Public API
+
+    public void ChangeOrganDamage(Entity<OrganComponent?, WoundableOrganComponent?> organ, FixedPoint2 damage)
+    {
+        if (!Resolve(organ, ref organ.Comp1, ref organ.Comp2))
+            return;
+
+        organ.Comp2.Health = FixedPoint2.Clamp(organ.Comp2.Health - damage, FixedPoint2.Zero, organ.Comp2.MaximumHealth);
+        DirtyField(organ, organ.Comp2, nameof(WoundableOrganComponent.Health));
+
+        RaiseLocalEvent(organ, new OrganHealthChangedEvent((organ, organ.Comp1, organ.Comp2), damage));
+
+        CheckOrganStatusThreshold(organ);
+    }
+
+    public void ApplyOrganDamage(Entity<OrganComponent?, WoundableOrganComponent?> organ, DamageSpecifier damage)
+    {
+        if (!Resolve(organ, ref organ.Comp1, ref organ.Comp2))
+            return;
+
+        var totalDamageDelta = FixedPoint2.Zero;
+
+        foreach (var (damageType, damageValue) in damage.DamageDict)
+        {
+            if (damageValue <= 0 || !organ.Comp2.SupportedDamageType.Contains(damageType))
+                continue;
+
+            totalDamageDelta += damageValue;
+        }
+
+        if (totalDamageDelta  == FixedPoint2.Zero)
+            return;
+
+        ChangeOrganDamage(organ, totalDamageDelta);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Wound.cs b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Wound.cs
new file mode 100644
index 00000000000..24984879854
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Wound.cs
@@ -0,0 +1,227 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared._White.Threshold;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._White.Body.Wounds.Systems;
+
+public abstract partial class SharedWoundSystem
+{
+    #region Public API
+
+    public FixedPoint2 ChangeWoundDamage(Entity<WoundComponent?> wound, FixedPoint2 damageAmount)
+    {
+        if (!Resolve(wound, ref wound.Comp))
+            return FixedPoint2.Zero;
+
+        var oldDamage = wound.Comp.DamageAmount;
+        wound.Comp.DamageAmount = FixedPoint2.Max(oldDamage + damageAmount, FixedPoint2.Zero);
+        wound.Comp.WoundSeverity = wound.Comp.Thresholds.HighestMatch(wound.Comp.DamageAmount) ?? WoundSeverity.Healthy;
+
+        if (wound.Comp.DamageAmount > oldDamage)
+            wound.Comp.WoundedAt = _gameTiming.CurTime;
+
+        Dirty(wound);
+
+        var ev = new WoundDamageChangedEvent((wound, wound.Comp), oldDamage);
+        RaiseLocalEvent(wound, ev);
+
+        if (wound.Comp.Body.HasValue)
+            RaiseLocalEvent(wound.Comp.Body.Value, ev);
+
+        if (wound.Comp.Parent.HasValue)
+            RaiseLocalEvent(wound.Comp.Parent.Value, ev);
+
+        if (wound.Comp.IsScar && wound.Comp.DamageAmount == FixedPoint2.Zero)
+            PredictedDel(wound.Owner);
+
+        return wound.Comp.DamageAmount - oldDamage;
+    }
+
+    public bool TryCreateWound(
+        Entity<BodyPartComponent?, WoundableBodyPartComponent?> bodyPart,
+        EntProtoId woundToSpawn,
+        [NotNullWhen(true)] out Entity<WoundComponent>? wound,
+        Entity<WoundableComponent?>? woundable = null
+    )
+    {
+        wound = null;
+
+        if (!Resolve(bodyPart, ref bodyPart.Comp1, ref bodyPart.Comp2)
+            || !PredictedTrySpawnInContainer(woundToSpawn, bodyPart, WoundsContainerId, out var woundUid))
+            return false;
+
+        if (!TryComp<WoundComponent>(woundUid, out var woundComponent))
+        {
+            PredictedQueueDel(woundUid);
+            return false;
+        }
+
+        wound = (woundUid.Value, woundComponent);
+        woundComponent.Parent = bodyPart;
+        woundComponent.WoundedAt = _gameTiming.CurTime;
+
+        if (woundable == null && TryComp<WoundableComponent>(bodyPart.Comp2.Parent, out var woundableComponent))
+            woundable = (bodyPart.Comp2.Parent.Value,  woundableComponent);
+
+        if (woundable is {} woundableEntity && Resolve(woundableEntity, ref woundableEntity.Comp))
+            woundableEntity.Comp.Wounds[bodyPart.Comp1.Type] = bodyPart.Comp2.Wounds;
+
+        woundComponent.Body = woundable;
+
+        return true;
+    }
+
+    public List<Entity<WoundComponent>> GetWounds(Entity<WoundableComponent?> woundable, string? damageType = null, bool scar = false, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        if (!Resolve(woundable, ref woundable.Comp))
+            return new List<Entity<WoundComponent>>();
+
+        var wounds = new List<Entity<WoundComponent>>();
+        foreach (var (woundBodyPartType, woundList) in woundable.Comp.Wounds)
+        {
+            if (!bodyPartType.HasFlag(woundBodyPartType))
+                continue;
+
+            foreach (var wound in woundList)
+            {
+                if (!TryComp<WoundComponent>(wound, out var woundComponent)
+                    || !string.IsNullOrEmpty(damageType) && woundComponent.DamageType != damageType
+                    || woundComponent.IsScar && !scar)
+                    continue;
+
+                wounds.Add((wound, woundComponent));
+            }
+        }
+
+        return wounds;
+    }
+
+    public List<Entity<WoundComponent>> GetWounds(Entity<WoundableBodyPartComponent?> woundableBodyPart, string? damageType = null, bool scar = false)
+    {
+        if (!Resolve(woundableBodyPart, ref woundableBodyPart.Comp))
+            return new List<Entity<WoundComponent>>();
+
+        var wounds = new List<Entity<WoundComponent>>();
+        foreach (var wound in woundableBodyPart.Comp.Wounds)
+        {
+            if (!TryComp<WoundComponent>(wound, out var woundComponent)
+                || !string.IsNullOrEmpty(damageType) && woundComponent.DamageType != damageType
+                || woundComponent.IsScar && !scar)
+                continue;
+
+            wounds.Add((wound, woundComponent));
+        }
+
+        return wounds;
+    }
+
+    public List<Entity<WoundComponent>> GetWounds(EntityUid parent, string? damageType = null, bool scar = false, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        if (TryComp<WoundableComponent>(parent, out var woundableComponent))
+            return GetWounds((parent, woundableComponent), damageType, scar, bodyPartType);
+
+        if (TryComp<WoundableBodyPartComponent>(parent, out var woundableBodyPartComponent))
+            return GetWounds((parent, woundableBodyPartComponent), damageType, scar);
+
+        return new List<Entity<WoundComponent>>();
+    }
+
+    public List<Entity<WoundComponent, T>> GetWounds<T>(Entity<WoundableComponent?> woundable, string? damageType = null, bool scar = false, BodyPartType bodyPartType = BodyPartType.All) where T : IComponent
+    {
+        var wounds = new List<Entity<WoundComponent, T>>();
+        foreach (var wound in GetWounds(woundable, damageType, scar, bodyPartType))
+        {
+            if (!TryComp<T>(wound, out var component))
+                continue;
+
+            wounds.Add((wound.Owner, wound.Comp, component));
+        }
+
+        return wounds;
+    }
+
+    public List<Entity<WoundComponent, T>> GetWounds<T>(Entity<WoundableBodyPartComponent?> woundableBodyPart, string? damageType = null, bool scar = false, BodyPartType bodyPartType = BodyPartType.All) where T : IComponent
+    {
+        var wounds = new List<Entity<WoundComponent, T>>();
+        foreach (var wound in GetWounds(woundableBodyPart, damageType, scar, bodyPartType))
+        {
+            if (!TryComp<T>(wound, out var component))
+                continue;
+
+            wounds.Add((wound.Owner, wound.Comp, component));
+        }
+
+        return wounds;
+    }
+
+    public List<Entity<WoundComponent, T>> GetWounds<T>(EntityUid parent, string? damageType = null, bool scar = false, BodyPartType bodyPartType = BodyPartType.All) where T : IComponent
+    {
+        var wounds = new List<Entity<WoundComponent, T>>();
+        foreach (var wound in GetWounds(parent, damageType, scar, bodyPartType))
+        {
+            if (!TryComp<T>(wound, out var component))
+                continue;
+
+            wounds.Add((wound.Owner, wound.Comp, component));
+        }
+
+        return wounds;
+    }
+
+    public bool HasWounds(Entity<WoundableComponent?> woundable, string? damageType = null, bool scar = false, BodyPartType bodyPartType = BodyPartType.All) =>
+        GetWounds(woundable, damageType, scar, bodyPartType).Count > 0;
+
+    public bool HasWounds(Entity<WoundableBodyPartComponent?> woundableBodyPart, string? damageType = null, bool scar = false) =>
+        GetWounds(woundableBodyPart, damageType, scar).Count > 0;
+
+    public bool HasWounds(EntityUid parent, string? damageType = null, bool scar = false, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        if (TryComp<WoundableComponent>(parent, out var woundableComponent))
+            return HasWounds((parent, woundableComponent), damageType, scar, bodyPartType);
+
+        if (TryComp<WoundableBodyPartComponent>(parent, out var woundableBodyPartComponent))
+            return HasWounds((parent, woundableBodyPartComponent), damageType, scar);
+
+        return false;
+    }
+
+    public bool HasWounds(Entity<WoundableComponent?> woundable, DamageSpecifier damage, bool scar = false, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        foreach (var damageType in damage.DamageDict.Keys)
+        {
+            if (HasWounds(woundable, damageType, scar, bodyPartType))
+                return true;
+        }
+
+        return false;
+    }
+
+    public bool HasWounds(Entity<WoundableBodyPartComponent?> woundableBodyPart, DamageSpecifier damage, bool scar = false)
+    {
+        foreach (var damageType in damage.DamageDict.Keys)
+        {
+            if (HasWounds(woundableBodyPart, damageType, scar))
+                return true;
+        }
+
+        return false;
+    }
+
+    public bool HasWounds(EntityUid parent, DamageSpecifier damage, bool scar = false, BodyPartType bodyPartType = BodyPartType.All)
+    {
+        if (TryComp<WoundableComponent>(parent, out var woundableComponent))
+            return HasWounds((parent, woundableComponent), damage, scar, bodyPartType);
+
+        if (TryComp<WoundableBodyPartComponent>(parent, out var woundableBodyPartComponent))
+            return HasWounds((parent, woundableBodyPartComponent), damage, scar);
+
+        return false;
+    }
+
+    #endregion
+}
+
diff --git a/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Woundable.cs b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Woundable.cs
new file mode 100644
index 00000000000..2d84a6986b8
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.Woundable.cs
@@ -0,0 +1,84 @@
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared.Damage;
+
+namespace Content.Shared._White.Body.Wounds.Systems;
+
+public abstract partial class SharedWoundSystem
+{
+    private void InitializeWoundable()
+    {
+        SubscribeLocalEvent<WoundableComponent, BodyPartAddedEvent>(OnBodyPartAdded);
+        SubscribeLocalEvent<WoundableComponent, BodyPartRemovedEvent>(OnBodyPartRemoved);
+
+        SubscribeLocalEvent<WoundableComponent, BeforeDamageCommitEvent>(OnBeforeDamageCommit);
+    }
+
+    #region Event Handling
+
+    private void OnBodyPartAdded(Entity<WoundableComponent> woundable, ref BodyPartAddedEvent args)
+    {
+        if (!TryComp<DamageableComponent>(woundable, out var damageableBodyComponent)
+            || !TryComp<DamageableComponent>(args.Part, out var damageableBodyPartComponent)
+            || !TryComp<WoundableBodyPartComponent>(args.Part, out var woundableBodyPartComponent))
+            return;
+
+        woundableBodyPartComponent.Parent = woundable;
+
+        damageableBodyComponent.Damage.ExclusiveAdd(damageableBodyPartComponent.Damage);
+        Damageable.DamageChanged(woundable, damageableBodyComponent, damageableBodyPartComponent.Damage);
+
+        woundable.Comp.Wounds[args.Part.Comp.Type] = woundableBodyPartComponent.Wounds;
+    }
+
+    private void OnBodyPartRemoved(Entity<WoundableComponent> woundable, ref BodyPartRemovedEvent args)
+    {
+        if (!TryComp<DamageableComponent>(woundable, out var damageableBodyComponent)
+            || !TryComp<DamageableComponent>(args.Part, out var damageableBodyPartComponent)
+            || !TryComp<WoundableBodyPartComponent>(args.Part, out var woundableBodyPartComponent))
+            return;
+
+        woundableBodyPartComponent.Parent = null;
+
+        var damageDelta = -damageableBodyPartComponent.Damage;
+
+        damageableBodyComponent.Damage.ExclusiveAdd(damageDelta);
+        Damageable.DamageChanged(woundable, damageableBodyComponent, damageDelta);
+
+        woundable.Comp.Wounds.Remove(args.Part.Comp.Type);
+    }
+
+    private void OnBeforeDamageCommit(Entity<WoundableComponent> woundable, ref BeforeDamageCommitEvent args)
+    {
+        if (!TryComp<DamageableComponent>(woundable, out var damageableBodyComponent))
+            return;
+
+        var bodyParts = _body.GetBodyParts<WoundableBodyPartComponent>(woundable.Owner, args.BodyPartType);
+        var damage = args.Damage / bodyParts.Count;
+        var bodyDamage = new DamageSpecifier();
+
+        foreach (var bodyPart in bodyParts)
+        {
+            var bodyPartDamage = ApplyBodyPartDamage(bodyPart.AsNullable(), damage, woundable.AsNullable(), args.IgnoreResistances);
+
+            foreach (var (damageType, damageValue) in bodyPartDamage.DamageDict)
+            {
+                if (!bodyDamage.DamageDict.TryAdd(damageType, damageValue))
+                    bodyDamage.DamageDict[damageType] += damageValue;
+            }
+        }
+
+        if (bodyDamage.Empty)
+            return;
+
+        damageableBodyComponent.Damage.ApplyDamage(bodyDamage);
+        Damageable.DamageChanged(woundable, damageableBodyComponent, bodyDamage);
+
+        RaiseLocalEvent(woundable, new WoundableDamageChangedEvent(bodyDamage));
+
+        args.Damage = bodyDamage;
+        args.Handled = true;
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.cs b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.cs
new file mode 100644
index 00000000000..90528473b12
--- /dev/null
+++ b/Content.Shared/_White/Body/Wounds/Systems/SharedWoundSystem.cs
@@ -0,0 +1,67 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared._White.Body.Wounds.Components;
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._White.Body.Wounds.Systems;
+
+public abstract partial class SharedWoundSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    [Dependency] protected readonly DamageableSystem Damageable = default!;
+
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+
+    private const string WoundsContainerId = "wounds";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeBodyPart();
+        InitializeBone();
+        InitializeOrgan();
+        InitializeWoundable();
+    }
+}
+
+/// <summary>
+/// Raised on wound after changing damage.
+/// </summary>
+public sealed class WoundDamageChangedEvent(Entity<WoundComponent> wound, FixedPoint2 oldDamage) : HandledEntityEventArgs
+{
+    public readonly Entity<WoundComponent> Wound = wound;
+    public readonly FixedPoint2 OldDamage = oldDamage;
+}
+
+/// <summary>
+/// Raised on woudable entity after changing the damage of its wound.
+/// </summary>
+public record struct WoundableDamageChangedEvent(DamageSpecifier DamageDelta);
+
+/// <summary>
+/// Raised on bone entity after changing his health.
+/// </summary>
+public record struct BoneHealthChangedEvent(Entity<WoundableBoneComponent> Bone, FixedPoint2 DamageDelta);
+
+/// <summary>
+/// Raised on bone entity after changing his state.
+/// </summary>
+public record struct BoneStatusChangedEvent(Entity<WoundableBoneComponent> Bone, BoneStatus BoneState);
+
+/// <summary>
+/// Raised on organ entity after changing his health.
+/// </summary>
+public record struct OrganHealthChangedEvent(Entity<OrganComponent, WoundableOrganComponent> Organ, FixedPoint2 DamageDelta);
+
+/// <summary>
+/// Raised on organ entity after changing his state.
+/// </summary>
+public record struct OrganStatusChangedEvent(Entity<OrganComponent, WoundableOrganComponent> Organ, OrganStatus OrganStatus);
diff --git a/Content.Shared/_White/Chemistry/Reagent/BloodReagentData.cs b/Content.Shared/_White/Chemistry/Reagent/BloodReagentData.cs
new file mode 100644
index 00000000000..fc41bff8bc0
--- /dev/null
+++ b/Content.Shared/_White/Chemistry/Reagent/BloodReagentData.cs
@@ -0,0 +1,24 @@
+using Content.Shared._White.Body.Bloodstream;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._White.Chemistry.Reagent;
+
+[ImplicitDataDefinitionForInheritors, Serializable, NetSerializable]
+public sealed partial class BloodReagentData : ReagentData
+{
+    [DataField]
+    public BloodGroup BloodGroup = new (BloodType.O, BloodRhesusFactor.Negative);
+
+    public override ReagentData Clone() => this;
+
+    public override bool Equals(ReagentData? other)
+    {
+        if (other is not BloodReagentData data)
+            return false;
+
+        return data.BloodGroup == BloodGroup;
+    }
+
+    public override int GetHashCode() => BloodGroup.GetHashCode();
+}
diff --git a/Content.Shared/Gibbing/Components/GibbableComponent.cs b/Content.Shared/_White/Gibbing/GibbableComponent.cs
similarity index 86%
rename from Content.Shared/Gibbing/Components/GibbableComponent.cs
rename to Content.Shared/_White/Gibbing/GibbableComponent.cs
index 9c7501f0282..2c0619569fa 100644
--- a/Content.Shared/Gibbing/Components/GibbableComponent.cs
+++ b/Content.Shared/_White/Gibbing/GibbableComponent.cs
@@ -1,11 +1,10 @@
-using Content.Shared.Gibbing.Systems;
-using Robust.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Gibbing.Components;
+namespace Content.Shared._White.Gibbing;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(GibbingSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedGibbingSystem))]
 public sealed partial class GibbableComponent : Component
 {
     /// <summary>
@@ -32,3 +31,10 @@ public sealed partial class GibbableComponent : Component
     [DataField, AutoNetworkedField]
     public float GibScatterRange = 0.3f;
 }
+
+public enum GibType : byte
+{
+    Skip,
+    Drop,
+    Gib,
+}
diff --git a/Content.Shared/_White/Gibbing/SharedGibbingSystem.cs b/Content.Shared/_White/Gibbing/SharedGibbingSystem.cs
new file mode 100644
index 00000000000..61464286f2f
--- /dev/null
+++ b/Content.Shared/_White/Gibbing/SharedGibbingSystem.cs
@@ -0,0 +1,492 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Numerics;
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Content.Shared.Inventory;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Shared._White.Gibbing;
+
+public abstract class SharedGibbingSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    private const float GibletLaunchImpulse = 8;
+    private const float GibletLaunchImpulseVariance = 3;
+
+    public bool TryGibBody(
+        Entity<BodyComponent?, GibbableComponent?> body,
+        out HashSet<EntityUid> gibs,
+        bool gibOrgans = false,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null
+    )
+    {
+        gibs = GibBody(body, gibOrgans, splatDirection, splatModifier, splatCone, gibSoundOverride);
+        if (gibs.Count != 0)
+            return true;
+
+        return false;
+    }
+
+    public virtual HashSet<EntityUid> GibBody(
+        Entity<BodyComponent?, GibbableComponent?> body,
+        bool gibOrgans = false,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null
+        )
+    {
+        var gibs = new HashSet<EntityUid>();
+
+        if (!Resolve(body, ref body.Comp1, logMissing: false))
+            return gibs;
+
+        if (Resolve(body, ref body.Comp2, logMissing: false))
+            gibSoundOverride ??= body.Comp2.GibSound;
+
+        var parts = _body.GetBodyParts((body, body.Comp1)).ToArray();
+        gibs.EnsureCapacity(parts.Length);
+
+        foreach (var part in parts)
+        {
+            TryGibEntity(
+                body,
+                part.Owner,
+                GibType.Gib,
+                GibType.Skip,
+                ref gibs,
+                playAudio: false,
+                launchGibs:true,
+                launchDirection:splatDirection,
+                launchImpulse: GibletLaunchImpulse * splatModifier,
+                launchImpulseVariance:GibletLaunchImpulseVariance,
+                launchCone: splatCone);
+
+            if (!gibOrgans)
+                continue;
+
+            foreach (var (_, organContainer) in part.Comp.Organs)
+            {
+                if (organContainer.OrganUid is null)
+                    continue;
+
+                TryGibEntity(
+                    body,
+                    organContainer.OrganUid.Value,
+                    GibType.Drop,
+                    GibType.Skip,
+                    ref gibs,
+                    playAudio: false,
+                    launchImpulse: GibletLaunchImpulse * splatModifier,
+                    launchImpulseVariance:GibletLaunchImpulseVariance,
+                    launchCone: splatCone);
+            }
+        }
+
+        if (HasComp<InventoryComponent>(body))
+        {
+            foreach (var item in _inventory.GetHandOrInventoryEntities(body.Owner))
+            {
+                _transform.AttachToGridOrMap(item);
+                gibs.Add(item);
+            }
+        }
+
+        _audio.PlayPredicted(gibSoundOverride, Transform(body).Coordinates, null);
+        return gibs;
+    }
+
+    public bool TryGibEntity(
+        EntityUid outerEntity,
+        Entity<GibbableComponent?> gibbable,
+        GibType gibType,
+        GibType gibOption,
+        ref HashSet<EntityUid> droppedEntities,
+        bool launchGibs = true,
+        Vector2? launchDirection = null,
+        float launchImpulse = 0f,
+        float launchImpulseVariance = 0f,
+        Angle launchCone = default,
+        float randomSpreadMod = 1.0f,
+        bool playAudio = true,
+        List<string>? allowedContainers = null,
+        List<string>? excludedContainers = null,
+        bool logMissingGibable = false
+        )
+    {
+        if (!Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            DropEntity(
+                gibbable,
+                Transform(outerEntity),
+                randomSpreadMod,
+                ref droppedEntities,
+                launchGibs,
+                launchDirection,
+                launchImpulse,
+                launchImpulseVariance,
+                launchCone);
+
+            if (logMissingGibable)
+            {
+                Log.Warning(
+                    $"{ToPrettyString(gibbable)} does not have a GibbableComponent! " +
+                            $"This is not required but may cause issues contained items to not be dropped.");
+            }
+
+            return false;
+        }
+
+        if (gibType == GibType.Skip && gibOption == GibType.Skip)
+            return true;
+
+        if (launchGibs)
+            randomSpreadMod = 0;
+
+        var parentXform = Transform(outerEntity);
+        HashSet<BaseContainer> validContainers = new();
+
+        var gibContentsAttempt =
+            new AttemptEntityContentsGibEvent(gibbable, gibOption, allowedContainers, excludedContainers);
+        RaiseLocalEvent(gibbable, ref gibContentsAttempt);
+
+        foreach (var container in _container.GetAllContainers(gibbable))
+        {
+            var valid = true;
+            if (allowedContainers != null)
+                valid = allowedContainers.Contains(container.ID);
+            if (excludedContainers != null)
+                valid = valid && !excludedContainers.Contains(container.ID);
+            if (valid)
+                validContainers.Add(container);
+        }
+
+        switch (gibOption)
+        {
+            case GibType.Skip:
+                break;
+            case GibType.Drop:
+            {
+                foreach (var container in validContainers)
+                {
+                    var entities = container.ContainedEntities.ToList();
+                    foreach(var ent in entities)
+                    {
+                        DropEntity(
+                            new Entity<GibbableComponent?>(ent, null),
+                            parentXform,
+                            randomSpreadMod,
+                            ref droppedEntities,
+                            launchGibs,
+                            launchDirection,
+                            launchImpulse,
+                            launchImpulseVariance,
+                            launchCone);
+                    }
+                }
+
+                break;
+            }
+            case GibType.Gib:
+            {
+                foreach (var container in validContainers)
+                {
+                    var entities = container.ContainedEntities.ToList();
+                    foreach(var ent in entities)
+                    {
+                        GibEntity(
+                            new Entity<GibbableComponent?>(ent, null),
+                            parentXform,
+                            randomSpreadMod,
+                            ref droppedEntities,
+                            launchGibs,
+                            launchDirection,
+                            launchImpulse,
+                            launchImpulseVariance,
+                            launchCone);
+                    }
+                }
+
+                break;
+            }
+        }
+
+        switch (gibType)
+        {
+            case GibType.Skip:
+                break;
+            case GibType.Drop:
+            {
+                DropEntity(
+                    gibbable,
+                    parentXform,
+                    randomSpreadMod,
+                    ref droppedEntities,
+                    launchGibs,
+                    launchDirection,
+                    launchImpulse,
+                    launchImpulseVariance,
+                    launchCone);
+                break;
+            }
+            case GibType.Gib:
+            {
+                GibEntity(
+                    gibbable,
+                    parentXform,
+                    randomSpreadMod,
+                    ref droppedEntities,
+                    launchGibs,
+                    launchDirection,
+                    launchImpulse,
+                    launchImpulseVariance,
+                    launchCone);
+                QueueDel(gibbable);
+                break;
+            }
+        }
+
+        if (playAudio)
+            _audio.PlayPredicted(gibbable.Comp.GibSound, parentXform.Coordinates, null);
+
+        return true;
+    }
+
+    #region PrivateAPI
+
+    private void DropEntity(
+        Entity<GibbableComponent?> gibbable,
+        TransformComponent parentXform,
+        float randomSpreadMod,
+        ref HashSet<EntityUid> droppedEntities,
+        bool flingEntity,
+        Vector2? scatterDirection,
+        float scatterImpulse,
+        float scatterImpulseVariance,
+        Angle scatterCone
+        )
+    {
+        var gibCount = 0;
+        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+            gibCount = gibbable.Comp.GibCount;
+
+        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
+        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
+        switch (gibAttemptEvent.GibType)
+        {
+            case GibType.Skip:
+                return;
+            case GibType.Gib:
+                GibEntity(
+                    gibbable,
+                    parentXform,
+                    randomSpreadMod,
+                    ref droppedEntities,
+                    flingEntity,
+                    scatterDirection,
+                    scatterImpulse,
+                    scatterImpulseVariance,
+                    scatterCone,
+                    deleteTarget: false);
+                return;
+        }
+
+        _transform.AttachToGridOrMap(gibbable);
+        _transform.SetCoordinates(gibbable, parentXform.Coordinates);
+        _transform.SetWorldRotation(gibbable, _random.NextAngle());
+
+        droppedEntities.Add(gibbable);
+
+        if (flingEntity)
+            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+
+        var gibbedEvent = new EntityGibbedEvent(gibbable, new List<EntityUid> {gibbable, });
+        RaiseLocalEvent(gibbable, ref gibbedEvent);
+    }
+
+    private void GibEntity(
+        Entity<GibbableComponent?> gibbable,
+        TransformComponent parentXform,
+        float randomSpreadMod,
+        ref HashSet<EntityUid> droppedEntities,
+        bool flingEntity,
+        Vector2? scatterDirection,
+        float scatterImpulse,
+        float scatterImpulseVariance,
+        Angle scatterCone,
+        bool deleteTarget = true
+    )
+    {
+        var localGibs = new List<EntityUid>();
+        var gibCount = 0;
+        var gibProtoCount = 0;
+
+        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            gibCount = gibbable.Comp.GibCount;
+            gibProtoCount = gibbable.Comp.GibPrototypes.Count;
+        }
+
+        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
+        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
+
+        switch (gibAttemptEvent.GibType)
+        {
+            case GibType.Skip:
+                return;
+            case GibType.Drop:
+                DropEntity(
+                    gibbable,
+                    parentXform,
+                    randomSpreadMod,
+                    ref droppedEntities,
+                    flingEntity,
+                    scatterDirection,
+                    scatterImpulse,
+                    scatterImpulseVariance,
+                    scatterCone);
+
+                localGibs.Add(gibbable);
+                return;
+        }
+
+        if (gibbable.Comp != null && gibProtoCount > 0)
+        {
+            if (flingEntity)
+            {
+                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
+                {
+                    if (!TryCreateRandomGiblet(
+                        gibbable.Comp,
+                        parentXform.Coordinates,
+                        false,
+                        out var giblet,
+                        randomSpreadMod))
+                        continue;
+
+                    FlingDroppedEntity(
+                        giblet.Value,
+                        scatterDirection,
+                        scatterImpulse,
+                        scatterImpulseVariance,
+                        scatterCone);
+
+                    droppedEntities.Add(giblet.Value);
+                }
+            }
+            else
+            {
+                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
+                {
+                    if (TryCreateRandomGiblet(
+                        gibbable.Comp,
+                        parentXform.Coordinates,
+                        false,
+                        out var giblet,
+                        randomSpreadMod))
+                        droppedEntities.Add(giblet.Value);
+                }
+            }
+        }
+
+        _transform.AttachToGridOrMap(gibbable, Transform(gibbable));
+
+        if (flingEntity)
+            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+
+        var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
+        RaiseLocalEvent(gibbable, ref gibbedEvent);
+
+        if (deleteTarget)
+            PredictedQueueDel(gibbable.Owner); // WD EDIT
+    }
+
+    private void FlingDroppedEntity(
+        EntityUid target,
+        Vector2? direction,
+        float impulse,
+        float impulseVariance,
+        Angle scatterConeAngle
+        )
+    {
+        var scatterAngle = direction?.ToAngle() ?? _random.NextAngle();
+        var scatterVector = _random.NextAngle(scatterAngle - scatterConeAngle / 2, scatterAngle + scatterConeAngle / 2)
+            .ToVec() * (impulse + _random.NextFloat(impulseVariance));
+        _physics.ApplyLinearImpulse(target, scatterVector);
+    }
+
+    private bool TryCreateRandomGiblet(
+        GibbableComponent gibbable,
+        EntityCoordinates coords,
+        bool playSound,
+        [NotNullWhen(true)] out EntityUid? gibletEntity,
+        float? randomSpreadModifier = null
+        )
+    {
+        gibletEntity = null;
+        if (gibbable.GibPrototypes.Count == 0)
+            return false;
+
+        gibletEntity = Spawn(
+            gibbable.GibPrototypes[_random.Next(0, gibbable.GibPrototypes.Count)],
+            randomSpreadModifier == null
+                ? coords
+                : coords.Offset(_random.NextVector2(gibbable.GibScatterRange * randomSpreadModifier.Value)));
+
+        if (playSound)
+            _audio.PlayPredicted(gibbable.GibSound, coords, null);
+
+        _transform.SetWorldRotation(gibletEntity.Value, _random.NextAngle());
+        return true;
+    }
+
+    #endregion
+}
+
+/// <summary>
+/// Called just before we actually gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibed</param>
+/// <param name="GibType">What type of gibbing is occuring</param>
+/// <param name="AllowedContainers">Containers we are allow to gib</param>
+/// <param name="ExcludedContainers">Containers we are allow not allowed to gib</param>
+[ByRefEvent] public record struct AttemptEntityContentsGibEvent(
+    EntityUid Target,
+    GibType GibType,
+    List<string>? AllowedContainers,
+    List<string>? ExcludedContainers
+);
+
+/// <summary>
+/// Called just before we actually gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibed</param>
+/// <param name="GibletCount">how many giblets to spawn</param>
+/// <param name="GibType">What type of gibbing is occuring</param>
+[ByRefEvent] public record struct AttemptEntityGibEvent(EntityUid Target, int GibletCount, GibType GibType);
+
+/// <summary>
+/// Called immediately after we gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibbed</param>
+/// <param name="DroppedEntities">Any entities that are spilled out (if any)</param>
+[ByRefEvent] public record struct EntityGibbedEvent(EntityUid Target, List<EntityUid> DroppedEntities);
+
+
diff --git a/Content.Shared/_White/Guns/SharedGunFluxSystem.cs b/Content.Shared/_White/Guns/SharedGunFluxSystem.cs
index 6ae90d2b272..8bd8bc281b1 100644
--- a/Content.Shared/_White/Guns/SharedGunFluxSystem.cs
+++ b/Content.Shared/_White/Guns/SharedGunFluxSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared._Shitmed.Targeting;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Destructible;
 using Content.Shared.Examine;
@@ -94,16 +93,6 @@ protected virtual void OnGunShot(EntityUid uid, GunFluxComponent comp, ref GunSh
         TryMalfunction(args.User, uid, comp, core);
         if (overflow != 0)
         {
-            var hand = _hands.GetActiveHand(args.User);
-
-            // i hate shitmed I Hate Shitmed I HATE SHITMED
-            var targetBodyPart = hand?.Location switch
-            {
-                Shared.Hands.Components.HandLocation.Right => TargetBodyPart.RightHand,
-                Shared.Hands.Components.HandLocation.Left => TargetBodyPart.LeftHand,
-                Shared.Hands.Components.HandLocation.Middle => TargetBodyPart.Torso
-            };
-
             if(overflow > 0)
             {
                 var damage = overflow * comp.OverflowDamage * core.OverflowDamageMultiplier;
@@ -111,7 +100,7 @@ protected virtual void OnGunShot(EntityUid uid, GunFluxComponent comp, ref GunSh
 
                 _popup.PopupClient(Loc.GetString(comp.OverflowDamageMessage, ("gun", Name(uid))), args.User, PopupType.SmallCaution);
                 _audio.PlayLocal(comp.OverflowDamageSound, args.User, args.User);
-                ApplyOverheatDamage(args.User, damage, comp.OverflowDamageType, targetBodyPart);
+                ApplyOverheatDamage(args.User, damage, comp.OverflowDamageType);
             }
             else
             {
@@ -121,7 +110,7 @@ protected virtual void OnGunShot(EntityUid uid, GunFluxComponent comp, ref GunSh
 
                 _popup.PopupClient(Loc.GetString(comp.UnderflowDamageMessage, ("gun", Name(uid))), args.User, PopupType.SmallCaution);
                 _audio.PlayLocal(comp.UnderflowDamageSound, args.User, args.User);
-                ApplyOverheatDamage(args.User, damage, comp.UnderflowDamageType, targetBodyPart);
+                ApplyOverheatDamage(args.User, damage, comp.UnderflowDamageType);
             }
         }
     }
@@ -237,7 +226,7 @@ public float AddFlux(FluxCoreComponent comp, float flux)
         return overflow;
     }
 
-    protected virtual void ApplyOverheatDamage(EntityUid shooter, float damage, string type, TargetBodyPart? bodyPart) { }
+    protected virtual void ApplyOverheatDamage(EntityUid shooter, float damage, string type) { }
     protected virtual void TryMalfunction(EntityUid shooter, EntityUid gun, GunFluxComponent fluxComp, FluxCoreComponent core) { }
 
 }
diff --git a/Content.Shared/_White/Humanoid/Prototypes/BodyTypePrototype.cs b/Content.Shared/_White/Humanoid/Prototypes/BodyTypePrototype.cs
index 2cde8f7a17e..b50243d9033 100644
--- a/Content.Shared/_White/Humanoid/Prototypes/BodyTypePrototype.cs
+++ b/Content.Shared/_White/Humanoid/Prototypes/BodyTypePrototype.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Humanoid;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared._White.Humanoid.Prototypes;
@@ -18,15 +17,6 @@ public sealed class BodyTypePrototype : IPrototype
     [DataField(required: true)]
     public string Name { get; } = default!;
 
-    /// <summary>
-    ///     Sprites that this species will use on the given humanoid
-    ///     visual layer. If a key entry is empty, it is assumed that the
-    ///     visual layer will not be in use on this species, and will
-    ///     be ignored.
-    /// </summary>
-    [DataField(required: true)]
-    public Dictionary<HumanoidVisualLayers, string> Sprites = new();
-
     /// <summary>
     ///     Which sex can't use this body type.
     /// </summary>
diff --git a/Content.Shared/_White/Random/PredictedRandomExtensions.cs b/Content.Shared/_White/Random/PredictedRandomExtensions.cs
new file mode 100644
index 00000000000..66557cb62bd
--- /dev/null
+++ b/Content.Shared/_White/Random/PredictedRandomExtensions.cs
@@ -0,0 +1,151 @@
+using Robust.Shared.Utility;
+
+namespace Content.Shared._White.Random;
+
+public static class PredictedRandomExtensions
+{
+    private static readonly double DoubleFactor = 1.0 / int.MaxValue;
+    private static readonly float FloatFactor = (float) DoubleFactor;
+
+    /// <inheritdoc cref="Next(PredictedRandomManager, int, int)"/>
+    public static int Next(this PredictedRandomManager randomManager, EntityUid entity, int minValue, int maxValue) =>
+        MinMax(randomManager.Next(entity), maxValue, minValue);
+
+    /// <inheritdoc cref="Next(PredictedRandomManager, int, int)"/>
+    public static int Next(this PredictedRandomManager randomManager, NetEntity netEntity, int minValue, int maxValue) =>
+        MinMax(randomManager.Next(netEntity), maxValue, minValue);
+
+    /// <inheritdoc cref="Next(PredictedRandomManager, int, int)"/>
+    public static int Next(this PredictedRandomManager randomManager, long seed, int minValue, int maxValue) =>
+        MinMax(randomManager.Next(seed), maxValue, minValue);
+
+    /// <inheritdoc cref="Next(PredictedRandomManager, int, int)"/>
+    public static int Next(this PredictedRandomManager randomManager, Xoroshiro64S random, int minValue, int maxValue) =>
+        MinMax(randomManager.Next(random), maxValue, minValue);
+
+    /// <summary>Get randomManager <see cref="int"/> value in range of <paramref name="minValue"/> (included) and <paramref name="maxValue"/> (excluded). </summary>
+    /// <param name="randomManager">The <see cref="PredictedRandomManager">randomManager</see> instance to run on.</param>
+    /// <param name="minValue">randomManager value should be greater or equal to this value.</param>
+    /// <param name="maxValue">randomManager value should be less than this value.</param>
+    public static int Next(this PredictedRandomManager randomManager, int minValue, int maxValue) =>
+        MinMax(randomManager.Next(), maxValue, minValue);
+
+    /// <inheritdoc cref="NextAngle(PredictedRandomManager)"/>
+    public static Angle NextAngle(this PredictedRandomManager randomManager, EntityUid entity) =>
+        NextFloat(randomManager, entity) * MathF.Tau;
+
+    /// <inheritdoc cref="NextAngle(PredictedRandomManager)"/>
+    public static Angle NextAngle(this PredictedRandomManager randomManager, NetEntity netEntity) =>
+        NextFloat(randomManager, netEntity) * MathF.Tau;
+
+    /// <inheritdoc cref="NextAngle(PredictedRandomManager)"/>
+    public static Angle NextAngle(this PredictedRandomManager randomManager, long seed) =>
+        NextFloat(randomManager, seed) * MathF.Tau;
+
+    /// <inheritdoc cref="NextAngle(PredictedRandomManager)"/>
+    public static Angle NextAngle(this PredictedRandomManager randomManager, Xoroshiro64S random) =>
+        NextFloat(randomManager, random) * MathF.Tau;
+
+    /// <summary> Get random <see cref="Angle"/> value in range of 0 (included) and <see cref="MathF.Tau"/> (excluded). </summary>
+    public static Angle NextAngle(this PredictedRandomManager randomManager) =>
+        NextFloat(randomManager) * MathF.Tau;
+
+    /// <inheritdoc cref="NextDouble(PredictedRandomManager)"/>
+    public static double NextDouble(this PredictedRandomManager randomManager, EntityUid entity) =>
+        randomManager.Next(entity) * DoubleFactor;
+
+    /// <inheritdoc cref="NextDouble(PredictedRandomManager)"/>
+    public static double NextDouble(this PredictedRandomManager randomManager, NetEntity netEntity) =>
+        randomManager.Next(netEntity) * DoubleFactor;
+
+    /// <inheritdoc cref="NextDouble(PredictedRandomManager)"/>
+    public static double NextDouble(this PredictedRandomManager randomManager, long seed) =>
+        randomManager.Next(seed) * DoubleFactor;
+
+    /// <inheritdoc cref="NextDouble(PredictedRandomManager)"/>
+    public static double NextDouble(this PredictedRandomManager randomManager, Xoroshiro64S random) =>
+        randomManager.Next(random) * DoubleFactor;
+
+    /// <summary> Get randomManager <see cref="double"/> value between 0 (included) and 1 (excluded). </summary>
+    public static double NextDouble(this PredictedRandomManager randomManager) =>
+        randomManager.Next() * DoubleFactor;
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, EntityUid entity) =>
+        randomManager.Next(entity) * FloatFactor;
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, NetEntity netEntity) =>
+        randomManager.Next(netEntity) * FloatFactor;
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, long seed) =>
+        randomManager.Next(seed) * FloatFactor;
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, Xoroshiro64S random) =>
+        randomManager.Next(random) * FloatFactor;
+
+    /// <summary> Get randomManager <see cref="float"/> value between 0 (included) and 1 (excluded). </summary>
+    public static float NextFloat(this PredictedRandomManager randomManager) =>
+        randomManager.Next() * FloatFactor;
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager, float, float)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, EntityUid entity, float minValue, float maxValue) =>
+        MinMax(randomManager.NextFloat(entity), maxValue, minValue);
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager, float, float)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, NetEntity netEntity, float minValue, float maxValue) =>
+        MinMax(randomManager.NextFloat(netEntity), maxValue, minValue);
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager, float, float)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, long seed, float minValue, float maxValue) =>
+        MinMax(randomManager.NextFloat(seed), maxValue, minValue);
+
+    /// <inheritdoc cref="NextFloat(PredictedRandomManager, float, float)"/>
+    public static float NextFloat(this PredictedRandomManager randomManager, Xoroshiro64S random, float minValue, float maxValue) =>
+        MinMax(randomManager.NextFloat(random), maxValue, minValue);
+
+    /// <summary>Get randomManager <see cref="float"/> value in range of <paramref name="minValue"/> (included) and <paramref name="maxValue"/> (excluded). </summary>
+    /// <param name="randomManager">The <see cref="PredictedRandomManager">randomManager</see> instance to run on.</param>
+    /// <param name="minValue">randomManager value should be greater or equal to this value.</param>
+    /// <param name="maxValue">randomManager value should be less than this value.</param>
+    public static float NextFloat(this PredictedRandomManager randomManager, float minValue, float maxValue) =>
+        MinMax(randomManager.NextFloat(), maxValue, minValue);
+
+    /// <inheritdoc cref="Prob(PredictedRandomManager, float)"/>
+    public static bool Prob(this PredictedRandomManager randomManager, EntityUid entity, float chance) =>
+        Prob(randomManager.NextDouble(entity), chance);
+
+    /// <inheritdoc cref="Prob(PredictedRandomManager, float)"/>
+    public static bool Prob(this PredictedRandomManager randomManager, NetEntity netEntity, float chance) =>
+        Prob(randomManager.NextDouble(netEntity), chance);
+
+    /// <inheritdoc cref="Prob(PredictedRandomManager, float)"/>
+    public static bool Prob(this PredictedRandomManager randomManager, long seed, float chance) =>
+        Prob(randomManager.NextDouble(seed), chance);
+
+    /// <inheritdoc cref="Prob(PredictedRandomManager, float)"/>
+    public static bool Prob(this PredictedRandomManager randomManager, Xoroshiro64S random, float chance) =>
+        Prob(randomManager.NextDouble(random), chance);
+
+    /// <summary> Have a certain chance to return a boolean.</summary>
+    /// <param name="randomManager">The <see cref="PredictedRandomManager">randomManager</see> instance to run on.</param>
+    /// <param name="chance">The chance to pass, from 0 to 1.</param>
+    public static bool Prob(this PredictedRandomManager randomManager, float chance) =>
+        Prob(randomManager.NextDouble(), chance);
+
+    private static bool Prob(double value, float chance)
+    {
+        DebugTools.Assert(chance is <= 1 and >= 0, $"Chance must be in the range 0-1. It was {chance}.");
+
+        return value < chance;
+    }
+
+    private static int MinMax(int value, int minValue, int maxValue) =>
+        value * (maxValue - minValue) + minValue;
+
+    private static float MinMax(float value, float minValue, float maxValue) =>
+        value * (maxValue - minValue) + minValue;
+
+}
diff --git a/Content.Shared/_White/Random/PredictedRandomManager.cs b/Content.Shared/_White/Random/PredictedRandomManager.cs
new file mode 100644
index 00000000000..78afadb5ce4
--- /dev/null
+++ b/Content.Shared/_White/Random/PredictedRandomManager.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.Timing;
+
+namespace Content.Shared._White.Random;
+
+public sealed class PredictedRandomManager
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public Xoroshiro64S GetRandom(EntityUid entity) => GetRandom(_entity.GetNetEntity(entity));
+
+    public Xoroshiro64S GetRandom(NetEntity netEntity)
+    {
+        long tick = _timing.CurTick.Value;
+        tick <<= 32;
+        tick |= (uint) netEntity.Id;
+
+        return GetRandom(tick);
+    }
+
+    public Xoroshiro64S GetRandom(long seed) => new(seed);
+
+    public Xoroshiro64S GetRandom() => new();
+
+    public int Next(EntityUid entity) => GetRandom(entity).Next();
+
+    public int Next(NetEntity netEntity) => GetRandom(netEntity).Next();
+
+    public int Next(long seed) => GetRandom(seed).Next();
+
+    public int Next(Xoroshiro64S random) => random.Next();
+
+    public int Next() => GetRandom().Next();
+}
diff --git a/Content.Shared/_White/Random/SplitMix64.cs b/Content.Shared/_White/Random/SplitMix64.cs
new file mode 100644
index 00000000000..c80e00d55a4
--- /dev/null
+++ b/Content.Shared/_White/Random/SplitMix64.cs
@@ -0,0 +1,36 @@
+namespace Content.Shared._White.Random;
+
+/// <summary>
+/// Seed initializer PRNG (SplitMix64).
+/// </summary>
+/// <remarks>http://prng.di.unimi.it/splitmix64.c</remarks>
+public record struct SplitMix64
+{
+    /// <summary>
+    /// Creates a new instance.
+    /// </summary>
+    public SplitMix64() : this(DateTime.UtcNow.Ticks) {}
+
+    /// <summary>
+    /// Creates a new instance.
+    /// </summary>
+    /// <param name="seed">Seed value.</param>
+    public SplitMix64(long seed)
+    {
+        _x = (ulong) seed;
+    }
+
+
+    private ulong _x;
+
+    /// <summary>
+    /// Returns the next 64-bit pseudo-random number.
+    /// </summary>
+    public long Next()
+    {
+        var z = unchecked(_x += 0x9e3779b97f4a7c15);
+        z = unchecked((z ^ (z >> 30)) * 0xbf58476d1ce4e5b9);
+        z = unchecked((z ^ (z >> 27)) * 0x94d049bb133111eb);
+        return unchecked((long) (z ^ (z >> 31)));
+    }
+}
diff --git a/Content.Shared/_White/Random/Xoroshiro64S.cs b/Content.Shared/_White/Random/Xoroshiro64S.cs
new file mode 100644
index 00000000000..465a674e3db
--- /dev/null
+++ b/Content.Shared/_White/Random/Xoroshiro64S.cs
@@ -0,0 +1,46 @@
+namespace Content.Shared._White.Random;
+
+/// <summary>
+/// 32-bit random number generator intended for floating point numbers with 64-bit state (xoroshiro64*).
+/// </summary>
+/// <remarks>http://prng.di.unimi.it/xoroshiro64star.c</remarks>
+public record struct Xoroshiro64S
+{
+    /// <summary>
+    /// Creates a new instance.
+    /// </summary>
+    public Xoroshiro64S() : this(DateTime.UtcNow.Ticks) { }
+
+    /// <summary>
+    /// Creates a new instance.
+    /// </summary>
+    /// <param name="seed">Seed value.</param>
+    public Xoroshiro64S(long seed)
+    {
+        var sm64 = new SplitMix64(seed);
+        _s0 = unchecked((uint) sm64.Next());
+        _s1 = unchecked((uint) sm64.Next());
+    }
+
+
+    private uint _s0;
+    private uint _s1;
+
+    /// <summary>
+    /// Returns the next 32-bit pseudo-random number.
+    /// </summary>
+    public int Next()
+    {
+        var s0 = _s0;
+        var s1 = _s1;
+        var result = unchecked(s0 * 0x9E3779BB);
+
+        s1 ^= s0;
+        _s0 = RotateLeft(s0, 26) ^ s1 ^ (s1 << 9);
+        _s1 = RotateLeft(s1, 13);
+
+        return Math.Abs((int) result);
+    }
+
+    private static uint RotateLeft(uint x, int k) => (x << k) | (x >> (32 - k));
+}
diff --git a/Content.Shared/_White/TargetDoll/SharedTargetDollSystem.cs b/Content.Shared/_White/TargetDoll/SharedTargetDollSystem.cs
new file mode 100644
index 00000000000..8d23c09ef81
--- /dev/null
+++ b/Content.Shared/_White/TargetDoll/SharedTargetDollSystem.cs
@@ -0,0 +1,100 @@
+using Content.Shared._White.Body.Components;
+using Content.Shared._White.Body.Systems;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+using static Content.Shared.Input.ContentKeyFunctions;
+
+namespace Content.Shared._White.TargetDoll;
+
+public abstract class SharedTargetDollSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    [Dependency] private readonly SharedBodySystem _body = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeAllEvent<SelectBodyPartRequestEvent>(OnSelectBodyPartRequest);
+
+        CommandBinds.Builder
+            .Bind(TargetDollHead, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.Head), handle: false, outsidePrediction: false))
+            .Bind(TargetDollChest, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.Chest), handle: false, outsidePrediction: false))
+            .Bind(TargetDollGroin, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.Groin), handle: false, outsidePrediction: false))
+            .Bind(TargetDollRightArm, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.RightArm, BodyPartType.RightHand), handle: false, outsidePrediction: false))
+            .Bind(TargetDollRightHand, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.RightHand), handle: false, outsidePrediction: false))
+            .Bind(TargetDollLeftArm, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.LeftArm, BodyPartType.LeftHand), handle: false, outsidePrediction: false))
+            .Bind(TargetDollLeftHand, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.LeftHand), handle: false, outsidePrediction: false))
+            .Bind(TargetDollRightLeg, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.RightLeg, BodyPartType.RightFoot), handle: false, outsidePrediction: false))
+            .Bind(TargetDollRightFoot, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.RightFoot), handle: false, outsidePrediction: false))
+            .Bind(TargetDollLeftLeg, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.LeftLeg, BodyPartType.LeftFoot), handle: false, outsidePrediction: false))
+            .Bind(TargetDollLeftFoot, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.LeftFoot), handle: false, outsidePrediction: false))
+            .Bind(TargetDollTail, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.Tail), handle: false, outsidePrediction: false))
+            .Bind(TargetDollEyes, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.Eyes), handle: false, outsidePrediction: false))
+            .Bind(TargetDollMouth, InputCmdHandler.FromDelegate(session => HandleBodyPartSelect(session, BodyPartType.Mouth), handle: false, outsidePrediction: false))
+            .Register<SharedTargetDollSystem>();
+    }
+
+    private void OnSelectBodyPartRequest(SelectBodyPartRequestEvent msg, EntitySessionEventArgs args)
+    {
+        if (args.SenderSession.AttachedEntity is not { Valid: true, } uid
+            || !TryComp<TargetDollComponent>(uid, out var targetDoll))
+        {
+            Log.Warning($"User {args.SenderSession.Name} sent an invalid {nameof(SelectBodyPartRequestEvent)}");
+            return;
+        }
+
+        SelectBodyPart((uid, targetDoll), msg.BodyPartType);
+    }
+
+    private void HandleBodyPartSelect(ICommonSession? session, BodyPartType bodyPartType, BodyPartType? alreadySelectedBodyPart = null)
+    {
+        if (session is not { AttachedEntity: { } uid, }
+            || !TryComp<TargetDollComponent>(uid, out var targetDoll))
+            return;
+
+        if (targetDoll.SelectedBodyPartType == bodyPartType)
+        {
+            if (alreadySelectedBodyPart != null)
+                SelectBodyPart((uid, targetDoll), alreadySelectedBodyPart.Value);
+
+            return;
+        }
+
+        SelectBodyPart((uid, targetDoll), bodyPartType);
+    }
+
+    public virtual void SelectBodyPart(Entity<TargetDollComponent> ent, BodyPartType bodyPartType)
+    {
+        if (ent.Comp.SelectedBodyPartType == bodyPartType)
+            return;
+
+        ent.Comp.SelectedBodyPartType = bodyPartType;
+        Dirty(ent);
+    }
+
+    public BodyPartType GetSelectedBodyPart(Entity<TargetDollComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return BodyPartType.None;
+
+        return ent.Comp.SelectedBodyPartType;
+    }
+
+    public BodyPartType GetRandomValidBodyPart(Entity<BodyComponent?> body)
+    {
+        if (!Resolve(body, ref body.Comp, false) || !_body.TryGetBodyParts(body, out var bodyParts))
+            return BodyPartType.None;
+
+        return _random.PickAndTake(bodyParts).Comp.Type;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class SelectBodyPartRequestEvent(BodyPartType bodyPartType) : EntityEventArgs
+{
+    public BodyPartType BodyPartType { get; } = bodyPartType;
+}
diff --git a/Content.Shared/_White/TargetDoll/TargetDollComponent.cs b/Content.Shared/_White/TargetDoll/TargetDollComponent.cs
new file mode 100644
index 00000000000..afbc943f54f
--- /dev/null
+++ b/Content.Shared/_White/TargetDoll/TargetDollComponent.cs
@@ -0,0 +1,12 @@
+using Content.Shared._White.Body.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._White.TargetDoll;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[Access(typeof(SharedTargetDollSystem))]
+public sealed partial class TargetDollComponent : Component
+{
+    [ViewVariables, AutoNetworkedField]
+    public BodyPartType SelectedBodyPartType = BodyPartType.Chest;
+}
diff --git a/Content.Shared/_White/Threshold/ThresholdHelpers.cs b/Content.Shared/_White/Threshold/ThresholdHelpers.cs
new file mode 100644
index 00000000000..8d5b59e0394
--- /dev/null
+++ b/Content.Shared/_White/Threshold/ThresholdHelpers.cs
@@ -0,0 +1,32 @@
+using System.Linq;
+
+namespace Content.Shared._White.Threshold;
+
+public static class ThresholdHelpers
+{
+    public static TValue? HighestMatch<TKey, TValue>(this SortedDictionary<TKey, TValue> dictionary, TKey key) where TKey : IComparable<TKey> where TValue : struct
+    {
+        foreach (var (threshold, data) in dictionary.Reverse())
+        {
+            if (key.CompareTo(threshold) < 0)
+                continue;
+
+            return data;
+        }
+
+        return null;
+    }
+
+    public static TValue? LowestMatch<TKey, TValue>(this SortedDictionary<TKey, TValue> dictionary, TKey key) where TKey : IComparable<TKey> where TValue : struct
+    {
+        foreach (var (threshold, data) in dictionary)
+        {
+            if (key.CompareTo(threshold) > 0)
+                continue;
+
+            return data;
+        }
+
+        return null;
+    }
+}
diff --git a/Content.Shared/_White/Xenomorphs/TailLash/SharedTailLashSystem.cs b/Content.Shared/_White/Xenomorphs/TailLash/SharedTailLashSystem.cs
index 222ba326e25..7993275f09d 100644
--- a/Content.Shared/_White/Xenomorphs/TailLash/SharedTailLashSystem.cs
+++ b/Content.Shared/_White/Xenomorphs/TailLash/SharedTailLashSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Shared._White.TargetDoll;
 using Content.Shared._White.Xenomorphs.Xenomorph;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
@@ -24,11 +25,12 @@ public sealed class SharedTailLashSystem : EntitySystem
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedMeleeWeaponSystem _meleeWeapon = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedTargetDollSystem _targetDoll = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -87,7 +89,8 @@ bool Ignored(EntityUid predicate)
         _interaction.DoContactInteraction(uid, uid);
 
         var hitEntities = results.Where(result => _interaction.InRangeUnobstructed(uid, result, range: range)).ToList();
-        var hitEvent = new MeleeHitEvent(hitEntities, uid, uid, component.TailDamage, null);
+        var bodyPartType = _targetDoll.GetSelectedBodyPart(uid);
+        var hitEvent = new MeleeHitEvent(hitEntities, uid, uid, component.TailDamage, null, bodyPartType);
         RaiseLocalEvent(uid, hitEvent);
 
         foreach (var hit in hitEntities)
@@ -98,7 +101,7 @@ bool Ignored(EntityUid predicate)
             RaiseLocalEvent(hit, attackedEv);
 
             var modifiedDamage = DamageSpecifier.ApplyModifierSets(component.TailDamage + hitEvent.BonusDamage + attackedEv.BonusDamage, hitEvent.ModifiersList);
-            _damageable.TryChangeDamage(hit, modifiedDamage, origin:uid);
+            _damageable.TryChangeDamage(hit, modifiedDamage, origin:uid, bodyPartType: bodyPartType);
 
             if (component.Inject == null || !_solutionContainer.TryGetInjectableSolution(hit, out var solutionEnt, out _))
                 continue;
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml b/Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml
deleted file mode 100644
index 8c3bd7f3720..00000000000
--- a/Resources/Audio/_Shitmed/Medical/Surgery/attributions.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-- 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"
-
-- files: ["bone_setter.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Darkrell"
-  source: "https://github.com/ss14Starlight/space-station-14"
-
-- files: ["bone_saw.ogg"]
-  license: "CC-BY-SA-3.0"
-  copyright: "Darkrell"
-  source: "https://github.com/ss14Starlight/space-station-14"
\ No newline at end of file
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/bone_saw.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/bone_saw.ogg
deleted file mode 100644
index 8a9af325abd..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/bone_saw.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/bone_setter.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/bone_setter.ogg
deleted file mode 100644
index 23c03deeac1..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/bone_setter.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/cautery1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/cautery1.ogg
deleted file mode 100644
index fbd9f2b4d86..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/cautery1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/cautery2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/cautery2.ogg
deleted file mode 100644
index cc91e9f3ce6..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/cautery2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/hemostat1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
deleted file mode 100644
index e624bafafbf..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/hemostat1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/organ1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/organ1.ogg
deleted file mode 100644
index 37eaffc1a34..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/organ1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/organ2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/organ2.ogg
deleted file mode 100644
index 43b22f8354c..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/organ2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/retractor1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/retractor1.ogg
deleted file mode 100644
index 70625c961cf..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/retractor1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/retractor2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/retractor2.ogg
deleted file mode 100644
index 94548ec2504..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/retractor2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/saw.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/saw.ogg
deleted file mode 100644
index 62623f6aa3a..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/saw.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel1.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
deleted file mode 100644
index f292d1024da..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel1.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel2.ogg b/Resources/Audio/_Shitmed/Medical/Surgery/scalpel2.ogg
deleted file mode 100644
index 7335f3d9cef..00000000000
Binary files a/Resources/Audio/_Shitmed/Medical/Surgery/scalpel2.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Misc/abducted.ogg b/Resources/Audio/_Shitmed/Misc/abducted.ogg
deleted file mode 100644
index 1fe7ead0895..00000000000
Binary files a/Resources/Audio/_Shitmed/Misc/abducted.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Misc/abductor.ogg b/Resources/Audio/_Shitmed/Misc/abductor.ogg
deleted file mode 100644
index 93f0a0e1cc2..00000000000
Binary files a/Resources/Audio/_Shitmed/Misc/abductor.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Misc/alien_teleport.ogg b/Resources/Audio/_Shitmed/Misc/alien_teleport.ogg
deleted file mode 100644
index f2a44984936..00000000000
Binary files a/Resources/Audio/_Shitmed/Misc/alien_teleport.ogg and /dev/null differ
diff --git a/Resources/Audio/_Shitmed/Misc/attributions.yml b/Resources/Audio/_Shitmed/Misc/attributions.yml
deleted file mode 100644
index b9fcbd08533..00000000000
--- a/Resources/Audio/_Shitmed/Misc/attributions.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- files: ["abductor","alien_teleport"]
-  license: "CC-BY-4.0"
-  copyright: 'Darkrell'
-  source: "https://github.com/ss14Starlight/space-station-14"
-
-- files: ["abducted"]
-  license: "CC-BY-SA-3.0"
-  copyright: 'Paradise Station'
-  source: "https://github.com/ParadiseSS13/Paradise"
\ No newline at end of file
diff --git a/Resources/Audio/_White/Voice/Human/attributions.yml b/Resources/Audio/_White/Voice/Human/attributions.yml
new file mode 100644
index 00000000000..c987573a863
--- /dev/null
+++ b/Resources/Audio/_White/Voice/Human/attributions.yml
@@ -0,0 +1,5 @@
+- files: ["female_pain_scream_1.ogg", "female_pain_scream_2.ogg", "female_pain_scream_3.ogg", "female_pain_scream_4.ogg", "male_pain_scream_1.ogg", "male_pain_scream_2.ogg", "male_pain_scream_3.ogg", "male_pain_scream_4.ogg", "male_pain_scream_5.ogg", "male_pain_scream_6.ogg", "male_pain_scream_7.ogg"]
+  license: "CC-BY-NC-4.0"
+  copyright: "MightBeNotReal (Github). But I'm not sure about that."
+  source: "https://github.com/Goob-Station/Goob-Station/tree/master/Resources/Audio/_Shitmed/ReBELL/BrutalDeathRattles"
+
diff --git a/Resources/Audio/_White/Voice/Human/female_pain_scream_1.ogg b/Resources/Audio/_White/Voice/Human/female_pain_scream_1.ogg
new file mode 100644
index 00000000000..ee4c27a4961
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/female_pain_scream_1.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/female_pain_scream_2.ogg b/Resources/Audio/_White/Voice/Human/female_pain_scream_2.ogg
new file mode 100644
index 00000000000..3ec4ef972f6
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/female_pain_scream_2.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/female_pain_scream_3.ogg b/Resources/Audio/_White/Voice/Human/female_pain_scream_3.ogg
new file mode 100644
index 00000000000..b30bdd59b4d
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/female_pain_scream_3.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/female_pain_scream_4.ogg b/Resources/Audio/_White/Voice/Human/female_pain_scream_4.ogg
new file mode 100644
index 00000000000..ce59ea38bdd
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/female_pain_scream_4.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/male_pain_scream_1.ogg b/Resources/Audio/_White/Voice/Human/male_pain_scream_1.ogg
new file mode 100644
index 00000000000..dc301668e84
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/male_pain_scream_1.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/male_pain_scream_2.ogg b/Resources/Audio/_White/Voice/Human/male_pain_scream_2.ogg
new file mode 100644
index 00000000000..d155c705348
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/male_pain_scream_2.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/male_pain_scream_3.ogg b/Resources/Audio/_White/Voice/Human/male_pain_scream_3.ogg
new file mode 100644
index 00000000000..def7f556393
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/male_pain_scream_3.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/male_pain_scream_4.ogg b/Resources/Audio/_White/Voice/Human/male_pain_scream_4.ogg
new file mode 100644
index 00000000000..f2c05ce19fb
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/male_pain_scream_4.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/male_pain_scream_5.ogg b/Resources/Audio/_White/Voice/Human/male_pain_scream_5.ogg
new file mode 100644
index 00000000000..fa0e925c8e7
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/male_pain_scream_5.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/male_pain_scream_6.ogg b/Resources/Audio/_White/Voice/Human/male_pain_scream_6.ogg
new file mode 100644
index 00000000000..594c4e2046e
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/male_pain_scream_6.ogg differ
diff --git a/Resources/Audio/_White/Voice/Human/male_pain_scream_7.ogg b/Resources/Audio/_White/Voice/Human/male_pain_scream_7.ogg
new file mode 100644
index 00000000000..34b07145969
Binary files /dev/null and b/Resources/Audio/_White/Voice/Human/male_pain_scream_7.ogg differ
diff --git a/Resources/Locale/en-US/_Shitmed/abductor/abductor-ui.ftl b/Resources/Locale/en-US/_Shitmed/abductor/abductor-ui.ftl
deleted file mode 100644
index 3e7aa9dffe1..00000000000
--- a/Resources/Locale/en-US/_Shitmed/abductor/abductor-ui.ftl
+++ /dev/null
@@ -1,62 +0,0 @@
-abductors-ui-beacons = Beacons
-abductors-ui-teleport = Teleport
-abductors-ui-attract = Attract
-
-abductors-ui-experiment = Experiment
-abductors-ui-complete-experiment = Complete the experiment
-
-abductors-ui-gizmo-transferred = Target information transferred
-
-abductors-ui-armor-control = Armor Control
-abductors-ui-combat-mode = Combat Mode
-abductors-ui-stealth-mode = Stealth Mode
-abductors-ui-lock-armor = Lock Armor
-abductors-ui-unlock-armor = Unlock Armor
-abductors-ui-vest-linked = Vest linked
-
-abductors-title = Abductors
-abductors-description = Abductors have targeted the station. Avoid getting kidnapped by them!
-
-abductor-lone-ghost-role-name = Lone Abductor
-abductor-lone-ghost-role-desc = Kidnap people, and stuff them with experimental organs of dubious origin, all by yourself.
-
-abductor-scientist-ghost-role-name = Abductor Scientist
-abductor-scientist-ghost-role-desc = Teleport people your partner kidnapped onto your ship and stuff them with experimental organs of dubious origin.
-
-abductor-agent-ghost-role-name = Abductor Agent
-abductor-agent-ghost-role-desc = Kidnap people for your partner to stuff them with experimental organs of dubious origin.
-
-abductors-ghost-role-rules = You are an [color=red][bold]Abductor[/bold][/color].
-                            Your intentions are to abduct people from the station and replace their organs with various experimental devices,
-                            after which you return them back. You are not allowed to destroy the station or intentionally kill people.
-                            It is in your interest to return the test subjects alive and healthy for the purity of the experiment.
-
-                            You don't remember any of your previous life, and you don't remember anything you learned as a ghost.
-                            You are allowed to remember knowledge about the game in general, such as how to cook, how to use objects, etc.
-                            You are absolutely [color=red]NOT[/color] allowed to remember, say, the name, appearance, etc. of your previous character.
-
-abductor-round-end-agent-name = abductor
-
-objective-issuer-abductors = [color=#FD0098]Mothership[/color]
-
-objective-condition-abduct-title = Abduct {$count} person.
-objective-condition-abduct-description = (use the Gizmo on a subdued victim, then use the Gizmo on the abductor console and select the attract action), then replace their heart with one of the glands, put them in the experimenter, and press complete experiment.
-
-abductor-role-greeting = I am a professional combat scientist of a high-tech race. My task is to abduct humans, conduct experiments on them, and return them alive for the purity of the experiment. It is not in my interest to destroy the station, kill, or assist the crew.
-
-roles-antag-abductor-objective = Kidnap station crew and perform your experiments on them!
-
-abductor-victim-role-greeting = You have seen things you shouldn't have. The world must know the truth.
-abductor-victim-role-name = Abductee
-abductor-victim-role-desc = You have seen things you shouldn't have. The world must know the truth.
-
-objective-issuer-voices = [color=#FD0098]The Voices[/color]
-abductor-ui-pad-found = pad: [color=green]connected[/color]
-abductor-ui-pad-not-found = pad: [color=red]not found[/color]
-abductor-ui-target-none = target: [color=red]NONE[/color]
-abductor-ui-target-found = target: [color=green]{$target}[/color]
-abductor-ui-experimentator-connected = experimentator: [color=green]connected[/color]
-abductor-ui-experimentator-not-found = experimentator: [color=red]not found[/color]
-abductor-ui-victim-none = victim: [color=red]NONE[/color]
-abductor-ui-victim-found = victim: [color=green]{$victim}[/color]
-abductor-ui-armor-plug-in = [color=red][font size=16]You need to plug in abductor armor![/font][/color]
diff --git a/Resources/Locale/en-US/_Shitmed/abductor/abductor.ftl b/Resources/Locale/en-US/_Shitmed/abductor/abductor.ftl
deleted file mode 100644
index 2dca32116a7..00000000000
--- a/Resources/Locale/en-US/_Shitmed/abductor/abductor.ftl
+++ /dev/null
@@ -1,9 +0,0 @@
-species-name-abductor = alien
-abductors-weapon-restricted-1 = Presses the balloon.
-abductors-weapon-restricted-2 = Seems like they've grabbed the blade.
-abductors-weapon-restricted-3 = Strokes the stick, but nothing happens.
-abductors-weapon-restricted-4 = Sniffs the alien weapon.
-
-abductors-gizmo-restricted = Spins gizmo in their hand.
-
-abductor-gun-restricted-1 = They try to press the trigger guard, but the finger doesn't fit.
diff --git a/Resources/Locale/en-US/_Shitmed/autodoc.ftl b/Resources/Locale/en-US/_Shitmed/autodoc.ftl
deleted file mode 100644
index 6d92002ca87..00000000000
--- a/Resources/Locale/en-US/_Shitmed/autodoc.ftl
+++ /dev/null
@@ -1,67 +0,0 @@
-autodoc-program-step-surgery = perform surgery on {$part}: {$name}
-autodoc-program-step-grab-item = grab item: '{$name}'
-autodoc-program-step-grab-any = grab any: {$name}
-autodoc-item-organ = Organ
-autodoc-item-part = Body Part
-autodoc-program-step-store-item = store item
-autodoc-program-step-set-label = set label: '{$label}'
-autodoc-program-step-wait = wait {$length} seconds
-
-autodoc-program-completed = PROGRAM COMPLETED
-autodoc-error = ERROR: {$error}
-autodoc-fatal-error = FATAL ERROR: {$error}
-autodoc-waiting = PROGRAM WAITING
-
-autodoc-error-missing-patient = MISSING PATIENT
-autodoc-error-body-part = BODY PART NOT DETECTED
-autodoc-error-surgery-impossible = SELECTED SURGERY IMPOSSIBLE
-autodoc-error-item-unavailable = ITEM UNAVAILABLE
-autodoc-error-surgery-failed = SURGERY FAILED
-autodoc-error-hand-full = ITEM MANIPULATOR FULL
-autodoc-error-storage-full = ITEM TRAYS FULL
-autodoc-error-patient-unsedated = PATIENT REQUIRES SEDATION
-
-# These intentionally have russian alongside them for ostranauts-like aesthetic.
-# If you are a russian fork, these don't need translating :)
-# Если вы являетесь русскоязычным форком, то они не нуждаются в переводе :)
-autodoc-title = AUTODOC АВТОДОК MK.XIV
-autodoc-create-program = NEW PROGRAM НОВОЕ РАСПИСАНИЕ
-autodoc-program-title = PROGRAM TITLE ТИТУЛ РАСПИСАНИЯ
-autodoc-program-title-placeholder = Program {$number}
-autodoc-abort-program = ABORT PROGRAM АБОРТ РАСПИСАНИЯ
-
-autodoc-view-program-title = VIEW PROGRAM ПРОСМОТРИ
-autodoc-safety-enabled = SAFETY ON БЕЗОПАСНО НА
-autodoc-safety-disabled = SAFETY OFF В БЕЗОПАСНОСТИ
-autodoc-remove-program = REMOVE PROGRAM УДАЛИТЕ
-autodoc-add-step = ADD STEP ДОБАВЬ ШАГ
-autodoc-remove-step = REMOVE STEP УДАЛИ ШАГ
-autodoc-start-program = START PROGRAM НАЧНИ РАСПИСАНИЕ
-
-autodoc-add-step-surgery = PERFORM SURGERY РАЗЫГРАЙ ОПЕРАЦИЮ
-autodoc-add-step-grab-item = GRAB ITEM ВОЗЬМИ ОБЪЕКТ
-autodoc-add-step-grab-item-prompt = Item name
-autodoc-add-step-grab-item-placeholder = dwarf heart
-autodoc-add-step-grab-organ = GRAB ORGAN ВОЗЬМИ ОРГАН
-autodoc-add-step-grab-part = GRAB BODY PART ВОЗЬМИ ЧАСТЬ ТЕЛА
-autodoc-add-step-store-item = STORE ITEM МАГАЗИН ОБЪЕКТ
-autodoc-add-step-set-label = SET LABEL НАНЕСИТЕ ЯРЛЫК
-autodoc-add-step-set-label-prompt = Label
-autodoc-add-step-wait = WAIT ЖДАТЬ
-autodoc-add-step-wait-prompt = Seconds to wait
-
-autodoc-body-part-Other = Other
-autodoc-body-part-Torso = Torso
-autodoc-body-part-Head = Head
-autodoc-body-part-Arm = Arm
-autodoc-body-part-Hand = Hand
-autodoc-body-part-Leg = Leg
-autodoc-body-part-Foot = Foot
-autodoc-body-part-Tail = Tail
-
-autodoc-body-symmetry-ignored = Any
-autodoc-body-symmetry-None = None
-autodoc-body-symmetry-Left = Left
-autodoc-body-symmetry-Right = Right
-
-autodoc-submit = Submit
diff --git a/Resources/Locale/en-US/_Shitmed/damage/damage-groups.ftl b/Resources/Locale/en-US/_Shitmed/damage/damage-groups.ftl
deleted file mode 100644
index 465e9c3b648..00000000000
--- a/Resources/Locale/en-US/_Shitmed/damage/damage-groups.ftl
+++ /dev/null
@@ -1 +0,0 @@
-damage-group-organ-failure = Organ Failure
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/damage/damage-types.ftl b/Resources/Locale/en-US/_Shitmed/damage/damage-types.ftl
deleted file mode 100644
index 8d9b57e8594..00000000000
--- a/Resources/Locale/en-US/_Shitmed/damage/damage-types.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-damage-type-organ = Decay
-damage-type-trauma = Trauma
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/emag/emag.ftl b/Resources/Locale/en-US/_Shitmed/emag/emag.ftl
deleted file mode 100644
index f2372988a6b..00000000000
--- a/Resources/Locale/en-US/_Shitmed/emag/emag.ftl
+++ /dev/null
@@ -1 +0,0 @@
-emag-attempt-failed = { THE($tool) } didn't seem to do anything...
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/guidebook/guides.ftl b/Resources/Locale/en-US/_Shitmed/guidebook/guides.ftl
deleted file mode 100644
index 5b297d135a8..00000000000
--- a/Resources/Locale/en-US/_Shitmed/guidebook/guides.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-guide-entry-surgery = Surgery
-guide-entry-partmanipulation = Part Manipulation
-guide-entry-organmanipulation = Organ Manipulation
-guide-entry-utilitysurgeries = Utility Surgeries
-guide-entry-autodoc = Autodoc
-guide-entry-abductors = Abductors
diff --git a/Resources/Locale/en-US/_Shitmed/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/_Shitmed/interaction/interaction-popup-component.ftl
deleted file mode 100644
index b9e4775aa03..00000000000
--- a/Resources/Locale/en-US/_Shitmed/interaction/interaction-popup-component.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-petting-success-spider-egg = You pet {THE($target)} gently... It moved?
-petting-failure-spider-egg = You pet {THE($target)} gently... Nothing happened.
diff --git a/Resources/Locale/en-US/_Shitmed/inventory/slot-popup.ftl b/Resources/Locale/en-US/_Shitmed/inventory/slot-popup.ftl
deleted file mode 100644
index d921423148c..00000000000
--- a/Resources/Locale/en-US/_Shitmed/inventory/slot-popup.ftl
+++ /dev/null
@@ -1 +0,0 @@
-equip-part-missing-error = {$target} is missing their {$part}!
diff --git a/Resources/Locale/en-US/_Shitmed/itemswitch/item-switch.ftl b/Resources/Locale/en-US/_Shitmed/itemswitch/item-switch.ftl
deleted file mode 100644
index bc564d79da8..00000000000
--- a/Resources/Locale/en-US/_Shitmed/itemswitch/item-switch.ftl
+++ /dev/null
@@ -1 +0,0 @@
-itemswitch-component-on-examine-detailed-message = Current mode: {$state}
diff --git a/Resources/Locale/en-US/_Shitmed/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/_Shitmed/machine-linking/receiver_ports.ftl
deleted file mode 100644
index 409e945ec8e..00000000000
--- a/Resources/Locale/en-US/_Shitmed/machine-linking/receiver_ports.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-signal-port-name-operating-table = Operating table
-signal-port-description-operating-table-receiver = Operating table signal receiver
-signal-port-description-operating-table-sender = Operating table signal sender
diff --git a/Resources/Locale/en-US/_Shitmed/medical/defibrillator.ftl b/Resources/Locale/en-US/_Shitmed/medical/defibrillator.ftl
deleted file mode 100644
index fa58b8de21f..00000000000
--- a/Resources/Locale/en-US/_Shitmed/medical/defibrillator.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
-# SPDX-FileCopyrightText: 2025 deltanedas <39013340+deltanedas@users.noreply.github.com>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-defibrillator-missing-organs = Patient lacks essential vital organs! Revival is impossible.
diff --git a/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl b/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl
deleted file mode 100644
index ebd3273b18b..00000000000
--- a/Resources/Locale/en-US/_Shitmed/nutrition/components/food-component.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-## System
-
-food-system-eat-broadcasted = {CAPITALIZE(THE($user))} is trying to eat {THE($food)}!
-food-system-eat-broadcasted-self = You start trying to eat {THE($food)}!
-food-system-force-feed-broadcasted = {CAPITALIZE(THE($user))} is trying to feed {THE($target)} {THE($food)}!
-food-system-force-feed-broadcasted-success = {CAPITALIZE(THE($user))} forced {THE($target)} to eat {THE($food)}!
-food-system-eat-broadcasted-success = {CAPITALIZE(THE($user))} ate {THE($food)}!
diff --git a/Resources/Locale/en-US/_Shitmed/research/technologies.ftl b/Resources/Locale/en-US/_Shitmed/research/technologies.ftl
deleted file mode 100644
index 5b1214d4243..00000000000
--- a/Resources/Locale/en-US/_Shitmed/research/technologies.ftl
+++ /dev/null
@@ -1 +0,0 @@
-research-technology-autodoc = Automated Surgery
diff --git a/Resources/Locale/en-US/_Shitmed/species/species.ftl b/Resources/Locale/en-US/_Shitmed/species/species.ftl
deleted file mode 100644
index 4875628167c..00000000000
--- a/Resources/Locale/en-US/_Shitmed/species/species.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-species-name-monkey = monkey
-species-name-kobold = kobold
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/surgery/surgery-popup.ftl b/Resources/Locale/en-US/_Shitmed/surgery/surgery-popup.ftl
deleted file mode 100644
index a614c303dbd..00000000000
--- a/Resources/Locale/en-US/_Shitmed/surgery/surgery-popup.ftl
+++ /dev/null
@@ -1,56 +0,0 @@
-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}.
-surgery-popup-step-SurgeryStepLobotomize = {$user} is lobotomizing {$target}!
-surgery-popup-step-SurgeryStepMendBrainTissue = {$user} is mending the brain tissue on {$target}'s {$part}.
-
-surgery-popup-step-SurgeryStepTreatTumor = {$user} is treating the tumor on {$target}'s {$part}.
diff --git a/Resources/Locale/en-US/_Shitmed/surgery/surgery-tools.ftl b/Resources/Locale/en-US/_Shitmed/surgery/surgery-tools.ftl
deleted file mode 100644
index c1d1f93524a..00000000000
--- a/Resources/Locale/en-US/_Shitmed/surgery/surgery-tools.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-surgery-tool-turn-on = Turn it on first!
-surgery-tool-reload = Reload it first!
-surgery-tool-match-light = Light it first!
-surgery-tool-match-replace = Get a new match!
-
-surgery-tool-examinable-verb-text = Surgery Tool
-surgery-tool-examinable-verb-message = Examine the uses of this tool in surgeries.
-surgery-tool-header = This can be used in surgeries as:
-surgery-tool-unlimited = - {$tool} at [color={$color}]{$speed}x[/color] speed
-surgery-tool-used = - {$tool} at [color={$color}]{$speed}x[/color] speed, [color=red]then gets used up[/color]
diff --git a/Resources/Locale/en-US/_Shitmed/surgery/surgery-ui.ftl b/Resources/Locale/en-US/_Shitmed/surgery/surgery-ui.ftl
deleted file mode 100644
index 415395f7815..00000000000
--- a/Resources/Locale/en-US/_Shitmed/surgery/surgery-ui.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-surgery-verb-text = Start surgery
-surgery-verb-message = Begin surgery on this entity.
-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/_Shitmed/technologies/technologies.ftl b/Resources/Locale/en-US/_Shitmed/technologies/technologies.ftl
deleted file mode 100644
index d5db297ae29..00000000000
--- a/Resources/Locale/en-US/_Shitmed/technologies/technologies.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-research-technology-advanced-treatment = Advanced Treatment
-research-technology-high-end-surgery = High End Surgical Tools
-research-technology-cybernetic-enhancements = Cybernetic Enhancements
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/verbs/verb-system.ftl b/Resources/Locale/en-US/_Shitmed/verbs/verb-system.ftl
deleted file mode 100644
index 256e9dddf6e..00000000000
--- a/Resources/Locale/en-US/_Shitmed/verbs/verb-system.ftl
+++ /dev/null
@@ -1 +0,0 @@
-verb-categories-switch = Switch Mode
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Shitmed/wires/wire-names.ftl b/Resources/Locale/en-US/_Shitmed/wires/wire-names.ftl
deleted file mode 100644
index f1e8957b790..00000000000
--- a/Resources/Locale/en-US/_Shitmed/wires/wire-names.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-wires-board-name-autodoc = Autodoc Mk.XIV
-
-wire-name-autodoc-safety = SAFE
diff --git a/Resources/Locale/en-US/_white/alerts/alerts.ftl b/Resources/Locale/en-US/_white/alerts/alerts.ftl
index fc1d5386144..74bde269d2a 100644
--- a/Resources/Locale/en-US/_white/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/_white/alerts/alerts.ftl
@@ -12,3 +12,6 @@ alerts-queen-finder-desc = Allows you to sense the general direction of your Que
 
 alerts-blood-cult-empowered-name = Empowered
 alerts-blood-cult-empowered-desc = Blood magic and rune scribing requires much less time to cast and you lose less blood from it.
+
+alerts-body-status-name = Body status
+alerts-body-status-desc = The current sensation of pain in your body. Blue is good. Red is bad.
diff --git a/Resources/Locale/en-US/_white/body/commands/attach_body_part.ftl b/Resources/Locale/en-US/_white/body/commands/attach_body_part.ftl
new file mode 100644
index 00000000000..958f0bc2595
--- /dev/null
+++ b/Resources/Locale/en-US/_white/body/commands/attach_body_part.ftl
@@ -0,0 +1,3 @@
+cmd-attachbodypart-desc = Attaches a body part to a entity.
+cmd-attachbodypart-help = Usage: attachbodypart <parent uid> <body part uid> <body part slot id>
+cmd-attachbodypart-fail = Failed to attach body part to this entity.
diff --git a/Resources/Locale/en-US/_white/body/commands/attach_bone.ftl b/Resources/Locale/en-US/_white/body/commands/attach_bone.ftl
new file mode 100644
index 00000000000..9864e6e76b4
--- /dev/null
+++ b/Resources/Locale/en-US/_white/body/commands/attach_bone.ftl
@@ -0,0 +1,3 @@
+cmd-attachbone-desc = Attaches a bone to a entity.
+cmd-attachbone-help = Usage: attachbone <parent uid> <bone uid> <bone slot id>
+cmd-attachbone-fail = Failed to attach bone to this entity.
diff --git a/Resources/Locale/en-US/_white/body/commands/attach_organ.ftl b/Resources/Locale/en-US/_white/body/commands/attach_organ.ftl
new file mode 100644
index 00000000000..059dc3bb1f8
--- /dev/null
+++ b/Resources/Locale/en-US/_white/body/commands/attach_organ.ftl
@@ -0,0 +1,3 @@
+cmd-attachorgan-desc = Attaches a organ to a entity.
+cmd-attachorgan-help = Usage: attachorgan <parent uid> <organ uid> <organ slot id>
+cmd-attachorgan-fail = Failed to attach organ to this entity.
diff --git a/Resources/Locale/en-US/_white/body/commands/create_body_part_slot.ftl b/Resources/Locale/en-US/_white/body/commands/create_body_part_slot.ftl
new file mode 100644
index 00000000000..ea2ea7c9935
--- /dev/null
+++ b/Resources/Locale/en-US/_white/body/commands/create_body_part_slot.ftl
@@ -0,0 +1,3 @@
+cmd-createbodypartslot-desc = Creates a body part slot for the given entity.
+cmd-createbodypartslot-help = Usage: createbodypartslot <entity uid> <body part slot id> <body part type>
+cmd-createbodypartslot-fail = Failed to create a body part slot for this entity
diff --git a/Resources/Locale/en-US/_white/body/commands/create_bone_slot.ftl b/Resources/Locale/en-US/_white/body/commands/create_bone_slot.ftl
new file mode 100644
index 00000000000..94b8194fba9
--- /dev/null
+++ b/Resources/Locale/en-US/_white/body/commands/create_bone_slot.ftl
@@ -0,0 +1,3 @@
+cmd-createboneslot-desc = Creates a bone slot for the given entity.
+cmd-createboneslot-help = Usage: createboneslot <entity uid> <bone slot id> <bone type>
+cmd-createboneslot-fail = Failed to create a bone slot for this entity
diff --git a/Resources/Locale/en-US/_white/body/commands/create_organ_slot.ftl b/Resources/Locale/en-US/_white/body/commands/create_organ_slot.ftl
new file mode 100644
index 00000000000..aa691b3fd3c
--- /dev/null
+++ b/Resources/Locale/en-US/_white/body/commands/create_organ_slot.ftl
@@ -0,0 +1,3 @@
+cmd-createorganslot-desc = Creates a organ slot for the given entity.
+cmd-createorganslot-help = Usage: createorganslot <entity uid> <organ slot id> <organ type>
+cmd-createorganslot-fail = Failed to create a organ slot for this entity
diff --git a/Resources/Locale/en-US/_white/chat/emotion.ftl b/Resources/Locale/en-US/_white/chat/emotion.ftl
index 1157371e191..c1997e4d545 100644
--- a/Resources/Locale/en-US/_white/chat/emotion.ftl
+++ b/Resources/Locale/en-US/_white/chat/emotion.ftl
@@ -1,10 +1,12 @@
 # Names
+chat-emote-name-pain-scream = Pain Scream
 chat-emote-name-nod = Nod
 chat-emote-name-shake-head = Shake head
 chat-emote-name-frown = Frown
 chat-emote-name-smile = Smile
 
 # Message
+chat-emote-msg-pain-scream = screaming in pain!
 chat-emote-msg-nod = nods.
 chat-emote-msg-shake-head = shakes {POSS-ADJ($entity)} head.
 chat-emote-msg-frown = frowns.
@@ -15,4 +17,4 @@ chat-emote-trigger-nod-1 = nods
 chat-emote-trigger-shake-head-1 = shakes head
 chat-emote-trigger-shake-head-2 = shakes his head
 chat-emote-trigger-frown-1 = frowns
-chat-emote-trigger-smile-1 = smiles
\ No newline at end of file
+chat-emote-trigger-smile-1 = smiles
diff --git a/Resources/Locale/en-US/_white/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/_white/escape-menu/ui/options-menu.ftl
index bcff34ab8ed..a1e95a80e2e 100644
--- a/Resources/Locale/en-US/_white/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/_white/escape-menu/ui/options-menu.ftl
@@ -1,4 +1,23 @@
+## Controls menu
+
+ui-options-header-target-doll = Target doll
+
 ui-options-function-look-up = Look up/Take aim
 ui-options-function-toggle-look-up = Toggle aiming
 
 ui-options-lighting-shader = Lighting Shaders
+
+ui-options-function-target-doll-head = Select head
+ui-options-function-target-doll-chest = Select chest
+ui-options-function-target-doll-groin = Select groin
+ui-options-function-target-doll-right-arm = Select right arm
+ui-options-function-target-doll-right-hand = Select right hand
+ui-options-function-target-doll-left-arm = Select left arm
+ui-options-function-target-doll-left-hand = Select left hand
+ui-options-function-target-doll-right-leg = Select right leg
+ui-options-function-target-doll-right-foot = Select right foot
+ui-options-function-target-doll-left-leg = Select left leg
+ui-options-function-target-doll-left-foot = Select left foot
+ui-options-function-target-doll-tail = Select tail
+ui-options-function-target-doll-eyes = Select eyes
+ui-options-function-target-doll-mouth = Select mouth
diff --git a/Resources/Locale/en-US/_white/guidebook/chemistry/core.ftl b/Resources/Locale/en-US/_white/guidebook/chemistry/core.ftl
new file mode 100644
index 00000000000..0ec8ea9c6c9
--- /dev/null
+++ b/Resources/Locale/en-US/_white/guidebook/chemistry/core.ftl
@@ -0,0 +1,3 @@
+guidebook-reagent-effects-metabolism-stage-rate = [bold]{$stage}[/bold] [color=gray]({$rate} units per second)[/color]
+guidebook-reagent-effects-metabolite-item = {$reagent} at a rate of { NATURALPERCENT($rate, 2) }
+guidebook-reagent-effects-metabolites = Metabolizes into { $items }.
diff --git a/Resources/Locale/en-US/_white/hands/commands/add_hand.ftl b/Resources/Locale/en-US/_white/hands/commands/add_hand.ftl
new file mode 100644
index 00000000000..04f6f58ff36
--- /dev/null
+++ b/Resources/Locale/en-US/_white/hands/commands/add_hand.ftl
@@ -0,0 +1,2 @@
+cmd-addhand-desc = Adds a hand for the given entity.
+cmd-addhand-help = Usage: addhand [entity uid] [hand id] [hand location]
diff --git a/Resources/Locale/en-US/_white/hands/commands/remove_hand.ftl b/Resources/Locale/en-US/_white/hands/commands/remove_hand.ftl
new file mode 100644
index 00000000000..20aa217d05c
--- /dev/null
+++ b/Resources/Locale/en-US/_white/hands/commands/remove_hand.ftl
@@ -0,0 +1,2 @@
+cmd-removehand-desc = Removes an hand from the given entity.
+cmd-removehand-help = Usage: removehand [entity uid] [hand id]
diff --git a/Resources/Locale/en-US/_white/medical/components/healing-component.ftl b/Resources/Locale/en-US/_white/medical/components/healing-component.ftl
new file mode 100644
index 00000000000..1df316d581e
--- /dev/null
+++ b/Resources/Locale/en-US/_white/medical/components/healing-component.ftl
@@ -0,0 +1 @@
+medical-item-cant-use-switch-body-part = There is no damage on {$body-part} that can be healed with {$item}. Starting to heal {$new-body-part}
diff --git a/Resources/Locale/en-US/_white/metabolism/metabolism-stages.ftl b/Resources/Locale/en-US/_white/metabolism/metabolism-stages.ftl
new file mode 100644
index 00000000000..aa9818dbc49
--- /dev/null
+++ b/Resources/Locale/en-US/_white/metabolism/metabolism-stages.ftl
@@ -0,0 +1,5 @@
+metabolism-stage-respiration = Respiration
+metabolism-stage-digestion = Digestion
+metabolism-stage-absorption = Absorption
+metabolism-stage-excretion = Excretion
+metabolism-stage-plant = Plant Metabolism
diff --git a/Resources/Locale/en-US/_white/shell.ftl b/Resources/Locale/en-US/_white/shell.ftl
new file mode 100644
index 00000000000..b96967923cb
--- /dev/null
+++ b/Resources/Locale/en-US/_white/shell.ftl
@@ -0,0 +1,21 @@
+## Guards
+
+shell-argument-body-part-type-invalid = Argument {$index} must be a valid body part type!
+shell-argument-bone-type-invalid = Argument {$index} must be a valid bone type!
+shell-argument-hand-location-invalid = Argument {$index} must be a valid hand location!
+shell-argument-organ-type-invalid = Argument {$index} must be a valid organ type!
+
+# Hints
+
+shell-argument-body-part-type-hint = <body part type>
+shell-argument-body-part-type-optional-hint = [body part type]
+shell-argument-bone-type-hint = <bone type>
+shell-argument-bone-type-optional-hint = [bone type]
+shell-argument-entity-hint = <entity>
+shell-argument-entity-optional-hint = [entity]
+shell-argument-hand-location-hint = <hand location>
+shell-argument-hand-location-optional-hint = [hand location]
+shell-argument-organ-type-hint = <organ type>
+shell-argument-organ-type-optional-hint = [organ type]
+shell-argument-string-hint = <string>
+shell-argument-string-optional-hint = [string]
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 09a066d3ae6..cda2d666b09 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -124,7 +124,6 @@ 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
@@ -185,13 +184,6 @@ 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/en-US/guidebook/chemistry/core.ftl b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
index 2ffb0b2be23..e552306f77a 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/core.ftl
@@ -14,7 +14,6 @@ guidebook-reagent-sources-header = Sources
 guidebook-reagent-sources-ent-wrapper = [bold]{$name}[/bold] \[1\]
 guidebook-reagent-sources-gas-wrapper = [bold]{$name} (gas)[/bold] \[1\]
 guidebook-reagent-effects-header = Effects
-guidebook-reagent-effects-metabolism-group-rate = [bold]{$group}[/bold] [color=gray]({$rate} units per second)[/color]
 guidebook-reagent-plant-metabolisms-header = Plant Metabolism
 guidebook-reagent-plant-metabolisms-rate = [bold]Plant Metabolism[/bold] [color=gray](1 unit every 3 seconds as base)[/color]
 guidebook-reagent-physical-description = [italic]Seems to be {$description}.[/italic]
diff --git a/Resources/Locale/en-US/metabolism/metabolism-groups.ftl b/Resources/Locale/en-US/metabolism/metabolism-groups.ftl
deleted file mode 100644
index b9bd477fbb6..00000000000
--- a/Resources/Locale/en-US/metabolism/metabolism-groups.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-metabolism-group-poison = Poison
-metabolism-group-medicine = Medicine
-metabolism-group-narcotic = Narcotic
-metabolism-group-alcohol = Alcohol
-metabolism-group-food = Food
-metabolism-group-drink = Drink
-metabolism-group-gas = Gas
-metabolism-group-plant-metabolisms = Plant Metabolism
diff --git a/Resources/Locale/ru-RU/_Shitmed/abductor/abductor-ui.ftl b/Resources/Locale/ru-RU/_Shitmed/abductor/abductor-ui.ftl
deleted file mode 100644
index c663ce5382c..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/abductor/abductor-ui.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-abductors-ui-beacons = Маяки
-abductors-ui-teleport = Телепорт
-abductors-ui-attract = Притянуть
-
-abductors-ui-experiment = Эксперимент
-abductors-ui-complete-experiment = Завершить эксперимент
-
-abductors-ui-gizmo-transferred = Информация о цели передана
-
-abductors-ui-armor-control = Управление бронёй
-abductors-ui-combat-mode = Боевой режим
-abductors-ui-stealth-mode = Режим скрытности
-abductors-ui-lock-armor = Заблокировать броню
-abductors-ui-unlock-armor = Разблокировать броню
-abductors-ui-vest-linked = Жилет подключён
-
-abductors-title = Абдукторы
-abductors-description = Абдукторы нацелились на станцию. Избегайте похищения!
-
-abductor-lone-ghost-role-name = Одиночный Абдуктор
-abductor-lone-ghost-role-desc = Похищайте людей и вживляйте им экспериментальные органы сомнительного происхождения в одиночку.
-
-abductor-scientist-ghost-role-name = Абдуктор-учёный
-abductor-scientist-ghost-role-desc = Телепортируйте людей, которых похитил ваш напарник, на ваш корабль и вживляйте им экспериментальные органы сомнительного происхождения.
-
-abductor-agent-ghost-role-name = Абдуктор-агент
-abductor-agent-ghost-role-desc = Похищайте людей для вашего напарника, чтобы он вживил им экспериментальные органы сомнительного происхождения.
-
-abductors-ghost-role-rules = Вы — [color=red][bold]Абдуктор[/bold][/color].\\nВаша задача — похищать людей со станции и заменять их органы различными экспериментальными устройствами, после чего возвращать их обратно. Вам нельзя уничтожать станцию или намеренно убивать людей.\\nВ ваших интересах возвращать подопытных живыми и здоровыми ради чистоты эксперимента.\\n\\nВы не помните свою прошлую жизнь и ничего не помните из того, что знали как призрак.\\nРазрешено помнить только общие игровые знания, например, как готовить, как пользоваться предметами и т.д.\\nСтрого [color=red]ЗАПРЕЩЕНО[/color] помнить имя, внешность и т.п. вашего предыдущего персонажа.
-
-abductor-round-end-agent-name = абдуктор
-
-objective-issuer-abductors = [color=#FD0098]Материнский корабль[/color]
-
-objective-condition-abduct-title = Похитить {$count} человек.
-objective-condition-abduct-description = (используйте гизмо на обездвиженной жертве, затем используйте гизмо на консоли абдуктора и выберите действие "притянуть"), затем замените им сердце на одну из желёз, поместите в экспериментатор и нажмите "завершить эксперимент".
-
-abductor-role-greeting = Я профессиональный боевой учёный высокотехнологичной расы. Моя задача — похищать людей, проводить над ними эксперименты и возвращать их живыми ради чистоты эксперимента. Мне невыгодно уничтожать станцию, убивать или помогать экипажу.
-
-roles-antag-abductor-objective = Похищайте членов экипажа станции и проводите над ними эксперименты!
-
-abductor-victim-role-greeting = Вы увидели то, что не должны были видеть. Мир должен узнать правду.
-abductor-victim-role-name = Похищенный
-abductor-victim-role-desc = Вы увидели то, что не должны были видеть. Мир должен узнать правду.
-
-objective-issuer-voices = [color=#FD0098]Голоса[/color]
-abductor-ui-pad-found = площадка: [color=green]подключена[/color]
-abductor-ui-pad-not-found = площадка: [color=red]не найдена[/color]
-abductor-ui-target-none = цель: [color=red]НЕТ[/color]
-abductor-ui-target-found = цель: [color=green]{$target}[/color]
-abductor-ui-experimentator-connected = экспериментатор: [color=green]подключён[/color]
-abductor-ui-experimentator-not-found = экспериментатор: [color=red]не найден[/color]
-abductor-ui-victim-none = жертва: [color=red]НЕТ[/color]
-abductor-ui-victim-found = жертва: [color=green]{$victim}[/color]
-abductor-ui-armor-plug-in = [color=red][font size=16]Необходимо подключить броню абдуктора![/font][/color] 
diff --git a/Resources/Locale/ru-RU/_Shitmed/abductor/abductor.ftl b/Resources/Locale/ru-RU/_Shitmed/abductor/abductor.ftl
deleted file mode 100644
index 525560208f4..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/abductor/abductor.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-species-name-abductor = пришелец
-abductors-weapon-restricted-1 = нажимает на спусковой крючок.
-abductors-weapon-restricted-2 = Похоже, что он схватил лезвие.
-abductors-weapon-restricted-3 = Гладит палку, но ничего не происходит.
-abductors-weapon-restricted-4 = Вдыхает запах оружия абдуктора.
-
-abductors-gizmo-restricted = Крутит гизмо в руке.
-
-abductor-gun-restricted-1 = Пытается нажать на спусковую скобу, но палец не помещается.
-
-# Предметы
-
diff --git a/Resources/Locale/ru-RU/_Shitmed/autodoc.ftl b/Resources/Locale/ru-RU/_Shitmed/autodoc.ftl
deleted file mode 100644
index 0d849884031..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/autodoc.ftl
+++ /dev/null
@@ -1,70 +0,0 @@
-autodoc-program-step-surgery = выполнить операцию на {$part}: {$name}
-autodoc-program-step-grab-item = взять предмет: '{$name}'
-autodoc-program-step-grab-any = взять любой: {$name}
-autodoc-item-organ = Орган
-autodoc-item-part = Часть тела
-autodoc-program-step-store-item = поместить предмет в хранилище предмет
-autodoc-program-step-set-label = установить метку: '{$label}'
-autodoc-program-step-wait = подождите {$length} секунд
-
-autodoc-program-completed = ПРОГРАММА ЗАВЕРШЕНА
-autodoc-error = ОШИБКА: {$error}
-autodoc-fatal-error = КРИТИЧЕСКАЯ ОШИБКА: {$error}
-autodoc-waiting = РЕЖИМ ОЖИДАНИЯ
-
-autodoc-error-missing-patient = ОТСУТСТВУЕТ ПАЦИЕНТА
-autodoc-error-body-part = ЧАСТЬ ТЕЛА НЕ ОБНАРУЖЕНА
-autodoc-error-surgery-impossible = ВЫБРАННАЯ ОПЕРАЦИЯ НЕВОЗМОЖНА
-autodoc-error-item-unavailable = ПРЕДМЕТ ОТСУТСТВУЕТ
-autodoc-error-surgery-failed = ОПЕРАЦИЯ НЕ УДАЛАСЬ
-autodoc-error-hand-full = МАНИПУЛЯТОР ЗАНЯТ
-autodoc-error-storage-full = ХРАНИЛИЩЕ ДЛЯ ПРЕДМЕТОВ ЗАПОЛНЕНО
-autodoc-error-patient-unsedated = ПАЦИЕНТУ НЕОБХОДИМО СЕДАТИВНОЕ СРЕДСТВО
-
-# These intentionally have russian alongside them for ostranauts-like aesthetic.
-# If you are a russian fork, these don't need translating :)
-# Если вы являетесь русскоязычным форком, то они не нуждаются в переводе :)
-# These intentionally have russian alongside them for ostranauts-like aesthetic.
-# If you are a russian fork, these don't need translating :)
-# Если вы являетесь русскоязычным форком, то они не нуждаются в переводе :)
-autodoc-title = АВТОДОК MK.XIV
-autodoc-create-program = НОВОЕ ПРОГРАММА
-autodoc-program-title = НАЗВАНИЕ ПРОГРАММЫ
-autodoc-program-title-placeholder = ПРОГРАММА {$number}
-autodoc-abort-program = ОТМЕНА ПРОГРАММЫ
-
-autodoc-view-program-title = ПРОСМОТР ПРОГРАММЫ
-autodoc-safety-enabled = РЕЖИМ НЕ НАВРЕДИ ВКЛЮЧЕН
-autodoc-safety-disabled = РЕЖИМ НЕ НАВРЕДИ ВЫКЛЮЧЕН
-autodoc-remove-program = УБРАТЬ ПРОГРАММУ
-autodoc-add-step = ДОБАВИТЬ ШАГ
-autodoc-remove-step = УДАЛИТЬ ШАГ
-autodoc-start-program = ЗАПУСТИТЬ ПРОГРАММУ
-
-autodoc-add-step-surgery = ВЫПОЛНИТЬ ОПЕРАЦИЮ
-autodoc-add-step-grab-item = ВЗЯТЬ ПРЕДМЕТ
-autodoc-add-step-grab-item-prompt = Название предмета
-autodoc-add-step-grab-item-placeholder = сердце дварфа
-autodoc-add-step-grab-organ = ВЗЯТЬ ОРГАН
-autodoc-add-step-grab-part = ВЗЯТЬ ЧАСТЬ ТЕЛА
-autodoc-add-step-store-item = ПОМЕСТЬ ПРЕДМЕТ В ХРАНИЛИЩЕ ПРЕДМЕТ
-autodoc-add-step-set-label = УСТАНОВИТЬ МЕТКУ
-autodoc-add-step-set-label-prompt = Метка
-autodoc-add-step-wait = ОЖИДАНИЕ
-autodoc-add-step-wait-prompt = время ожидания
-
-autodoc-body-part-Other = Другое
-autodoc-body-part-Torso = Туловище
-autodoc-body-part-Head = Голова
-autodoc-body-part-Arm = Рука
-autodoc-body-part-Hand = Кисть
-autodoc-body-part-Leg = Нога
-autodoc-body-part-Foot = Ступня
-autodoc-body-part-Tail = Хвост
-
-autodoc-body-symmetry-ignored = Любое
-autodoc-body-symmetry-None = Нет
-autodoc-body-symmetry-Left = Левое
-autodoc-body-symmetry-Right = Правое
-
-autodoc-submit = Отправить
diff --git a/Resources/Locale/ru-RU/_Shitmed/damage/damage-groups.ftl b/Resources/Locale/ru-RU/_Shitmed/damage/damage-groups.ftl
deleted file mode 100644
index 01e2dd54ae3..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/damage/damage-groups.ftl
+++ /dev/null
@@ -1 +0,0 @@
-damage-group-organ-failure = Отказ органов
diff --git a/Resources/Locale/ru-RU/_Shitmed/damage/damage-types.ftl b/Resources/Locale/ru-RU/_Shitmed/damage/damage-types.ftl
deleted file mode 100644
index ce61cba29e5..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/damage/damage-types.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-damage-type-organ = Разложение
-damage-type-trauma = Травма
diff --git a/Resources/Locale/ru-RU/_Shitmed/emag/emag.ftl b/Resources/Locale/ru-RU/_Shitmed/emag/emag.ftl
deleted file mode 100644
index ae02617f320..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/emag/emag.ftl
+++ /dev/null
@@ -1 +0,0 @@
-emag-attempt-failed = { $tool }, похоже, ничего не сделал...
diff --git a/Resources/Locale/ru-RU/_Shitmed/guidebook/guides.ftl b/Resources/Locale/ru-RU/_Shitmed/guidebook/guides.ftl
deleted file mode 100644
index 3f8737bb687..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/guidebook/guides.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-guide-entry-surgery = Хирургия
-guide-entry-partmanipulation = Манипуляция с частями тела
-guide-entry-organmanipulation = Манипуляция с органами
-guide-entry-utilitysurgeries = Вспомогательные операции
-guide-entry-autodoc = Автодоктор
-guide-entry-abductors = Абдукторы
diff --git a/Resources/Locale/ru-RU/_Shitmed/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/_Shitmed/interaction/interaction-popup-component.ftl
deleted file mode 100644
index 9d024810e66..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/interaction/interaction-popup-component.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-petting-success-spider-egg = Вы ласково погладили {$target}... Оно шевельнулось?
-petting-failure-spider-egg = Вы ласково погладили {$target}... Ничего не произошло.
-
diff --git a/Resources/Locale/ru-RU/_Shitmed/inventory/slot-popup.ftl b/Resources/Locale/ru-RU/_Shitmed/inventory/slot-popup.ftl
deleted file mode 100644
index b31872126b4..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/inventory/slot-popup.ftl
+++ /dev/null
@@ -1 +0,0 @@
-equip-part-missing-error = У {$target} отсутствует {$part}!
diff --git a/Resources/Locale/ru-RU/_Shitmed/itemswitch/item-switch.ftl b/Resources/Locale/ru-RU/_Shitmed/itemswitch/item-switch.ftl
deleted file mode 100644
index a10c7d3533d..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/itemswitch/item-switch.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-itemswitch-component-on-examine-detailed-message = Текущий режим: {$state}
-
diff --git a/Resources/Locale/ru-RU/_Shitmed/machine-linking/receiver_ports.ftl b/Resources/Locale/ru-RU/_Shitmed/machine-linking/receiver_ports.ftl
deleted file mode 100644
index 6d4a9806377..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/machine-linking/receiver_ports.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-signal-port-name-operating-table = Операционный стол
-signal-port-description-operating-table-receiver = Приемник сигналов операционного стола
-signal-port-description-operating-table-sender = Передатчик сигналов операционного стола
diff --git a/Resources/Locale/ru-RU/_Shitmed/medical/defibrillator.ftl b/Resources/Locale/ru-RU/_Shitmed/medical/defibrillator.ftl
deleted file mode 100644
index 437c88223b0..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/medical/defibrillator.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
-# SPDX-FileCopyrightText: 2025 deltanedas <39013340+deltanedas@users.noreply.github.com>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-defibrillator-missing-organs = У пациента отсутсвуют жизненно важные органы! Поднятие невозможно.
diff --git a/Resources/Locale/ru-RU/_Shitmed/nutrition/components/food-component.ftl b/Resources/Locale/ru-RU/_Shitmed/nutrition/components/food-component.ftl
deleted file mode 100644
index 2ac57843b7d..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/nutrition/components/food-component.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-## System
-
-food-system-eat-broadcasted = {CAPITALIZE($user)} пытается съесть {$food}!
-food-system-eat-broadcasted-self = Вы начинаете есть {$food}!
-food-system-force-feed-broadcasted = {CAPITALIZE($user)} пытается насильно скормить {$food} {$target}!
-food-system-force-feed-broadcasted-success = {CAPITALIZE($user)} насильно скормил {$food} {$target}!
-food-system-eat-broadcasted-success = {CAPITALIZE($user)} съел {$food}!
diff --git a/Resources/Locale/ru-RU/_Shitmed/research/technologies.ftl b/Resources/Locale/ru-RU/_Shitmed/research/technologies.ftl
deleted file mode 100644
index 8fab75d5ef5..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/research/technologies.ftl
+++ /dev/null
@@ -1 +0,0 @@
-research-technology-autodoc = Автоматизированная хирургия
diff --git a/Resources/Locale/ru-RU/_Shitmed/species/species.ftl b/Resources/Locale/ru-RU/_Shitmed/species/species.ftl
deleted file mode 100644
index 1a3dd5ff7b0..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/species/species.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-species-name-monkey = Обезьяна
-species-name-kobold = Кобольд
diff --git a/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-popup.ftl b/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-popup.ftl
deleted file mode 100644
index 2c1fc90e9a2..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-popup.ftl
+++ /dev/null
@@ -1,55 +0,0 @@
-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}.
-surgery-popup-step-SurgeryStepLobotomize = {$user} проводит лоботомию {$target}!
-surgery-popup-step-SurgeryStepMendBrainTissue = {$user} заживляет мозговую ткань на {$part} {$target}.
-surgery-popup-step-SurgeryStepTreatTumor = {$user} is treating the tumor on {$target}'s {$part}.
diff --git a/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-tools.ftl b/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-tools.ftl
deleted file mode 100644
index eb28c1f6da9..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-tools.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-surgery-tool-turn-on = Сначала включите инструмент!
-surgery-tool-reload = Сначала перезарядите инструмент!
-surgery-tool-match-light = Сначала подожгите её!
-surgery-tool-match-replace = Возьмите новый спичку!
-
-surgery-tool-examinable-verb-text = Хирургический инструмент
-surgery-tool-examinable-verb-message = Изучите варианты использования этого инструмента в хирургических операциях.
-surgery-tool-header = Этот инструмент может использоваться в хирургических операциях как:
-surgery-tool-unlimited = - {$tool} со скоростью [color={$color}]{$speed}x[/color]
-surgery-tool-used = - {$tool} со скоростью [color={$color}]{$speed}x[/color], [color=red]после чего закончится[/color]
diff --git a/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-ui.ftl b/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-ui.ftl
deleted file mode 100644
index d6ba0eab2d8..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/surgery/surgery-ui.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-surgery-verb-text = Начать операцию
-surgery-verb-message = Начать операцию над этим существом.
-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 = Вы не можете оперировать сами себя!
-surgery-part-damage-evaded = {$user} чудом избежал повреждения!
diff --git a/Resources/Locale/ru-RU/_Shitmed/technologies/technologies.ftl b/Resources/Locale/ru-RU/_Shitmed/technologies/technologies.ftl
deleted file mode 100644
index af6109ab67e..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/technologies/technologies.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-research-technology-advanced-treatment = Современное лечение
-research-technology-high-end-surgery = Высокотехнологичные хирургические инструменты
-research-technology-cybernetic-enhancements = Кибернетические улучшения
diff --git a/Resources/Locale/ru-RU/_Shitmed/verbs/verb-system.ftl b/Resources/Locale/ru-RU/_Shitmed/verbs/verb-system.ftl
deleted file mode 100644
index 0a30191b200..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/verbs/verb-system.ftl
+++ /dev/null
@@ -1 +0,0 @@
-verb-categories-switch = Переключить режим
diff --git a/Resources/Locale/ru-RU/_Shitmed/wires/wire-names.ftl b/Resources/Locale/ru-RU/_Shitmed/wires/wire-names.ftl
deleted file mode 100644
index ab6d11943f9..00000000000
--- a/Resources/Locale/ru-RU/_Shitmed/wires/wire-names.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-wires-board-name-autodoc = Автодоктор Мк.XIV
-
-wire-name-autodoc-safety = НЕ НАВРЕДИ
diff --git a/Resources/Locale/ru-RU/_white/alerts/alerts.ftl b/Resources/Locale/ru-RU/_white/alerts/alerts.ftl
index d3aea8464ce..55942c4741d 100644
--- a/Resources/Locale/ru-RU/_white/alerts/alerts.ftl
+++ b/Resources/Locale/ru-RU/_white/alerts/alerts.ftl
@@ -12,3 +12,6 @@ alerts-queen-finder-desc = Позволяет вам чувствовать об
 
 alerts-blood-cult-empowered-name = Усиленный
 alerts-blood-cult-empowered-desc = Магия крови и начертание рун требуют гораздо меньше времени, так же вы теряете меньше крови.
+
+alerts-body-status-name = Состояние тела
+alerts-body-status-desc = Текущее ощущение боли вашим телом. Синий - хорошо. Красный — плохое.
diff --git a/Resources/Locale/ru-RU/_white/body/commands/attach_body_part.ftl b/Resources/Locale/ru-RU/_white/body/commands/attach_body_part.ftl
new file mode 100644
index 00000000000..2974f83f089
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/body/commands/attach_body_part.ftl
@@ -0,0 +1,3 @@
+cmd-attachbodypart-desc = Прикрепляет часть тела к сущности.
+cmd-attachbodypart-help = Использование: attachbodypart <uid тела> <uid части тела> <id слота части тела>
+cmd-attachbodypart-fail = Не удалось прикрепить часть тела к этой сущности.
diff --git a/Resources/Locale/ru-RU/_white/body/commands/attach_bone.ftl b/Resources/Locale/ru-RU/_white/body/commands/attach_bone.ftl
new file mode 100644
index 00000000000..78f6c811ee9
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/body/commands/attach_bone.ftl
@@ -0,0 +1,4 @@
+cmd-attachbone-desc = Прикрепляет кость к сущности.
+cmd-attachbone-help = Использование: attachbone <uid тела> <uid кости> <id слот кости>
+cmd-attachbone-fail = Не удалось прикрепить кость к этому объекту.
+
diff --git a/Resources/Locale/ru-RU/_white/body/commands/attach_organ.ftl b/Resources/Locale/ru-RU/_white/body/commands/attach_organ.ftl
new file mode 100644
index 00000000000..2ceb8ea648d
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/body/commands/attach_organ.ftl
@@ -0,0 +1,3 @@
+cmd-attachorgan-desc = Прикрепляет орган к сущности.
+cmd-attachorgan-help = Использование: attachorgan <uid тела> <uid органа> <id слота органа>
+cmd-attachorgan-fail = Не удалось прикрепить орган к этой сущности.
diff --git a/Resources/Locale/ru-RU/_white/body/commands/create_body_part_slot.ftl b/Resources/Locale/ru-RU/_white/body/commands/create_body_part_slot.ftl
new file mode 100644
index 00000000000..cce214a0ea1
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/body/commands/create_body_part_slot.ftl
@@ -0,0 +1,3 @@
+cmd-createbodypartslot-desc = Создает слот части тела для заданной сущности.
+cmd-createbodypartslot-help = Использование: createbodypartslot <uid сущности> <id слота части тела> <тип части тела>
+cmd-createbodypartslot-fail = Не удалось создать слот части тела для этой сущности.
diff --git a/Resources/Locale/ru-RU/_white/body/commands/create_bone_slot.ftl b/Resources/Locale/ru-RU/_white/body/commands/create_bone_slot.ftl
new file mode 100644
index 00000000000..09febd358e3
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/body/commands/create_bone_slot.ftl
@@ -0,0 +1,3 @@
+cmd-createboneslot-desc = Создает слот кости для заданной сущности.
+cmd-createboneslot-help = Использование: createboneslot <uid сущности> <id слот кости> <тип кости>
+cmd-createboneslot-fail = Не удалось создать слот кости для этой сущности.
diff --git a/Resources/Locale/ru-RU/_white/body/commands/create_organ_slot.ftl b/Resources/Locale/ru-RU/_white/body/commands/create_organ_slot.ftl
new file mode 100644
index 00000000000..86740bc05c4
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/body/commands/create_organ_slot.ftl
@@ -0,0 +1,3 @@
+cmd-createorganslot-desc = Создает слот органа для заданной сущности.
+cmd-createorganslot-help = Использование: createorganslot <uid сущности> <id слота органа> <тип органа>
+cmd-createorganslot-fail = Не удалось создать слот органа для этого объекта.
diff --git a/Resources/Locale/ru-RU/_white/chat/emotion.ftl b/Resources/Locale/ru-RU/_white/chat/emotion.ftl
index 88da082a36c..8015e9eb6b7 100644
--- a/Resources/Locale/ru-RU/_white/chat/emotion.ftl
+++ b/Resources/Locale/ru-RU/_white/chat/emotion.ftl
@@ -1,17 +1,17 @@
 # Names
+chat-emote-name-pain-scream = Кричать от боли
 chat-emote-name-nod = Кивнуть
 chat-emote-name-shake-head = Качать головой
 chat-emote-name-frown = Хмуриться
 chat-emote-name-smile = Улыбнуться
 
 # Message
-# Message
+chat-emote-msg-pain-scream = кричит от боли!
 chat-emote-msg-nod = кивает.
 chat-emote-msg-shake-head = качает головой.
 chat-emote-msg-frown = хмурится.
 chat-emote-msg-smile = улыбается.
 
-# Triggers
 # Triggers
 chat-emote-trigger-nod-1 = кивает
 chat-emote-trigger-shake-head-1 = качает головой
diff --git a/Resources/Locale/ru-RU/_white/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/_white/escape-menu/ui/options-menu.ftl
index 5a32c079f71..67e1415f8fc 100644
--- a/Resources/Locale/ru-RU/_white/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/_white/escape-menu/ui/options-menu.ftl
@@ -1,8 +1,25 @@
+## Controls menu
+
+ui-options-header-target-doll = Кукла нацеливания
+
 ui-options-function-look-up = Присмотреться/Прицелиться
 ui-options-function-toggle-look-up = Удерживать клавишу для прицеливания
-
 ui-options-function-smart-equip-suit-storage = Умная экипировка в хранилище скафандра
 ui-options-function-smart-equip-pocket1 = Умная экипировка в карман 1
 ui-options-function-smart-equip-pocket2 = Умная экипировка в карман 2
-
 ui-options-lighting-shader = Шейдеры освещения
+
+ui-options-function-target-doll-head = Выбрать голову
+ui-options-function-target-doll-chest = Выбрать грудь
+ui-options-function-target-doll-groin = Выбрать пах
+ui-options-function-target-doll-right-arm = Выбрать правую руку
+ui-options-function-target-doll-right-hand = Выбрать правую ладонь
+ui-options-function-target-doll-left-arm = Выбрать левую руку
+ui-options-function-target-doll-left-hand = Выбрать левую ладонь
+ui-options-function-target-doll-right-leg = Выбрать правую ногу
+ui-options-function-target-doll-right-foot = Выбрать правую стопу
+ui-options-function-target-doll-left-leg = Выбрать левую ногу
+ui-options-function-target-doll-left-foot = Выбрать левую стопу
+ui-options-function-target-doll-tail = Выбрать хвост
+ui-options-function-target-doll-eyes = Выбрать глаза
+ui-options-function-target-doll-mouth = Выбрать рот
diff --git a/Resources/Locale/ru-RU/_white/guidebook/chemistry/core.ftl b/Resources/Locale/ru-RU/_white/guidebook/chemistry/core.ftl
new file mode 100644
index 00000000000..58f564fe630
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/guidebook/chemistry/core.ftl
@@ -0,0 +1,3 @@
+guidebook-reagent-effects-metabolism-stage-rate = [bold]{$stage}[/bold] [color=gray]({$rate} единиц в секунду)[/color]
+guidebook-reagent-effects-metabolite-item = {$reagent} со скоростью { NATURALPERCENT($rate, 2) }
+guidebook-reagent-effects-metabolites = Метаболизируется в { $items }.
diff --git a/Resources/Locale/ru-RU/_white/hands/commands/add_hand.ftl b/Resources/Locale/ru-RU/_white/hands/commands/add_hand.ftl
new file mode 100644
index 00000000000..0a8f5cb01d3
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/hands/commands/add_hand.ftl
@@ -0,0 +1,2 @@
+cmd-addhand-desc = Добавляет руку для заданной сущности.
+cmd-addhand-help = Использование: addhand [uid сущности] [id руки] [локация руки]
diff --git a/Resources/Locale/ru-RU/_white/hands/commands/remove_hand.ftl b/Resources/Locale/ru-RU/_white/hands/commands/remove_hand.ftl
new file mode 100644
index 00000000000..2d5a8607327
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/hands/commands/remove_hand.ftl
@@ -0,0 +1,2 @@
+cmd-removehand-desc = Удаляет руку из заданной сущности.
+cmd-removehand-help = Использование: removehand [uid сущности] [id руки]
diff --git a/Resources/Locale/ru-RU/_white/medical/components/healing-component.ftl b/Resources/Locale/ru-RU/_white/medical/components/healing-component.ftl
new file mode 100644
index 00000000000..13724f24be1
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/medical/components/healing-component.ftl
@@ -0,0 +1 @@
+medical-item-cant-use-switch-body-part = На {$body-part} нет повреждений, которые можно было бы вылечить с помощью {$item}. Начинаю лечение {$new-body-part}.
diff --git a/Resources/Locale/ru-RU/_white/metabolism/metabolism-stages.ftl b/Resources/Locale/ru-RU/_white/metabolism/metabolism-stages.ftl
new file mode 100644
index 00000000000..3c80ecb4e38
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/metabolism/metabolism-stages.ftl
@@ -0,0 +1,5 @@
+metabolism-stage-respiration = Дыхание
+metabolism-stage-digestion = Пищеварение
+metabolism-stage-absorption = Aбсорбция
+metabolism-stage-excretion = Экскреция
+metabolism-stage-plant = Метаболизм растений
diff --git a/Resources/Locale/ru-RU/_white/shell.ftl b/Resources/Locale/ru-RU/_white/shell.ftl
new file mode 100644
index 00000000000..e3f1dec8d61
--- /dev/null
+++ b/Resources/Locale/ru-RU/_white/shell.ftl
@@ -0,0 +1,21 @@
+## Guards
+
+shell-argument-body-part-type-invalid = Аргумент {$index} должен быть допустимым типом части тела!
+shell-argument-bone-type-invalid = Аргумент {$index} должен быть допустимым типом кости!
+shell-argument-hand-location-invalid = Аргумент {$index} должен быть допустимым расположением руки!
+shell-argument-organ-type-invalid = Аргумент {$index} должен быть допустимым типом органа!
+
+# Hints
+
+shell-argument-body-part-type-hint = <тип части тела>
+shell-argument-body-part-type-optional-hint = [тип части тела]
+shell-argument-bone-type-hint = <тип кости>
+shell-argument-bone-type-optional-hint = [тип кости]
+shell-argument-entity-hint = <сущность>
+shell-argument-entity-optional-hint = [сущность]
+shell-argument-hand-location-hint = <расположение руки>
+shell-argument-hand-location-optional-hint = [расположение руки]
+shell-argument-organ-type-hint = <тип органа>
+shell-argument-organ-type-optional-hint = [тип органа]
+shell-argument-string-hint = <строка>
+shell-argument-string-optional-hint = [строка]
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
index 3eb1fb67a04..0cdf625c3fd 100644
--- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -127,7 +127,6 @@ ui-options-header-camera = Камера
 ui-options-header-interaction-basic = Базовые взаимодействия
 ui-options-header-interaction-adv = Продвинутые взаимодействия
 ui-options-header-ui = Интерфейс
-ui-options-header-targeting = Нацеливание
 ui-options-header-misc = Разное
 ui-options-header-hotbar = Хотбар
 ui-options-header-shuttle = Шаттл
@@ -183,12 +182,6 @@ ui-options-function-move-pulled-object = Тянуть объект в сторо
 ui-options-function-release-pulled-object = Перестать тянуть объект
 ui-options-function-point = Указать на что-либо
 
-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-function-focus-chat-input-window = Писать в чат
 ui-options-function-focus-local-chat-window = Писать в чат (IC)
 ui-options-function-focus-emote = Писать в чат (Эмоции)
diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
index 5220f5d5348..b6e534da791 100644
--- a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
+++ b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl
@@ -14,7 +14,6 @@ guidebook-reagent-sources-header = Источники
 guidebook-reagent-sources-ent-wrapper = [bold]{$name}[/bold] \[1\]
 guidebook-reagent-sources-gas-wrapper = [bold]{$name} (газ)[/bold] \[1\]
 guidebook-reagent-effects-header = Эффекты
-guidebook-reagent-effects-metabolism-group-rate = [bold]{ $group }[/bold] [color=gray]({ $rate } единиц в секунду)[/color]
 guidebook-reagent-plant-metabolisms-header = Plant Metabolism
 guidebook-reagent-plant-metabolisms-rate = [bold]Plant Metabolism[/bold] [color=gray](1 unit every 3 seconds as base)[/color]
 guidebook-reagent-physical-description = [italic]Кажется {$description}.[/italic]
diff --git a/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/abductor_shuttle.yml b/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/abductor_shuttle.yml
deleted file mode 100644
index 07415afc560..00000000000
--- a/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/abductor_shuttle.yml
+++ /dev/null
@@ -1,1590 +0,0 @@
-meta:
-  format: 7
-  category: Grid
-  engineVersion: 260.2.0
-  forkId: ""
-  forkVersion: ""
-  time: 08/21/2025 12:44:52
-  entityCount: 243
-maps: []
-grids:
-- 1
-orphans:
-- 1
-nullspace: []
-tilemap:
-  0: Space
-  1: FloorAbductor
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: grid
-    - type: Transform
-      pos: -0.5520833,-0.5416667
-      parent: invalid
-    - type: MapGrid
-      chunks:
-        0,0:
-          ind: 0,0
-          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-          version: 7
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-          version: 7
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-          version: 7
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
-          version: 7
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes: []
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          0,0:
-            0: 53239
-          0,-1:
-            0: 30479
-          -1,0:
-            0: 14796
-          0,1:
-            0: 1599
-          -1,1:
-            0: 3226
-          1,0:
-            0: 5444
-          1,1:
-            0: 18
-          1,-1:
-            0: 21778
-          -2,0:
-            0: 1092
-          -2,-1:
-            0: 17416
-          -2,1:
-            0: 8
-          -1,-1:
-            0: 56606
-          0,-2:
-            0: 1792
-          -1,-2:
-            0: 7168
-          1,-2:
-            0: 4096
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: GasTileOverlay
-    - type: RadiationGridResistance
-- proto: AbductorAlienPad
-  entities:
-  - uid: 181
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 1
-- proto: AbductorConsole
-  entities:
-  - uid: 182
-    components:
-    - type: Transform
-      pos: 0.5,2.5
-      parent: 1
-- proto: AbductorExperimentator
-  entities:
-  - uid: 2
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 1
-- proto: AbductorHandcuffs
-  entities:
-  - uid: 196
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 1
-  - uid: 197
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 1
-  - uid: 198
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 1
-- proto: AbductorHumanObservationConsole
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: -1.5,1.5
-      parent: 1
-- proto: AbductorOperatingTable
-  entities:
-  - uid: 3
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 1
-- proto: AirAlarm
-  entities:
-  - uid: 248
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 240
-- proto: APCHyperCapacity
-  entities:
-  - uid: 85
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,0.5
-      parent: 1
-- proto: BasicCyberneticEyes
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 1
-  - uid: 227
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 5
-    components:
-    - type: Transform
-      pos: -4.5,4.5
-      parent: 1
-  - uid: 6
-    components:
-    - type: Transform
-      pos: -3.5,4.5
-      parent: 1
-  - uid: 7
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 1
-  - uid: 8
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 13
-    components:
-    - type: Transform
-      pos: -1.5,5.5
-      parent: 1
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -3.5,5.5
-      parent: 1
-  - uid: 16
-    components:
-    - type: Transform
-      pos: 3.5,5.5
-      parent: 1
-  - uid: 19
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 28
-    components:
-    - type: Transform
-      pos: 4.5,5.5
-      parent: 1
-  - uid: 32
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 114
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 1
-  - uid: 117
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 118
-    components:
-    - type: Transform
-      pos: -2.5,5.5
-      parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 122
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 1
-  - uid: 124
-    components:
-    - type: Transform
-      pos: 3.5,-0.5
-      parent: 1
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 126
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 127
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 128
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 130
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 131
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 132
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 133
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 134
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 1
-  - uid: 135
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 1
-  - uid: 136
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 1
-  - uid: 137
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 138
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 1
-  - uid: 139
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 1
-  - uid: 140
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
-  - uid: 141
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 1
-  - uid: 142
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 1
-  - uid: 144
-    components:
-    - type: Transform
-      pos: 1.5,5.5
-      parent: 1
-  - uid: 149
-    components:
-    - type: Transform
-      pos: 5.5,4.5
-      parent: 1
-  - uid: 186
-    components:
-    - type: Transform
-      pos: 5.5,3.5
-      parent: 1
-  - uid: 187
-    components:
-    - type: Transform
-      pos: 5.5,2.5
-      parent: 1
-  - uid: 188
-    components:
-    - type: Transform
-      pos: 5.5,1.5
-      parent: 1
-  - uid: 189
-    components:
-    - type: Transform
-      pos: -4.5,3.5
-      parent: 1
-  - uid: 190
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 1
-  - uid: 191
-    components:
-    - type: Transform
-      pos: -4.5,1.5
-      parent: 1
-- proto: CableHV
-  entities:
-  - uid: 39
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 100
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 101
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 102
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 103
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 104
-    components:
-    - type: Transform
-      pos: 1.5,-3.5
-      parent: 1
-  - uid: 105
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-  - uid: 111
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 1
-  - uid: 112
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 176
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
-- proto: CableMV
-  entities:
-  - uid: 21
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 22
-    components:
-    - type: Transform
-      pos: -3.5,-0.5
-      parent: 1
-  - uid: 23
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 24
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-- proto: CableTerminal
-  entities:
-  - uid: 38
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-3.5
-      parent: 1
-- proto: ChairPilotSeat
-  entities:
-  - uid: 162
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 1
-- proto: ClockworkGrille
-  entities:
-  - uid: 45
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
-- proto: ClothingAbductorBeltFilled
-  entities:
-  - uid: 12
-    components:
-    - type: Transform
-      pos: -1.4820733,0.17776257
-      parent: 1
-- proto: ClothingBackpackDuffelAbductorFilled
-  entities:
-  - uid: 202
-    components:
-    - type: Transform
-      pos: -1.4716566,0.75067925
-      parent: 1
-- proto: ComputerIFF
-  entities:
-  - uid: 183
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,4.5
-      parent: 1
-- proto: ComputerShuttle
-  entities:
-  - uid: 14
-    components:
-    - type: Transform
-      pos: 0.5,5.5
-      parent: 1
-- proto: Defibrillator
-  entities:
-  - uid: 231
-    components:
-    - type: Transform
-      pos: 0.13108987,-1.5783088
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: DubiousOrganSpawner
-  entities:
-  - uid: 83
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 199
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 200
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 201
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 209
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 210
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 211
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 212
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 213
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-- proto: GasMinerNitrogen
-  entities:
-  - uid: 241
-    components:
-    - type: Transform
-      pos: -3.5,3.5
-      parent: 1
-  - uid: 242
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 1
-- proto: GasMinerOxygen
-  entities:
-  - uid: 89
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 1
-- proto: GasPassiveVent
-  entities:
-  - uid: 58
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-5.5
-      parent: 1
-  - uid: 244
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,4.5
-      parent: 1
-  - uid: 245
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,4.5
-      parent: 1
-- proto: GasPipeStraight
-  entities:
-  - uid: 246
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,4.5
-      parent: 1
-  - uid: 247
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,4.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 250
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 251
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 1
-- proto: GasVentScrubber
-  entities:
-  - uid: 240
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 248
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 41
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 95
-    components:
-    - type: Transform
-      pos: 1.5,-3.5
-      parent: 1
-  - uid: 96
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 148
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-- proto: Gyroscope
-  entities:
-  - uid: 47
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-0.5
-      parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-0.5
-      parent: 1
-  - uid: 173
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-2.5
-      parent: 1
-- proto: HandheldHealthAnalyzer
-  entities:
-  - uid: 232
-    components:
-    - type: Transform
-      pos: 0.14034912,-1.240346
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedicalCyberneticEyes
-  entities:
-  - uid: 219
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 1
-  - uid: 220
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 1
-  - uid: 221
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 1
-- proto: MedkitBruteFilled
-  entities:
-  - uid: 204
-    components:
-    - type: Transform
-      pos: 0.8669682,-1.2758512
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitBurnFilled
-  entities:
-  - uid: 207
-    components:
-    - type: Transform
-      pos: 1.5799313,-1.2527032
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitCombatFilled
-  entities:
-  - uid: 206
-    components:
-    - type: Transform
-      pos: 1.1879536,-1.3730736
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitRadiationFilled
-  entities:
-  - uid: 205
-    components:
-    - type: Transform
-      pos: 0.8391905,-1.5489993
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitToxinFilled
-  entities:
-  - uid: 215
-    components:
-    - type: Transform
-      pos: 1.5861018,-1.6045549
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: Poweredlight
-  entities:
-  - uid: 237
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 1
-  - uid: 238
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 239
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 1
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 26
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,6.5
-      parent: 1
-- proto: SecurityCyberneticEyes
-  entities:
-  - uid: 222
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 1
-  - uid: 223
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 1
-  - uid: 224
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 1
-- proto: SMESBasic
-  entities:
-  - uid: 174
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 1
-- proto: SpawnPointLoneAbductor
-  entities:
-  - uid: 203
-    components:
-    - type: Transform
-      pos: 0.5,1.5
-      parent: 1
-- proto: SubstationBasic
-  entities:
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 94
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-- proto: TableAbductor
-  entities:
-  - uid: 9
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 10
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,2.5
-      parent: 1
-  - uid: 11
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-0.5
-      parent: 1
-  - uid: 18
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,0.5
-      parent: 1
-  - uid: 51
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,3.5
-      parent: 1
-  - uid: 192
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 1
-  - uid: 193
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
-      parent: 1
-  - uid: 194
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 214
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-- proto: Thruster
-  entities:
-  - uid: 37
-    components:
-    - type: Transform
-      pos: -1.5,6.5
-      parent: 1
-  - uid: 40
-    components:
-    - type: Transform
-      pos: 6.5,2.5
-      parent: 1
-  - uid: 79
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,1.5
-      parent: 1
-  - uid: 80
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,0.5
-      parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-0.5
-      parent: 1
-  - uid: 82
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-1.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 2.5,6.5
-      parent: 1
-  - uid: 156
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,1.5
-      parent: 1
-  - uid: 157
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-0.5
-      parent: 1
-  - uid: 158
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
-      parent: 1
-  - uid: 159
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
-      parent: 1
-  - uid: 160
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
-      parent: 1
-  - uid: 161
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-5.5
-      parent: 1
-  - uid: 163
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-5.5
-      parent: 1
-  - uid: 164
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-5.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: -5.5,2.5
-      parent: 1
-  - uid: 252
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-5.5
-      parent: 1
-- proto: TurboItemRecharger
-  entities:
-  - uid: 233
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 1
-- proto: WallAbductor
-  entities:
-  - uid: 20
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,2.5
-      parent: 1
-  - uid: 29
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 30
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,3.5
-      parent: 1
-  - uid: 35
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,5.5
-      parent: 1
-  - uid: 36
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,5.5
-      parent: 1
-  - uid: 43
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 1
-  - uid: 44
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 46
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 48
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 50
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,5.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,1.5
-      parent: 1
-  - uid: 53
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-0.5
-      parent: 1
-  - uid: 54
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,0.5
-      parent: 1
-  - uid: 55
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-1.5
-      parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 1
-  - uid: 59
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,3.5
-      parent: 1
-  - uid: 60
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-4.5
-      parent: 1
-  - uid: 61
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 62
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 63
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 64
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 65
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 1
-  - uid: 67
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,0.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,1.5
-      parent: 1
-  - uid: 69
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 70
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,0.5
-      parent: 1
-  - uid: 71
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 73
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 76
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-4.5
-      parent: 1
-  - uid: 77
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,2.5
-      parent: 1
-  - uid: 78
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 1
-  - uid: 84
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 121
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 143
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-4.5
-      parent: 1
-  - uid: 145
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 146
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-2.5
-      parent: 1
-  - uid: 147
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,3.5
-      parent: 1
-  - uid: 150
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,2.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,1.5
-      parent: 1
-  - uid: 152
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,1.5
-      parent: 1
-  - uid: 153
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,0.5
-      parent: 1
-  - uid: 154
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
-      parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 1
-  - uid: 169
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
-      parent: 1
-  - uid: 170
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,5.5
-      parent: 1
-  - uid: 179
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 180
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,4.5
-      parent: 1
-  - uid: 184
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,3.5
-      parent: 1
-  - uid: 185
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,3.5
-      parent: 1
-  - uid: 243
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,4.5
-      parent: 1
-- proto: WallAbductorDiagonal
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,4.5
-      parent: 1
-  - uid: 27
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,6.5
-      parent: 1
-  - uid: 31
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,5.5
-      parent: 1
-  - uid: 33
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,5.5
-      parent: 1
-  - uid: 34
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 1
-  - uid: 57
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 75
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 90
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 97
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,5.5
-      parent: 1
-  - uid: 113
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 115
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,4.5
-      parent: 1
-  - uid: 116
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
-      parent: 1
-  - uid: 120
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-3.5
-      parent: 1
-  - uid: 166
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 167
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-4.5
-      parent: 1
-  - uid: 168
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
-      parent: 1
-  - uid: 171
-    components:
-    - type: Transform
-      pos: -3.5,5.5
-      parent: 1
-  - uid: 172
-    components:
-    - type: Transform
-      pos: -4.5,4.5
-      parent: 1
-- proto: Wonderprod
-  entities:
-  - uid: 195
-    components:
-    - type: Transform
-      pos: 4.5119457,3.4933095
-      parent: 1
-    - type: Item
-      heldPrefix: stun
-    - type: Clothing
-      equippedPrefix: stun
-    - type: StaminaDamageOnHit
-      sound: !type:SoundPathSpecifier
-        path: /Audio/Weapons/Guns/Hits/taser_hit.ogg
-      damage: 225
-    - type: MeleeWeapon
-      damage:
-        types:
-          Shock: 0
-      attackRate: 0.5
-      soundNoDamage: !type:SoundCollectionSpecifier
-        collection: WeakHit
-      soundSwing: !type:SoundPathSpecifier
-        params:
-          variation: 0.025
-          volume: -3
-        path: /Audio/Weapons/punchmiss.ogg
-      contestArgs:
-        doStaminaInteraction: True
-        staminaDisadvantage: True
-        doHealthInteraction: True
-      wideAnimationRotation: -2.356194490192345 rad
-...
diff --git a/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle.yml b/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle.yml
deleted file mode 100644
index b460a9508da..00000000000
--- a/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle.yml
+++ /dev/null
@@ -1,1681 +0,0 @@
-meta:
-  format: 7
-  category: Map
-  engineVersion: 260.2.0
-  forkId: ""
-  forkVersion: ""
-  time: 07/02/2025 22:35:39
-  entityCount: 245
-maps:
-- 1
-grids:
-- 2
-orphans: []
-nullspace: []
-tilemap:
-  0: Space
-  1: FloorAbductor
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-  - uid: 2
-    components:
-    - type: MetaData
-      name: grid
-    - type: Transform
-      pos: -0.5520833,-0.5416667
-      parent: 1
-    - type: MapGrid
-      chunks:
-        0,0:
-          ind: 0,0
-          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-          version: 7
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-          version: 7
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-          version: 7
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
-          version: 7
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes: []
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          0,0:
-            0: 53239
-          0,-1:
-            0: 30479
-          -1,0:
-            0: 14796
-          0,1:
-            0: 1599
-          -1,1:
-            0: 3226
-          1,0:
-            0: 5444
-          1,1:
-            0: 18
-          1,-1:
-            0: 21778
-          -2,0:
-            0: 1092
-          -2,-1:
-            0: 17416
-          -2,1:
-            0: 8
-          -1,-1:
-            0: 56606
-          0,-2:
-            0: 1792
-          -1,-2:
-            0: 7168
-          1,-2:
-            0: 4096
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: GasTileOverlay
-    - type: RadiationGridResistance
-- proto: AbductorAlienPad
-  entities:
-  - uid: 3
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 2
-- proto: AbductorConsole
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: 0.5,2.5
-      parent: 2
-- proto: AbductorExperimentator
-  entities:
-  - uid: 5
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 2
-- proto: AbductorHandcuffs
-  entities:
-  - uid: 6
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 2
-  - uid: 7
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 2
-  - uid: 8
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 2
-- proto: AbductorHumanObservationConsole
-  entities:
-  - uid: 9
-    components:
-    - type: Transform
-      pos: -1.5,1.5
-      parent: 2
-- proto: AbductorOperatingTable
-  entities:
-  - uid: 10
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 2
-- proto: AirAlarm
-  entities:
-  - uid: 11
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 115
-- proto: APCHyperCapacity
-  entities:
-  - uid: 12
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,0.5
-      parent: 2
-  - uid: 13
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,0.5
-      parent: 2
-- proto: BasicCyberneticEyes
-  entities:
-  - uid: 14
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 2
-  - uid: 15
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 2
-  - uid: 16
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 2
-- proto: CableApcExtension
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      pos: -4.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 18
-    components:
-    - type: Transform
-      pos: -3.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 19
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 2
-    - type: Visibility
-  - uid: 20
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 2
-    - type: Visibility
-  - uid: 21
-    components:
-    - type: Transform
-      pos: -1.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 22
-    components:
-    - type: Transform
-      pos: -3.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 23
-    components:
-    - type: Transform
-      pos: 3.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 24
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 4.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 26
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 2
-    - type: Visibility
-  - uid: 27
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 2
-    - type: Visibility
-  - uid: 28
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 2
-    - type: Visibility
-  - uid: 29
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 30
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 31
-    components:
-    - type: Transform
-      pos: -2.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 32
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 2
-    - type: Visibility
-  - uid: 33
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 2
-    - type: Visibility
-  - uid: 34
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 2
-    - type: Visibility
-  - uid: 35
-    components:
-    - type: Transform
-      pos: 3.5,-0.5
-      parent: 2
-    - type: Visibility
-  - uid: 36
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 37
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 38
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 39
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 40
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 41
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 42
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 43
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 44
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 45
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 2
-    - type: Visibility
-  - uid: 46
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 2
-    - type: Visibility
-  - uid: 47
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 2
-    - type: Visibility
-  - uid: 48
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 2
-    - type: Visibility
-  - uid: 49
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 2
-    - type: Visibility
-  - uid: 50
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 2
-    - type: Visibility
-  - uid: 51
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 2
-    - type: Visibility
-  - uid: 52
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 2
-    - type: Visibility
-  - uid: 53
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 54
-    components:
-    - type: Transform
-      pos: 1.5,5.5
-      parent: 2
-    - type: Visibility
-  - uid: 55
-    components:
-    - type: Transform
-      pos: 5.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 56
-    components:
-    - type: Transform
-      pos: 5.5,3.5
-      parent: 2
-    - type: Visibility
-  - uid: 57
-    components:
-    - type: Transform
-      pos: 5.5,2.5
-      parent: 2
-    - type: Visibility
-  - uid: 58
-    components:
-    - type: Transform
-      pos: 5.5,1.5
-      parent: 2
-    - type: Visibility
-  - uid: 59
-    components:
-    - type: Transform
-      pos: -4.5,3.5
-      parent: 2
-    - type: Visibility
-  - uid: 60
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 2
-    - type: Visibility
-  - uid: 61
-    components:
-    - type: Transform
-      pos: -4.5,1.5
-      parent: 2
-    - type: Visibility
-- proto: CableHV
-  entities:
-  - uid: 62
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 63
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 64
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 65
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 66
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 67
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 68
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 69
-    components:
-    - type: Transform
-      pos: 1.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 70
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 71
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 72
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 73
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 75
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 76
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 77
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 78
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 79
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 2
-    - type: Visibility
-- proto: CableMV
-  entities:
-  - uid: 80
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 2
-    - type: Visibility
-  - uid: 81
-    components:
-    - type: Transform
-      pos: -3.5,-0.5
-      parent: 2
-    - type: Visibility
-  - uid: 82
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 2
-    - type: Visibility
-  - uid: 83
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 2
-    - type: Visibility
-  - uid: 84
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 2
-    - type: Visibility
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 2
-    - type: Visibility
-- proto: CableTerminal
-  entities:
-  - uid: 86
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-3.5
-      parent: 2
-    - type: Visibility
-- proto: ChairPilotSeat
-  entities:
-  - uid: 87
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 2
-- proto: ClockworkGrille
-  entities:
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 2
-- proto: ClothingAbductorBeltFilled
-  entities:
-  - uid: 89
-    components:
-    - type: Transform
-      pos: -1.4820733,0.17776257
-      parent: 2
-- proto: ClothingBackpackDuffelAbductorFilled
-  entities:
-  - uid: 90
-    components:
-    - type: Transform
-      pos: -1.4716566,0.75067925
-      parent: 2
-- proto: ComputerIFF
-  entities:
-  - uid: 91
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,4.5
-      parent: 2
-- proto: ComputerShuttle
-  entities:
-  - uid: 92
-    components:
-    - type: Transform
-      pos: 0.5,5.5
-      parent: 2
-- proto: Defibrillator
-  entities:
-  - uid: 93
-    components:
-    - type: Transform
-      pos: 0.13108987,-1.5783088
-      parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: DubiousOrganSpawner
-  entities:
-  - uid: 94
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 95
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 97
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 100
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 101
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 102
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 103
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 2
-- proto: GasMinerNitrogen
-  entities:
-  - uid: 104
-    components:
-    - type: Transform
-      pos: -3.5,3.5
-      parent: 2
-  - uid: 105
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 2
-- proto: GasMinerOxygen
-  entities:
-  - uid: 106
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 2
-- proto: GasPassiveVent
-  entities:
-  - uid: 107
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-5.5
-      parent: 2
-    - type: Visibility
-  - uid: 108
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 109
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,4.5
-      parent: 2
-    - type: Visibility
-- proto: GasPipeStraight
-  entities:
-  - uid: 110
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 111
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,4.5
-      parent: 2
-    - type: Visibility
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 2
-    - type: Visibility
-  - uid: 113
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 2
-    - type: Visibility
-  - uid: 114
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 2
-    - type: Visibility
-- proto: GasVentScrubber
-  entities:
-  - uid: 115
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 11
-    - type: Visibility
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 116
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 2
-  - uid: 117
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 2
-  - uid: 118
-    components:
-    - type: Transform
-      pos: 1.5,-3.5
-      parent: 2
-  - uid: 119
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 2
-  - uid: 120
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 2
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 121
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 2
-- proto: Gyroscope
-  entities:
-  - uid: 122
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-0.5
-      parent: 2
-  - uid: 123
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-0.5
-      parent: 2
-  - uid: 124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-2.5
-      parent: 2
-- proto: HandheldHealthAnalyzer
-  entities:
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 0.14034912,-1.240346
-      parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedicalCyberneticEyes
-  entities:
-  - uid: 126
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 2
-  - uid: 127
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 2
-  - uid: 128
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 2
-- proto: MedkitBruteFilled
-  entities:
-  - uid: 129
-    components:
-    - type: Transform
-      pos: 0.8669682,-1.2758512
-      parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitBurnFilled
-  entities:
-  - uid: 130
-    components:
-    - type: Transform
-      pos: 1.5799313,-1.2527032
-      parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitCombatFilled
-  entities:
-  - uid: 131
-    components:
-    - type: Transform
-      pos: 1.1879536,-1.3730736
-      parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitRadiationFilled
-  entities:
-  - uid: 132
-    components:
-    - type: Transform
-      pos: 0.8391905,-1.5489993
-      parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitToxinFilled
-  entities:
-  - uid: 133
-    components:
-    - type: Transform
-      pos: 1.5861018,-1.6045549
-      parent: 2
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: Poweredlight
-  entities:
-  - uid: 134
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 2
-  - uid: 135
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
-      parent: 2
-  - uid: 136
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 2
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 137
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,6.5
-      parent: 2
-- proto: SecurityCyberneticEyes
-  entities:
-  - uid: 138
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 2
-  - uid: 139
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 2
-  - uid: 140
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 2
-- proto: SMESBasic
-  entities:
-  - uid: 141
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 2
-- proto: SpawnPointAbductorAgent
-  entities:
-  - uid: 142
-    components:
-    - type: Transform
-      pos: -0.5,1.5
-      parent: 2
-- proto: SpawnPointAbductorScientist
-  entities:
-  - uid: 143
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 2
-- proto: SubstationBasic
-  entities:
-  - uid: 144
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 2
-  - uid: 145
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 2
-- proto: TableAbductor
-  entities:
-  - uid: 146
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-1.5
-      parent: 2
-  - uid: 147
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,2.5
-      parent: 2
-  - uid: 148
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-0.5
-      parent: 2
-  - uid: 149
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,0.5
-      parent: 2
-  - uid: 150
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,3.5
-      parent: 2
-  - uid: 151
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 2
-  - uid: 152
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
-      parent: 2
-  - uid: 153
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
-      parent: 2
-  - uid: 154
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 2
-- proto: Thruster
-  entities:
-  - uid: 155
-    components:
-    - type: Transform
-      pos: -1.5,6.5
-      parent: 2
-  - uid: 156
-    components:
-    - type: Transform
-      pos: 6.5,2.5
-      parent: 2
-  - uid: 157
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,1.5
-      parent: 2
-  - uid: 158
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,0.5
-      parent: 2
-  - uid: 159
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-0.5
-      parent: 2
-  - uid: 160
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-1.5
-      parent: 2
-  - uid: 161
-    components:
-    - type: Transform
-      pos: 2.5,6.5
-      parent: 2
-  - uid: 162
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,1.5
-      parent: 2
-  - uid: 163
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-0.5
-      parent: 2
-  - uid: 164
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
-      parent: 2
-  - uid: 165
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
-      parent: 2
-  - uid: 166
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
-      parent: 2
-  - uid: 167
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-5.5
-      parent: 2
-  - uid: 168
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-5.5
-      parent: 2
-  - uid: 169
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-5.5
-      parent: 2
-  - uid: 170
-    components:
-    - type: Transform
-      pos: -5.5,2.5
-      parent: 2
-  - uid: 171
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-5.5
-      parent: 2
-- proto: TurboItemRecharger
-  entities:
-  - uid: 172
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 2
-- proto: WallAbductor
-  entities:
-  - uid: 173
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,2.5
-      parent: 2
-  - uid: 174
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,2.5
-      parent: 2
-  - uid: 175
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,3.5
-      parent: 2
-  - uid: 176
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,5.5
-      parent: 2
-  - uid: 177
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,5.5
-      parent: 2
-  - uid: 178
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 2
-  - uid: 179
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 2
-  - uid: 180
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
-      parent: 2
-  - uid: 181
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 2
-  - uid: 182
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,5.5
-      parent: 2
-  - uid: 183
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,1.5
-      parent: 2
-  - uid: 184
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-0.5
-      parent: 2
-  - uid: 185
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,0.5
-      parent: 2
-  - uid: 186
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-1.5
-      parent: 2
-  - uid: 187
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 2
-  - uid: 188
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,3.5
-      parent: 2
-  - uid: 189
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-4.5
-      parent: 2
-  - uid: 190
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
-      parent: 2
-  - uid: 191
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 2
-  - uid: 192
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-2.5
-      parent: 2
-  - uid: 193
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-2.5
-      parent: 2
-  - uid: 194
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
-      parent: 2
-  - uid: 195
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 2
-  - uid: 196
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,0.5
-      parent: 2
-  - uid: 197
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,1.5
-      parent: 2
-  - uid: 198
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-1.5
-      parent: 2
-  - uid: 199
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,0.5
-      parent: 2
-  - uid: 200
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
-      parent: 2
-  - uid: 201
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 2
-  - uid: 202
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
-      parent: 2
-  - uid: 203
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-4.5
-      parent: 2
-  - uid: 204
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,2.5
-      parent: 2
-  - uid: 205
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 2
-  - uid: 206
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,0.5
-      parent: 2
-  - uid: 207
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 2
-  - uid: 208
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-4.5
-      parent: 2
-  - uid: 209
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-2.5
-      parent: 2
-  - uid: 210
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-2.5
-      parent: 2
-  - uid: 211
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,3.5
-      parent: 2
-  - uid: 212
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,2.5
-      parent: 2
-  - uid: 213
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,1.5
-      parent: 2
-  - uid: 214
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,1.5
-      parent: 2
-  - uid: 215
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,0.5
-      parent: 2
-  - uid: 216
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
-      parent: 2
-  - uid: 217
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 2
-  - uid: 218
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
-      parent: 2
-  - uid: 219
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,5.5
-      parent: 2
-  - uid: 220
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,4.5
-      parent: 2
-  - uid: 221
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,4.5
-      parent: 2
-  - uid: 222
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,3.5
-      parent: 2
-  - uid: 223
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,3.5
-      parent: 2
-  - uid: 224
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,4.5
-      parent: 2
-- proto: WallAbductorDiagonal
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,4.5
-      parent: 2
-  - uid: 226
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,6.5
-      parent: 2
-  - uid: 227
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,5.5
-      parent: 2
-  - uid: 228
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,5.5
-      parent: 2
-  - uid: 229
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 2
-  - uid: 230
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-2.5
-      parent: 2
-  - uid: 231
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 2
-  - uid: 232
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 2
-  - uid: 233
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-2.5
-      parent: 2
-  - uid: 234
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,5.5
-      parent: 2
-  - uid: 235
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 2
-  - uid: 236
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,4.5
-      parent: 2
-  - uid: 237
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
-      parent: 2
-  - uid: 238
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 2
-  - uid: 239
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-3.5
-      parent: 2
-  - uid: 240
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-4.5
-      parent: 2
-  - uid: 241
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-4.5
-      parent: 2
-  - uid: 242
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
-      parent: 2
-  - uid: 243
-    components:
-    - type: Transform
-      pos: -3.5,5.5
-      parent: 2
-  - uid: 244
-    components:
-    - type: Transform
-      pos: -4.5,4.5
-      parent: 2
-- proto: Wonderprod
-  entities:
-  - uid: 245
-    components:
-    - type: Transform
-      pos: 4.5119457,3.4933095
-      parent: 2
-    - type: Item
-      heldPrefix: stun
-    - type: Clothing
-      equippedPrefix: stun
-    - type: StaminaDamageOnHit
-      sound: !type:SoundPathSpecifier
-        path: /Audio/Weapons/Guns/Hits/taser_hit.ogg
-      damage: 225
-    - type: MeleeWeapon
-      soundNoDamage: !type:SoundCollectionSpecifier
-        collection: WeakHit
-      damage:
-        types:
-          Shock: 0
-      attackRate: 0.5
-      soundSwing: !type:SoundPathSpecifier
-        params:
-          variation: 0.025
-          volume: -3
-        path: /Audio/Weapons/punchmiss.ogg
-      contestArgs:
-        doStaminaInteraction: True
-        staminaDisadvantage: True
-        doHealthInteraction: True
-      wideAnimationRotation: -2.356194490192345 rad
-      animation: WeaponArcThrust
-...
diff --git a/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle_grid.yml b/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle_grid.yml
deleted file mode 100644
index 076b5eddd33..00000000000
--- a/Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle_grid.yml
+++ /dev/null
@@ -1,1579 +0,0 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  1: FloorAbductor
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: grid
-    - type: Transform
-      pos: -0.5520833,-0.5416667
-      parent: invalid
-    - type: MapGrid
-      chunks:
-        0,0:
-          ind: 0,0
-          tiles: AQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes: []
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          0,0:
-            0: 53239
-          0,-1:
-            0: 30479
-          -1,0:
-            0: 14796
-          0,1:
-            0: 1599
-          -1,1:
-            0: 3226
-          1,0:
-            0: 5444
-          1,1:
-            0: 18
-          1,-1:
-            0: 21778
-          -2,0:
-            0: 1092
-          -2,-1:
-            0: 17416
-          -2,1:
-            0: 8
-          -1,-1:
-            0: 56606
-          0,-2:
-            0: 1792
-          -1,-2:
-            0: 7168
-          1,-2:
-            0: 4096
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: GasTileOverlay
-    - type: RadiationGridResistance
-- proto: AbductorAlienPad
-  entities:
-  - uid: 181
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 1
-- proto: AbductorConsole
-  entities:
-  - uid: 182
-    components:
-    - type: Transform
-      pos: 0.5,2.5
-      parent: 1
-- proto: AbductorExperimentator
-  entities:
-  - uid: 2
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 1
-- proto: AbductorHandcuffs
-  entities:
-  - uid: 196
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 1
-  - uid: 197
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 1
-  - uid: 198
-    components:
-    - type: Transform
-      pos: 4.4806957,2.7953928
-      parent: 1
-- proto: AbductorHumanObservationConsole
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: -1.5,1.5
-      parent: 1
-- proto: AbductorOperatingTable
-  entities:
-  - uid: 3
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 1
-- proto: AirAlarm
-  entities:
-  - uid: 248
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 240
-- proto: APCHyperCapacity
-  entities:
-  - uid: 85
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,0.5
-      parent: 1
-- proto: BasicCyberneticEyes
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 1
-  - uid: 227
-    components:
-    - type: Transform
-      pos: 2.4815433,0.0026143193
-      parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 5
-    components:
-    - type: Transform
-      pos: -4.5,4.5
-      parent: 1
-  - uid: 6
-    components:
-    - type: Transform
-      pos: -3.5,4.5
-      parent: 1
-  - uid: 7
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 1
-  - uid: 8
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 13
-    components:
-    - type: Transform
-      pos: -1.5,5.5
-      parent: 1
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -3.5,5.5
-      parent: 1
-  - uid: 16
-    components:
-    - type: Transform
-      pos: 3.5,5.5
-      parent: 1
-  - uid: 19
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 28
-    components:
-    - type: Transform
-      pos: 4.5,5.5
-      parent: 1
-  - uid: 32
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 114
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 1
-  - uid: 117
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 118
-    components:
-    - type: Transform
-      pos: -2.5,5.5
-      parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 122
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 1
-  - uid: 124
-    components:
-    - type: Transform
-      pos: 3.5,-0.5
-      parent: 1
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 126
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 127
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 128
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 130
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 131
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 132
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 133
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 134
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 1
-  - uid: 135
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 1
-  - uid: 136
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 1
-  - uid: 137
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 138
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 1
-  - uid: 139
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 1
-  - uid: 140
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
-  - uid: 141
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 1
-  - uid: 142
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 1
-  - uid: 144
-    components:
-    - type: Transform
-      pos: 1.5,5.5
-      parent: 1
-  - uid: 149
-    components:
-    - type: Transform
-      pos: 5.5,4.5
-      parent: 1
-  - uid: 186
-    components:
-    - type: Transform
-      pos: 5.5,3.5
-      parent: 1
-  - uid: 187
-    components:
-    - type: Transform
-      pos: 5.5,2.5
-      parent: 1
-  - uid: 188
-    components:
-    - type: Transform
-      pos: 5.5,1.5
-      parent: 1
-  - uid: 189
-    components:
-    - type: Transform
-      pos: -4.5,3.5
-      parent: 1
-  - uid: 190
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 1
-  - uid: 191
-    components:
-    - type: Transform
-      pos: -4.5,1.5
-      parent: 1
-- proto: CableHV
-  entities:
-  - uid: 39
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 100
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 101
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 102
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 103
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 104
-    components:
-    - type: Transform
-      pos: 1.5,-3.5
-      parent: 1
-  - uid: 105
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-  - uid: 111
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 1
-  - uid: 112
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 176
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
-- proto: CableMV
-  entities:
-  - uid: 21
-    components:
-    - type: Transform
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 22
-    components:
-    - type: Transform
-      pos: -3.5,-0.5
-      parent: 1
-  - uid: 23
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 24
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-- proto: CableTerminal
-  entities:
-  - uid: 38
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-3.5
-      parent: 1
-- proto: ChairPilotSeat
-  entities:
-  - uid: 162
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 1
-- proto: ClockworkGrille
-  entities:
-  - uid: 45
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
-- proto: ClothingAbductorBeltFilled
-  entities:
-  - uid: 12
-    components:
-    - type: Transform
-      pos: -1.4820733,0.17776257
-      parent: 1
-- proto: ClothingBackpackDuffelAbductorFilled
-  entities:
-  - uid: 202
-    components:
-    - type: Transform
-      pos: -1.4716566,0.75067925
-      parent: 1
-- proto: ComputerIFF
-  entities:
-  - uid: 183
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,4.5
-      parent: 1
-- proto: ComputerShuttle
-  entities:
-  - uid: 14
-    components:
-    - type: Transform
-      pos: 0.5,5.5
-      parent: 1
-- proto: Defibrillator
-  entities:
-  - uid: 231
-    components:
-    - type: Transform
-      pos: 0.13108987,-1.5783088
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: DubiousOrganSpawner
-  entities:
-  - uid: 83
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 199
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 200
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 201
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 209
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 210
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 211
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 212
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 213
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 214
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-- proto: GasMinerNitrogen
-  entities:
-  - uid: 241
-    components:
-    - type: Transform
-      pos: -3.5,3.5
-      parent: 1
-  - uid: 242
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 1
-- proto: GasMinerOxygen
-  entities:
-  - uid: 89
-    components:
-    - type: Transform
-      pos: -3.5,2.5
-      parent: 1
-- proto: GasPassiveVent
-  entities:
-  - uid: 58
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-5.5
-      parent: 1
-  - uid: 244
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,4.5
-      parent: 1
-  - uid: 245
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,4.5
-      parent: 1
-- proto: GasPipeStraight
-  entities:
-  - uid: 246
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,4.5
-      parent: 1
-  - uid: 247
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,4.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 250
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 251
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 1
-- proto: GasVentScrubber
-  entities:
-  - uid: 240
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 248
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 41
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 95
-    components:
-    - type: Transform
-      pos: 1.5,-3.5
-      parent: 1
-  - uid: 96
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 148
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-- proto: Gyroscope
-  entities:
-  - uid: 47
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-0.5
-      parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-0.5
-      parent: 1
-  - uid: 173
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-2.5
-      parent: 1
-- proto: HandheldHealthAnalyzer
-  entities:
-  - uid: 232
-    components:
-    - type: Transform
-      pos: 0.14034912,-1.240346
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedicalCyberneticEyes
-  entities:
-  - uid: 219
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 1
-  - uid: 220
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 1
-  - uid: 221
-    components:
-    - type: Transform
-      pos: 2.4815433,0.5442808
-      parent: 1
-- proto: MedkitBruteFilled
-  entities:
-  - uid: 204
-    components:
-    - type: Transform
-      pos: 0.8669682,-1.2758512
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitBurnFilled
-  entities:
-  - uid: 207
-    components:
-    - type: Transform
-      pos: 1.5799313,-1.2527032
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitCombatFilled
-  entities:
-  - uid: 206
-    components:
-    - type: Transform
-      pos: 1.1879536,-1.3730736
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitRadiationFilled
-  entities:
-  - uid: 205
-    components:
-    - type: Transform
-      pos: 0.8391905,-1.5489993
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: MedkitToxinFilled
-  entities:
-  - uid: 216
-    components:
-    - type: Transform
-      pos: 1.5861018,-1.6045549
-      parent: 1
-    - type: Physics
-      angularDamping: 0
-      linearDamping: 0
-- proto: Poweredlight
-  entities:
-  - uid: 237
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 1
-  - uid: 238
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 239
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 1
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 26
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,6.5
-      parent: 1
-- proto: SecurityCyberneticEyes
-  entities:
-  - uid: 222
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 1
-  - uid: 223
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 1
-  - uid: 224
-    components:
-    - type: Transform
-      pos: 2.4815433,-0.49738568
-      parent: 1
-- proto: SMESBasic
-  entities:
-  - uid: 174
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 1
-- proto: SpawnPointAbductorAgent
-  entities:
-  - uid: 203
-    components:
-    - type: Transform
-      pos: -0.5,1.5
-      parent: 1
-- proto: SpawnPointAbductorScientist
-  entities:
-  - uid: 208
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 1
-- proto: SubstationBasic
-  entities:
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 94
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-- proto: TableAbductor
-  entities:
-  - uid: 9
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 10
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,2.5
-      parent: 1
-  - uid: 11
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-0.5
-      parent: 1
-  - uid: 18
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,0.5
-      parent: 1
-  - uid: 51
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,3.5
-      parent: 1
-  - uid: 192
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 1
-  - uid: 193
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
-      parent: 1
-  - uid: 194
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 215
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-- proto: Thruster
-  entities:
-  - uid: 37
-    components:
-    - type: Transform
-      pos: -1.5,6.5
-      parent: 1
-  - uid: 40
-    components:
-    - type: Transform
-      pos: 6.5,2.5
-      parent: 1
-  - uid: 79
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,1.5
-      parent: 1
-  - uid: 80
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,0.5
-      parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-0.5
-      parent: 1
-  - uid: 82
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-1.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 2.5,6.5
-      parent: 1
-  - uid: 156
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,1.5
-      parent: 1
-  - uid: 157
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-0.5
-      parent: 1
-  - uid: 158
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
-      parent: 1
-  - uid: 159
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
-      parent: 1
-  - uid: 160
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
-      parent: 1
-  - uid: 161
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-5.5
-      parent: 1
-  - uid: 163
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-5.5
-      parent: 1
-  - uid: 164
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-5.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: -5.5,2.5
-      parent: 1
-  - uid: 252
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-5.5
-      parent: 1
-- proto: TurboItemRecharger
-  entities:
-  - uid: 233
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 1
-- proto: WallAbductor
-  entities:
-  - uid: 20
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,2.5
-      parent: 1
-  - uid: 29
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 30
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,3.5
-      parent: 1
-  - uid: 35
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,5.5
-      parent: 1
-  - uid: 36
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,5.5
-      parent: 1
-  - uid: 43
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 1
-  - uid: 44
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 46
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 48
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 50
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,5.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,1.5
-      parent: 1
-  - uid: 53
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-0.5
-      parent: 1
-  - uid: 54
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,0.5
-      parent: 1
-  - uid: 55
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-1.5
-      parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 1
-  - uid: 59
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,3.5
-      parent: 1
-  - uid: 60
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-4.5
-      parent: 1
-  - uid: 61
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 62
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 63
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 64
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 65
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 1
-  - uid: 67
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,0.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,1.5
-      parent: 1
-  - uid: 69
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 70
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,0.5
-      parent: 1
-  - uid: 71
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 73
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 76
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-4.5
-      parent: 1
-  - uid: 77
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,2.5
-      parent: 1
-  - uid: 78
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 1
-  - uid: 84
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,0.5
-      parent: 1
-  - uid: 121
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 143
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-4.5
-      parent: 1
-  - uid: 145
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 146
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-2.5
-      parent: 1
-  - uid: 147
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,3.5
-      parent: 1
-  - uid: 150
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,2.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,1.5
-      parent: 1
-  - uid: 152
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,1.5
-      parent: 1
-  - uid: 153
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,0.5
-      parent: 1
-  - uid: 154
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
-      parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 1
-  - uid: 169
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
-      parent: 1
-  - uid: 170
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,5.5
-      parent: 1
-  - uid: 179
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 180
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,4.5
-      parent: 1
-  - uid: 184
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,3.5
-      parent: 1
-  - uid: 185
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,3.5
-      parent: 1
-  - uid: 243
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,4.5
-      parent: 1
-- proto: WallAbductorDiagonal
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,4.5
-      parent: 1
-  - uid: 27
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,6.5
-      parent: 1
-  - uid: 31
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,5.5
-      parent: 1
-  - uid: 33
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,5.5
-      parent: 1
-  - uid: 34
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 1
-  - uid: 57
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 75
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 90
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 97
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,5.5
-      parent: 1
-  - uid: 113
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 115
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,4.5
-      parent: 1
-  - uid: 116
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
-      parent: 1
-  - uid: 120
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-3.5
-      parent: 1
-  - uid: 166
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 167
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-4.5
-      parent: 1
-  - uid: 168
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
-      parent: 1
-  - uid: 171
-    components:
-    - type: Transform
-      pos: -3.5,5.5
-      parent: 1
-  - uid: 172
-    components:
-    - type: Transform
-      pos: -4.5,4.5
-      parent: 1
-- proto: Wonderprod
-  entities:
-  - uid: 195
-    components:
-    - type: Transform
-      pos: 4.5119457,3.4933095
-      parent: 1
-    - type: Item
-      heldPrefix: stun
-    - type: Clothing
-      equippedPrefix: stun
-    - type: StaminaDamageOnHit
-      sound: !type:SoundPathSpecifier
-        path: /Audio/Weapons/Guns/Hits/taser_hit.ogg
-      damage: 225
-    - type: MeleeWeapon
-      attackRate: 0.5
-      damage:
-        types:
-          Shock: 0
-      soundNoDamage: !type:SoundCollectionSpecifier
-        collection: WeakHit
-      animation: WeaponArcThrust
-      wideAnimationRotation: -2.356194490192345 rad
-      soundSwing: !type:SoundPathSpecifier
-        params:
-          variation: 0.025
-          volume: -3
-        path: /Audio/Weapons/punchmiss.ogg
-...
diff --git a/Resources/Maps/_White/Atlases/WonderBoxEngine.yml b/Resources/Maps/_White/Atlases/WonderBoxEngine.yml
index 70744c5106c..ffad470eb8c 100644
--- a/Resources/Maps/_White/Atlases/WonderBoxEngine.yml
+++ b/Resources/Maps/_White/Atlases/WonderBoxEngine.yml
@@ -14,7 +14,7 @@ orphans: []
 nullspace: []
 tilemap:
   0: Space
-  3: FloorAbductor
+  3: FloorArcadeBlue2
   18: FloorAstroGrass
   26: FloorBedrock
   48: FloorDarkMini
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index a8f9f4cdab6..6801247c96f 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -360,38 +360,38 @@ BlueprintFlare: null
 
 # 2024-10-09
 # Removal of separate borg chassis parts, replace them with generic borg parts.
-LeftArmBorgEngineer: LeftArmBorg
-RightArmBorgEngineer: RightArmBorg
-LeftLegBorgEngineer: LeftLegBorg
-RightLegBorgEngineer: RightLegBorg
-HeadBorgEngineer: LightHeadBorg
-TorsoBorgEngineer: TorsoBorg
-
-LeftArmBorgMedical: LeftArmBorg
-RightArmBorgMedical: RightArmBorg
-LeftLegBorgMedical: LeftLegBorg
-RightLegBorgMedical: RightLegBorg
-HeadBorgMedical: LightHeadBorg
-TorsoBorgMedical: TorsoBorg
-
-LeftArmBorgMining: LeftArmBorg
-RightArmBorgMining: RightArmBorg
-LeftLegBorgMining: LeftLegBorg
-RightLegBorgMining: RightLegBorg
-HeadBorgMining: LightHeadBorg
-TorsoBorgMining: TorsoBorg
-
-LeftArmBorgService: LeftArmBorg
-RightArmBorgService: RightArmBorg
-LeftLegBorgService: LeftLegBorg
-RightLegBorgService: RightLegBorg
-HeadBorgService: LightHeadBorg
-TorsoBorgService: TorsoBorg
-
-LeftLegBorgJanitor: LeftLegBorg
-RightLegBorgJanitor: RightLegBorg
-HeadBorgJanitor: LightHeadBorg
-TorsoBorgJanitor: TorsoBorg
+LeftArmBorgEngineer: BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
+RightArmBorgEngineer: BodyPartRightArmBorg # WD EDIT: RightArmBorg -> BodyPartRightArmBorg
+LeftLegBorgEngineer: BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
+RightLegBorgEngineer: BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
+HeadBorgEngineer: BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
+TorsoBorgEngineer: BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
+
+LeftArmBorgMedical: BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
+RightArmBorgMedical: BodyPartRightArmBorg # WD EDIT: RightArmBorg -> BodyPartRightArmBorg
+LeftLegBorgMedical: BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
+RightLegBorgMedical: BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
+HeadBorgMedical: BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
+TorsoBorgMedical: BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
+
+LeftArmBorgMining: BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
+RightArmBorgMining: BodyPartRightArmBorg # WD EDIT: RightArmBorg -> BodyPartRightArmBorg
+LeftLegBorgMining: BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
+RightLegBorgMining: BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
+HeadBorgMining: BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
+TorsoBorgMining: BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
+
+LeftArmBorgService: BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
+RightArmBorgService: BodyPartRightArmBorg # WD EDIT: RightArmBorg -> BodyPartRightArmBorg
+LeftLegBorgService: BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
+RightLegBorgService: BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
+HeadBorgService: BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
+TorsoBorgService: BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
+
+LeftLegBorgJanitor: BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
+RightLegBorgJanitor: BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
+HeadBorgJanitor: BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
+TorsoBorgJanitor: BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
 
 # 2024-11-17
 PresentRandomAsh: PresentRandomCoal
diff --git a/Resources/Migrations/test.yml b/Resources/Migrations/test.yml
new file mode 100644
index 00000000000..0f012b02be1
--- /dev/null
+++ b/Resources/Migrations/test.yml
@@ -0,0 +1,23 @@
+MedicalBiofabricator: null
+AdvancedRetractor: null
+BoneGel: null
+EnergyCautery: null
+EnergyScalpel: null
+Autodoc: null
+BioSynthLeftArm: null
+HeadKobold: null
+LeftLegMonkey: null
+OrganAnimalBrain: null
+
+LightHeadBorg: BodyPartHeadBorg
+TorsoBorg: BodyPartTorsoBorg
+LeftArmBorg: BodyPartLeftArmBorg
+RightArmBorg: BodyPartRightArmBorg
+LeftLegBorg: BodyPartLeftLegBorg
+RightLegBorg: BodyPartRightLegBorg
+
+OrganHumanBrain: OrganBrainHuman
+OrganHumanHeart: OrganHeartHuman
+HeadSkeleton: BodyPartHeadSkeleton
+TorsoSkeleton: BodyPartChestSkeleton
+OrganHumanAppendix: OrganAppendixHuman
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
deleted file mode 100644
index 1fa02c9f533..00000000000
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-- type: entity
-  id: BaseAnimalOrganUnGibbable
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Organ
-  - type: Food
-  - type: Sprite
-    sprite: Mobs/Species/Human/organs.rsi
-  - type: StaticPrice
-    price: 50
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: FlavorProfile
-    flavors:
-      - chicken # everything kinda tastes like chicken
-  - type: Tag
-    tags:
-      - Meat
-
-- type: entity
-  id: BaseAnimalOrgan
-  parent: BaseAnimalOrganUnGibbable
-  abstract: true
-  components:
-  - type: Gibbable
-
-- type: entity
-  id: OrganAnimalLungs
-  parent: BaseAnimalOrgan
-  name: lungs
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: lung-l
-    - state: lung-r
-  - type: Organ
-    slotId: lungs # Shitmed
-  - type: Lung
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Animal ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
-  - type: SolutionContainerManager
-    solutions:
-      Lung:
-        maxVol: 100.0
-        canReact: false
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-
-- type: entity
-  id: OrganAnimalStomach
-  parent: BaseAnimalOrgan
-  name: stomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    state: stomach
-  - type: Organ
-    slotId: stomach # Shitmed
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 40
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Stomach
-  - type: Metabolizer
-    maxReagents: 3
-    metabolizerTypes: [ Animal ]
-    groups:
-    - id: Food
-    - id: Drink
-
-- type: entity
-  id: OrganMouseStomach
-  parent: OrganAnimalStomach
-  name: stomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 30
-
-- type: entity
-  id: OrganAnimalLiver
-  parent: BaseAnimalOrgan
-  name: liver
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    state: liver
-  - type: Organ
-    slotId: liver # Shitmed
-  - type: Metabolizer
-    maxReagents: 1
-    metabolizerTypes: [ Animal ]
-    groups:
-    - id: Alcohol
-      rateModifier: 0.1
-  - type: Liver # Shitmed
-
-- type: entity
-  id: OrganAnimalHeart
-  parent: BaseAnimalOrgan
-  name: heart
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    state: heart-on
-  - type: Organ
-    slotId: heart # Shitmed
-  - type: Metabolizer
-    maxReagents: 2
-    metabolizerTypes: [ Animal ]
-    groups:
-    - id: Medicine
-    - id: Poison
-    - id: Narcotic
-  - type: Heart # Shitmed
-
-
-- type: entity
-  id: OrganAnimalKidneys
-  parent: BaseAnimalOrgan
-  name: kidneys
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: kidney-l
-    - state: kidney-r
-  - type: Organ
-    slotId: kidneys # Shitmed
-  - type: Metabolizer
-    maxReagents: 5
-    metabolizerTypes: [ Animal ]
-    removeEmpty: true
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
deleted file mode 100644
index 10cf620addc..00000000000
--- a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: entity
-  id: OrganBloodsuckerStomach
-  parent: OrganAnimalStomach
-  name: stomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Bloodsucker ]
-
-- type: entity
-  id: OrganBloodsuckerLiver
-  parent: OrganAnimalLiver
-  name: liver
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Bloodsucker ]
-
-- type: entity
-  id: OrganBloodsuckerHeart
-  parent: OrganAnimalHeart
-  name: heart
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Bloodsucker ]
diff --git a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
deleted file mode 100644
index 6bd7c2d4024..00000000000
--- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
-  id: OrganAnimalRuminantStomach
-  parent: OrganAnimalStomach
-  name: ruminant stomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 80
diff --git a/Resources/Prototypes/Body/Organs/Animal/slimes.yml b/Resources/Prototypes/Body/Organs/Animal/slimes.yml
deleted file mode 100644
index baa6674a471..00000000000
--- a/Resources/Prototypes/Body/Organs/Animal/slimes.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-- type: entity
-  id: SentientSlimesCore
-  parent: [BaseItem, OrganHumanBrain]
-  name: sentient slimes core
-  description: "The source of incredible, unending gooeyness."
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/organs.rsi
-      state: brain-slime
-    - type: Stomach
-    - type: Organ
-      slotId: core
-    - type: Metabolizer
-      maxReagents: 3
-      metabolizerTypes: [ Slime ]
-      removeEmpty: true
-      groups:
-        - id: Food
-        - id: Drink
-        - id: Medicine
-        - id: Poison
-        - id: Narcotic
-        - id: Alcohol
-          rateModifier: 0.2
-    - type: SolutionContainerManager
-      solutions:
-        stomach:
-          maxVol: 30.0
-
-- type: entity
-  id: OrganSlimesLungs
-  parent: BaseHumanOrgan
-  name: slimes gas sacs
-  description: "Collects nitrogen, which slime cells use for maintenance."
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/organs.rsi
-      layers:
-        - state: lung-l-slime
-        - state: lung-r-slime
-    - type: Lung
-      alert: LowNitrogen
-    - type: Organ
-      slotId: lungs
-    - type: Metabolizer
-      removeEmpty: true
-      solutionOnBody: false
-      solution: "Lung"
-      metabolizerTypes: [ Slime ]
-      groups:
-      - id: Gas
-        rateModifier: 100.0
-    - type: SolutionContainerManager
-      solutions:
-        organ:
-          reagents:
-          - ReagentId: Nutriment
-            Quantity: 10
-        Lung:
-          maxVol: 100.0
-          canReact: false
diff --git a/Resources/Prototypes/Body/Organs/Friendstomach.yml b/Resources/Prototypes/Body/Organs/Friendstomach.yml
deleted file mode 100644
index 8dc992b08fb..00000000000
--- a/Resources/Prototypes/Body/Organs/Friendstomach.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: entity
-  id: OrganFriendStomach
-  parent: OrganAnimalStomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Stomach
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 100
-      food:
-        maxVol: 50
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
deleted file mode 100644
index a8d387d6d35..00000000000
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ /dev/null
@@ -1,171 +0,0 @@
-- type: entity
-  id: BaseArachnidOrgan
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/organs.rsi
-  - type: Organ
-  - type: Food
-  - type: Extractable
-    grindableSolutionName: organ
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Tag
-    tags:
-      - Meat
-
-- type: entity
-  id: OrganArachnidStomach
-  parent: OrganAnimalStomach
-  name: stomach
-  description: "Gross. This is hard to stomach."
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/organs.rsi
-    state: stomach
-  - type: Organ # Shitmed
-    slotId: stomach
-  - type: Stomach
-    updateInterval: 1.5
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Metabolizer
-    updateInterval: 1.5
-
-- type: entity
-  id: OrganArachnidLungs
-  parent: BaseArachnidOrgan
-  name: lungs
-  description: "Filters oxygen from an atmosphere... just more greedily."
-  components:
-  - type: Sprite
-    layers:
-      - state: lung-l
-      - state: lung-r
-  - type: Organ # Shitmed
-    slotId: lungs
-  - type: Lung
-  - type: Metabolizer
-    updateInterval: 1.5
-    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: OrganArachnidHeart
-  parent: BaseArachnidOrgan
-  name: heart
-  description: "A disgustingly persistent little biological pump made for spiders."
-  components:
-  - type: Sprite
-    state: heart-on
-  - type: Metabolizer
-    updateInterval: 1.5
-    maxReagents: 2
-    metabolizerTypes: [Arachnid]
-    groups:
-    - id: Medicine
-    - id: Poison
-    - id: Narcotic
-  - type: Organ # Shitmed
-    slotId: heart
-  - type: Heart # Shitmed: Lets you transplant spider hearts into other species
-
-- type: entity
-  id: OrganArachnidLiver
-  parent: BaseHumanOrgan
-  name: liver
-  description: "Pairing suggestion: chianti and fava beans."
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    state: liver
-  - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
-    updateInterval: 1.5
-    maxReagents: 1
-    metabolizerTypes: [Animal]
-    groups:
-    - id: Alcohol
-      rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
-  - type: Organ # Shitmed
-    slotId: liver
-  - type: Liver # Shitmed
-
-- type: entity
-  id: OrganArachnidKidneys
-  parent: BaseHumanOrgan
-  name: kidneys
-  description: "Filters toxins from the bloodstream."
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Organ # Shitmed
-    slotId: kidneys
-  - type: Sprite
-    layers:
-      - state: kidney-l
-      - state: kidney-r
-  # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
-  - type: Metabolizer
-    updateInterval: 1.5
-    maxReagents: 5
-    metabolizerTypes: [Animal]
-    removeEmpty: true
-
-- type: entity
-  id: OrganArachnidEyes
-  parent: BaseArachnidOrgan
-  name: eyes
-  description: "Two was already too many."
-  components:
-  - type: Sprite
-    layers:
-      - state: eyeball-l
-      - state: eyeball-r
-  - type: Organ # Shitmed
-    slotId: eyes
-  - type: Eyes # Shitmed
-
-- type: entity
-  id: OrganArachnidTongue
-  parent: BaseArachnidOrgan
-  name: tongue
-  description: "A fleshy muscle mostly used for lying."
-  components:
-  - type: Sprite
-    state: tongue
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
deleted file mode 100644
index 17b9704fe96..00000000000
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ /dev/null
@@ -1,229 +0,0 @@
-- type: entity
-  id: BaseDionaOrganUnGibbable
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Diona/organs.rsi
-  - type: Organ
-  - type: Food
-  - type: Extractable
-    grindableSolutionName: organ
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: FlavorProfile
-    flavors:
-      - people
-
-- type: entity
-  id: BaseDionaOrgan
-  parent: BaseDionaOrganUnGibbable
-  abstract: true
-  components:
-  - type: Gibbable
-
-- type: entity
-  id: OrganDionaBrain
-  parent: BaseDionaOrganUnGibbable
-  name: brain
-  description: "The central hub of a diona's pseudo-neurological activity, its root-like tendrils search for its former body."
-  components:
-  - type: Sprite
-    state: brain
-  - type: Organ # Shitmed
-    slotId: brain
-  - type: Food # Shitmed Change
-    delay: 5
-    forceFeedDelay: 6
-    popupOnEat: true
-  - type: Brain # Shitmed
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      Lung:
-        maxVol: 100
-        canReact: False
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: GreyMatter
-          Quantity: 5
-
-- type: entity
-  id: OrganDionaEyes
-  parent: BaseDionaOrgan
-  name: eyes
-  description: "I see you!"
-  components:
-  - type: Sprite
-    layers:
-      - state: eyeball-l
-      - state: eyeball-r
-  - type: Organ # Shitmed
-    slotId: eyes
-  - type: Eyes
-
-- type: entity
-  id: OrganDionaStomach
-  parent: BaseDionaOrgan
-  name: stomach
-  description: "The diona's equivalent of a stomach, it reeks of asparagus and vinegar."
-  components:
-  - type: Sprite
-    state: stomach
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Organ # Shitmed
-    slotId: stomach
-  - type: Stomach
-  - type: Metabolizer
-    maxReagents: 6
-    metabolizerTypes: [ Plant ]
-    removeEmpty: true
-    groups:
-      - id: Food
-      - id: Drink
-      - id: Medicine
-      - id: Poison
-      - id: Narcotic
-      - id: Alcohol
-        rateModifier: 0.1
-
-- type: entity
-  id: OrganDionaLungs
-  parent: BaseDionaOrgan
-  name: lungs
-  description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/organs.rsi
-    layers:
-      - state: lung-l
-      - state: lung-r
-  - type: Lung # Shitmed
-  - type: Organ # Shitmed
-    slotId: lungs
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Plant ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        maxVol: 10
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      Lung:
-        maxVol: 100
-        canReact: False
-
-# Organs that turn into nymphs on removal
-- type: entity
-  id: OrganDionaBrainNymph
-  parent: OrganDionaBrain
-  categories: [ HideSpawnMenu ]
-  name: brain
-  description: "The source of incredible, unending intelligence. Honk."
-  components:
-  - type: Brain
-  - type: Nymph # This will make the organs turn into a nymph when they're removed.
-    entityPrototype: OrganDionaNymphBrain
-    transferMind: true
-
-- type: entity
-  id: OrganDionaStomachNymph
-  parent: OrganDionaStomach
-  categories: [ HideSpawnMenu ]
-  name: stomach
-  description: "Gross. This is hard to stomach."
-  components:
-  - type: Nymph
-    entityPrototype: OrganDionaNymphStomach
-
-- type: entity
-  id: OrganDionaLungsNymph
-  parent: OrganDionaLungs
-  categories: [ HideSpawnMenu ]
-  name: lungs
-  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
-  components:
-  - type: Nymph
-    entityPrototype: OrganDionaNymphLungs
-
-# Nymphs that the organs will turn into
-- type: entity
-  id: OrganDionaNymphBrain
-  parent: MobDionaNymph
-  categories: [ HideSpawnMenu ]
-  name: diona nymph
-  suffix: Brain
-  description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
-  components:
-  - type: IsDeadIC
-  - type: Body
-    prototype: AnimalNymphBrain
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-
-- type: entity
-  id: OrganDionaNymphStomach
-  parent: MobDionaNymphAccent
-  categories: [ HideSpawnMenu ]
-  name: diona nymph
-  suffix: Stomach
-  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it.
-  components:
-  - type: IsDeadIC
-  - type: Body
-    prototype: AnimalNymphStomach
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-
-- type: entity
-  id: OrganDionaNymphLungs
-  parent: MobDionaNymphAccent
-  categories: [ HideSpawnMenu ]
-  name: diona nymph
-  suffix: Lungs
-  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking.
-  components:
-  - type: IsDeadIC
-  - type: Body
-    prototype: AnimalNymphLungs
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
diff --git a/Resources/Prototypes/Body/Organs/dwarf.yml b/Resources/Prototypes/Body/Organs/dwarf.yml
deleted file mode 100644
index 497bc190cd1..00000000000
--- a/Resources/Prototypes/Body/Organs/dwarf.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-- type: entity
-  id: OrganDwarfHeart
-  parent: OrganHumanHeart
-  name: dwarf heart
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [Dwarf]
-
-- type: entity
-  id: OrganDwarfLiver
-  parent: OrganHumanLiver
-  name: dwarf liver
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [Dwarf, LiquorLifeline]
-
-- type: entity
-  id: OrganDwarfStomach
-  parent: OrganHumanStomach
-  name: dwarf stomach
-  components:
-  - type: Sprite
-    state: stomach
-  - type: Organ
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 75
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Stomach
-  - type: Metabolizer
-    # mm very yummy
-    maxReagents: 5
-    metabolizerTypes: [Dwarf]
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
deleted file mode 100644
index 065d024dd9a..00000000000
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ /dev/null
@@ -1,250 +0,0 @@
-- type: entity
-  id: BaseHumanOrganUnGibbable
-  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
-      - Organ
-
-
-- type: entity
-  id: BaseHumanOrgan
-  parent: BaseHumanOrganUnGibbable
-  abstract: true
-  components:
-  - type: Gibbable
-
-- type: entity
-  id: OrganHumanBrain
-  parent: BaseHumanOrganUnGibbable
-  name: brain
-  description: "The source of incredible, unending intelligence. Honk."
-  components:
-  - type: Sprite
-    state: brain
-  - type: Organ
-    slotId: brain # Shitmed Change
-  - type: Food # Shitmed Change
-    delay: 5
-    forceFeedDelay: 6
-    popupOnEat: true
-  - type: Input
-    context: "ghost"
-  - type: Brain
-  - type: InputMover
-  - type: Examiner
-  - type: BlockMovement
-  - type: BadFood
-  - type: Tag
-    tags:
-      - Meat
-      - Brain
-  - 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: entity
-  id: OrganHumanEyes
-  parent: BaseHumanOrgan
-  name: eyes
-  description: "I see you!"
-  components:
-  - type: Organ # Shitmed Change
-    slotId: eyes # Shitmed Change
-  - type: Eyes # Shitmed Change
-  - type: Sprite
-    layers:
-      - state: eyeball-l
-      - state: eyeball-r
-
-- type: entity
-  id: OrganHumanTongue
-  parent: BaseHumanOrgan
-  name: tongue
-  description: "A fleshy muscle mostly used for lying."
-  components:
-  - type: Sprite
-    state: tongue
-
-- type: entity
-  id: OrganHumanAppendix
-  parent: BaseHumanOrgan
-  name: appendix
-  components:
-  - type: Sprite
-    layers:
-    - state: appendix
-    - state: appendix-inflamed
-      visible: false
-
-- type: entity
-  id: OrganHumanEars
-  parent: BaseHumanOrgan
-  name: ears
-  description: "There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible."
-  components:
-  - type: Sprite
-    state: ears
-  - type: Ears # Shitmed Change
-
-- type: entity
-  id: OrganHumanLungs
-  parent: BaseHumanOrgan
-  name: lungs
-  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
-  components:
-  - type: Organ # Shitmed Change
-    slotId: lungs # Shitmed Change
-  - type: Sprite
-    layers:
-      - state: lung-l
-      - state: lung-r
-  - 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: entity
-  id: OrganHumanHeart
-  parent: BaseHumanOrgan
-  name: heart
-  description: "I feel bad for the heartless bastard who lost this."
-  components:
-  - type: Heart # Shitmed Change
-  - type: Organ # Shitmed Change
-    slotId: heart # Shitmed Change
-  - 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: entity
-  id: OrganHumanStomach
-  parent: BaseHumanOrgan
-  name: stomach
-  description: "Gross. This is hard to stomach."
-  components:
-  - type: Organ # Shitmed Change
-    slotId: stomach # Shitmed Change
-  - type: Sprite
-    state: 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: entity
-  id: OrganHumanLiver
-  parent: BaseHumanOrgan
-  name: liver
-  description: "Pairing suggestion: chianti and fava beans."
-  components:
-  - type: Liver # Shitmed Change
-  - type: Organ # Shitmed Change
-    slotId: liver # Shitmed Change
-  - type: Sprite
-    state: 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
-  parent: BaseHumanOrgan
-  name: kidneys
-  description: "Filters toxins from the bloodstream."
-  components:
-  - type: Organ # Shitmed
-    slotId: kidneys
-  - type: Sprite
-    layers:
-      - state: kidney-l
-      - state: kidney-r
-  # 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/ipc.yml b/Resources/Prototypes/Body/Organs/ipc.yml
deleted file mode 100644
index e91fb0ab8f0..00000000000
--- a/Resources/Prototypes/Body/Organs/ipc.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-- type: entity
-  id: BaseIPCOrgan
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/organs.rsi
-  - type: Organ
-  # - type: Food
-  # - type: Extractable
-  #   grindableSolutionName: organ
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Oil
-          Quantity: 10
-
-- type: entity
-  id: OrganIPCEyes
-  parent: BaseIPCOrgan
-  name: robotic eyes
-  description: "01001001 00100000 01110011 01100101 01100101 00100000 01111001 01101111 01110101 00100001"
-  components:
-  - type: Sprite
-    layers:
-      - state: eyeball-l
-      - state: eyeball-r
-  - type: Organ
-    slotId: eyes
-  - type: Eyes
-
-- type: entity
-  id: OrganIPCTongue
-  parent: BaseIPCOrgan
-  name: vocal modulator
-  description: "A vocal modulator, used to produce speech."
-  components:
-  - type: Sprite
-    state: tongue
-  - type: Organ
-
-- type: entity
-  id: OrganIPCEars
-  parent: BaseIPCOrgan
-  name: "sonic receptors"
-  description:
-  components:
-  - type: Sprite
-    state: ears
-  - type: Organ
-  - type: Ears
-
-- type: entity
-  id: OrganIPCPump
-  parent: BaseIPCOrgan
-  name: micro pump
-  description: "A micro pump, used to circulate coolant."
-  components:
-  - type: Sprite
-    state: heart-on
-  - type: Organ
-    slotId: heart
-  - type: Heart
-  # 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.
-
-  # This is fine?
-  # - type: Metabolizer
-  #   maxReagents: 2
-  #   metabolizerTypes: [Human]
-  #   groups:
-  #   - id: Medicine
-  #   - id: Poison
-  #   - id: Narcotic
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
deleted file mode 100644
index 418c492d61b..00000000000
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: entity
-  id: OrganMothStomach
-  name: moth stomach
-  parent: [OrganAnimalStomach, OrganHumanStomach]
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Stomach
-    specialDigestible:
-      tags:
-      - ClothMade
-      - Fruit # DeltaV - Moth can eat fruits.
-      - Paper
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Metabolizer
-    maxReagents: 3
-    metabolizerTypes: [ Moth ]
-    removeEmpty: true
-    groups:
-      - id: Food
-      - id: Drink
diff --git a/Resources/Prototypes/Body/Organs/plasmaman.yml b/Resources/Prototypes/Body/Organs/plasmaman.yml
deleted file mode 100644
index fa69a490eac..00000000000
--- a/Resources/Prototypes/Body/Organs/plasmaman.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-- type: entity
-  id: BasePlasmamanOrgan
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Plasmaman/organs.rsi
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 5 # Not very nutritious
-        - ReagentId: Plasma
-          Quantity: 2.5
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: Plasma
-          Quantity: 5
-  - type: Extractable
-    grindableSolutionName: food
-    juiceSolution:
-      reagents:
-      - ReagentId: Plasma
-        Quantity: 5
-  - type: FlavorProfile
-    flavors:
-      - plasma
-
-- type: entity
-  id: OrganPlasmamanLungs
-  parent: [ BasePlasmamanOrgan, OrganHumanLungs ]
-  name: plasmaman lungs
-  description: The lungs yearn for the plasma. Only plasma gas can satiate these lungs, and oxygen is lethally toxic.
-  components:
-  - type: Sprite
-    layers:
-    - state: lungs
-  - type: Metabolizer
-    metabolizerTypes: [ Plasmaman ]
-  - type: Lung
-    alert: LowPlasma
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
-        - ReagentId: Plasma
-          Quantity: 2.5
-      Lung:
-        maxVol: 100.0
-        canReact: false
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: Plasma
-          Quantity: 5
-
-- type: entity
-  id: OrganPlasmamanStomach
-  parent: [ BasePlasmamanOrgan, OrganHumanStomach ]
-  name: plasmaman stomach
-  description: Why do plasmamen have stomachs if they don't need to eat?
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Plasmaman ]
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 8
-        - ReagentId: Plasma
-          Quantity: 4
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 8
-        reagents:
-        - ReagentId: Plasma
-          Quantity: 8
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Plasma
-        Quantity: 8
-
-- type: entity
-  id: OrganPlasmamanEyes
-  parent: [ BasePlasmamanOrgan, OrganHumanEyes ]
-  name: plasmaman eyes
-  components:
-  - type: Sprite
-    layers:
-    - state: eyes
-
-- type: entity
-  id: OrganPlasmamanLiver
-  parent: [ BasePlasmamanOrgan, OrganHumanLiver ]
-  name: plasmaman liver
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Plasmaman ]
-
-- type: entity
-  id: OrganPlasmamanTongue
-  parent: [ BasePlasmamanOrgan, OrganHumanTongue ]
-  name: plasmaman tongue
-
-- type: entity
-  id: OrganPlasmamanKidneys
-  parent: [ BasePlasmamanOrgan, OrganHumanKidneys ]
-  name: plasmaman kidneys
-  components:
-  - type: Sprite
-    layers:
-    - state: kidneys
-  - type: Metabolizer
-    metabolizerTypes: [ Plasmaman ]
-
-- type: entity
-  id: OrganPlasmamanHeart
-  parent: [ BasePlasmamanOrgan, OrganHumanHeart ]
-  name: plasmaman heart
-  description: It pulses with plasma even outside the body.
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Plasmaman ]
-
-- type: entity
-  id: OrganPlasmamanBrain
-  parent: [ BasePlasmamanOrgan, OrganHumanBrain ]
-  name: plasmaman brain
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
-        - ReagentId: Plasma
-          Quantity: 2.5
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: GreyMatter
-          Quantity: 5
-        - ReagentId: Plasma
-          Quantity: 5
diff --git a/Resources/Prototypes/Body/Organs/rat.yml b/Resources/Prototypes/Body/Organs/rat.yml
deleted file mode 100644
index 9d1352c72f5..00000000000
--- a/Resources/Prototypes/Body/Organs/rat.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: entity
-  id: OrganRatLungs
-  parent: OrganHumanLungs
-  suffix: "rat"
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Rat ]
-
-- type: entity
-  id: OrganRatStomach
-  parent: OrganAnimalStomach
-  suffix: "rat"
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Sprite
-    state: stomach
diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml
deleted file mode 100644
index c89714c181a..00000000000
--- a/Resources/Prototypes/Body/Organs/reptilian.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- type: entity
-  id: OrganReptilianStomach
-  parent: OrganAnimalStomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Stomach
-#    specialDigestible: # WWDP-Remove
-#      tags:
-#      - Fruit
-#      - ReptilianFood
-#      - Meat
-#      - Pill
-#      - Crayon
-#      - Paper
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
diff --git a/Resources/Prototypes/Body/Organs/shadowkin.yml b/Resources/Prototypes/Body/Organs/shadowkin.yml
deleted file mode 100644
index 8ee3fe1ef24..00000000000
--- a/Resources/Prototypes/Body/Organs/shadowkin.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-- type: entity
-  id: OrganShadowkinBrain
-  parent: OrganHumanBrain
-  description: "Oops, I should put this back where I found it."
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    state: brain
-
-- type: entity
-  id: OrganShadowkinEyes
-  parent: OrganHumanEyes
-  description: "I see beyond anything you ever will!"
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    layers:
-      - state: eyes
-
-- type: entity
-  id: OrganShadowkinEars
-  parent: OrganHumanEars
-  description: "Hey, listen!"
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    state: ears
-
-- type: entity
-  id: OrganShadowkinCore
-  parent: OrganHumanLungs
-  description: "What is this thing?"
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    layers:
-    - state: core
-
-
-- type: entity
-  id: OrganShadowkinTongue
-  parent: OrganHumanTongue
-  description: "What does this do again?"
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    state: tongue
-
-
-- type: entity
-  id: OrganShadowkinAppendix
-  parent: OrganHumanAppendix
-  description: "I think it does nothing..."
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    layers:
-      - state: appendix
-
-
-- type: entity
-  id: OrganShadowkinHeart
-  parent: OrganHumanHeart
-  description: "Oops, I think this belongs to someone!"
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    state: heart
-  - type: Metabolizer
-    maxReagents: 2
-    metabolizerTypes: [Shadowkin]
-    groups:
-    - id: Medicine
-    - id: Poison
-    - id: Narcotic
-
-- type: entity
-  id: OrganShadowkinStomach
-  parent: OrganHumanStomach
-  description: '"Yummy!", says the stomach, although you are unable to hear it.'
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    state: stomach
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 40
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Metabolizer
-    maxReagents: 3
-    metabolizerTypes: [Shadowkin]
-    groups:
-    - id: Food
-    - id: Drink
-
-- type: entity
-  id: OrganShadowkinLiver
-  parent: OrganHumanLiver
-  description: "Live 'er? I hardly know 'er!"
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    state: liver
-  - type: Metabolizer
-    maxReagents: 1
-    metabolizerTypes: [Shadowkin]
-    groups:
-    - id: Alcohol
-      rateModifier: 0.1
-
-- type: entity
-  id: OrganShadowkinKidneys
-  parent: OrganHumanKidneys
-  description: "Give the kid their knees back, please, this is the third time this week."
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Shadowkin/organs.rsi
-    layers:
-      - state: kidneys
-  - type: Metabolizer
-    maxReagents: 5
-    metabolizerTypes: [Shadowkin]
-    removeEmpty: true
diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
deleted file mode 100644
index 8b77ff04e3b..00000000000
--- a/Resources/Prototypes/Body/Organs/slime.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-- type: entity
-  id: SentientSlimeCore
-  parent: [BaseItem, OrganHumanBrain]
-  name: sentient slime core
-  description: "The source of incredible, unending gooeyness."
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/organs.rsi
-      state: brain-slime
-    - type: Stomach
-    - type: Organ
-      slotId: core
-    - type: Metabolizer
-      maxReagents: 6
-      metabolizerTypes: [ Slime ]
-      removeEmpty: true
-      groups:
-        - id: Food
-        - id: Drink
-        - id: Medicine
-        - id: Poison
-        - id: Narcotic
-        - id: Alcohol
-          rateModifier: 0.25
-    - type: SolutionContainerManager
-      solutions:
-        stomach:
-          maxVol: 50.0
-        food:
-          maxVol: 5
-          reagents:
-          - ReagentId: GreyMatter
-            Quantity: 5
-        organ:
-          reagents:
-          - ReagentId: Slime
-            Quantity: 10
-
-
-- type: entity
-  id: OrganSlimeLungs
-  parent: BaseHumanOrgan
-  name: slime gas sacs
-  description: "Collects nitrogen, which slime cells use for maintenance."
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Slime/organs.rsi
-    layers:
-      - state: lung-l-slime
-      - state: lung-r-slime
-  - type: Organ # Shitmed
-    slotId: lungs
-  - type: Lung
-    alert: LowNitrogen
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Slime ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Slime
-          Quantity: 10
-      Lung:
-        maxVol: 100.0
-        canReact: false
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml
deleted file mode 100644
index c5355af6b09..00000000000
--- a/Resources/Prototypes/Body/Organs/vox.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
-  id: OrganVoxLungs
-  name: vox lungs
-  parent: OrganHumanLungs
-  suffix: "vox"
-  components:
-  - type: Metabolizer
-    metabolizerTypes: [ Vox ]
-  - type: Lung
-    alert: LowNitrogen
diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
deleted file mode 100644
index 5558a771ca5..00000000000
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-# Just copypasta of some human basic body parts for interaction,
-# only differences for now is that limbs work in pairs,
-# they are unextractable and can't be spawned (no surgery on Animals!?).
-
-- type: entity
-  id: PartAnimal
-  parent: BaseItem
-  name: "animal body part"
-  abstract: true
-  components:
-  # yes these sprites dont make sense i dont care its better than them being invisible
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-  - type: Damageable
-    damageContainer: OrganicPart # Shitmed
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice
-    price: 50
-  - type: Tag
-    tags:
-      - Trash
-  - type: Gibbable
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: HandsAnimal
-  name: animal hands
-  parent: PartAnimal
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: l_hand
-    - state: r_hand
-  - type: BodyPart
-    partType: Hand
-    #symmetry: Left
-    slotId: hands # Shitmed
-
-- type: entity
-  id: LegsAnimal
-  name: animal legs
-  parent: PartAnimal
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: l_leg
-    - state: r_leg
-  - type: BodyPart
-    partType: Leg
-    slotId: legs # Shitmed
-  - type: MovementBodyPart
-
-- type: entity
-  id: FeetAnimal
-  name: animal feet
-  parent: PartAnimal
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: r_foot
-    - state: l_foot
-  - type: BodyPart
-    partType: Foot
-    slotId: feet # Shitmed
-
-- type: entity
-  id: TorsoAnimal
-  name: animal torso
-  parent: PartAnimal
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: torso_m
-  - type: BodyPart
-    partType: Torso
-  - type: Damageable
-    damageContainer: Biological
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
diff --git a/Resources/Prototypes/Body/Parts/arachnid.yml b/Resources/Prototypes/Body/Parts/arachnid.yml
deleted file mode 100644
index 14bee56f151..00000000000
--- a/Resources/Prototypes/Body/Parts/arachnid.yml
+++ /dev/null
@@ -1,121 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartArachnid
-  parent: [BaseItem, BasePart]
-  name: "arachnid body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: CopperBlood
-        Quantity: 10
-
-- type: entity
-  id: TorsoArachnid
-  name: "arachnid torso"
-  parent: [PartArachnid, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: CopperBlood
-        Quantity: 20
-
-- type: entity
-  id: HeadArachnid
-  name: "arachnid head"
-  parent: [BaseHead, PartArachnid] # WWDP
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: CopperBlood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmArachnid
-  name: "left arachnid arm"
-  parent: [PartArachnid, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmArachnid
-  name: "right arachnid arm"
-  parent: [PartArachnid, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandArachnid
-  name: "left arachnid hand"
-  parent: [PartArachnid, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandArachnid
-  name: "right arachnid hand"
-  parent: [PartArachnid, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegArachnid
-  name: "left arachnid leg"
-  parent: [PartArachnid, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "l_leg"
-  - type: MovementBodyPart
-
-- type: entity
-  id: RightLegArachnid
-  name: "right arachnid leg"
-  parent: [PartArachnid, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "r_leg"
-  - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootArachnid
-  name: "left arachnid foot"
-  parent: [PartArachnid, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootArachnid
-  name: "right arachnid foot"
-  parent: [PartArachnid, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
deleted file mode 100644
index 0545608598f..00000000000
--- a/Resources/Prototypes/Body/Parts/base.yml
+++ /dev/null
@@ -1,283 +0,0 @@
-- type: entity
-  id: BasePart
-  parent: BaseItem
-  name: "body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: OrganicPart # Shitmed Change
-  - type: BodyPart
-  - type: Gibbable
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-  # Shitmed Change Start
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 110
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 150
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 400 # WWDP
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # Shitmed Change End
-
-- type: entity
-  id: BaseTorso
-  name: "torso"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Torso
-    # Shitmed Change Start
-    toolName: "a torso"
-    containerName: "torso_slot"
-  - type: ContainerContainer
-    containers:
-      torso_slot: !type:ContainerSlot {}
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 1500 # WWDP same as MobDamageable
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-    # Shitmed Change End
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 11
-    staminaCost: 12
-
-- type: entity
-  id: BaseHead
-  name: "head"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Head
-    toolName: "a head" # Shitmed Change
-    vital: true
-  - type: Input
-    context: "ghost"
-  - type: Tag
-    tags:
-      - Head
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 5
-    staminaCost: 5
-  # WWDP edit start
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 150
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 250
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 1500
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # WWDP edit end
-
-- type: entity
-  id: BaseLeftArm
-  name: "left arm"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    toolName: "a left arm" # Shitmed Change
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 7
-    staminaCost: 7
-
-- type: entity
-  id: BaseRightArm
-  name: "right arm"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    toolName: "a right arm" # Shitmed Change
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 7
-    staminaCost: 7
-
-- type: entity
-  id: BaseLeftHand
-  name: "left hand"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-    toolName: "a left hand" # Shitmed Change
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 3
-
-- type: entity
-  id: BaseRightHand
-  name: "right hand"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-    toolName: "a right hand" # Shitmed Change
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 3
-
-- type: entity
-  id: BaseLeftLeg
-  name: "left leg"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-    toolName: "a left leg" # Shitmed Change
-  - type: MovementBodyPart
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 8
-    staminaCost: 9
-
-- type: entity
-  id: BaseRightLeg
-  name: "right leg"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-    toolName: "a right leg" # Shitmed Change
-  - type: MovementBodyPart
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 8
-    staminaCost: 9
-
-- type: entity
-  id: BaseLeftFoot
-  name: "left foot"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-    toolName: "a left foot" # Shitmed Change
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 4
-
-- type: entity
-  id: BaseRightFoot
-  name: "right foot"
-  parent: BasePart
-  abstract: true
-  components:
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
-    toolName: "a right foot" # Shitmed Change
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Blunt: 4
diff --git a/Resources/Prototypes/Body/Parts/diona.yml b/Resources/Prototypes/Body/Parts/diona.yml
deleted file mode 100644
index 1b2a14947a8..00000000000
--- a/Resources/Prototypes/Body/Parts/diona.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-- type: entity
-  id: PartDiona
-  parent: [BaseItem, BasePart]
-  name: "diona body part"
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Diona/parts.rsi
-
-- type: entity
-  id: TorsoDiona
-  name: "diona torso"
-  parent: [PartDiona, BaseTorso]
-  components:
-  - type: Sprite
-    state: "torso_m"
-
-- type: entity
-  id: HeadDiona
-  name: "diona head"
-  parent: [BaseHead, PartDiona] # WWDP
-  components:
-  - type: Sprite
-    state: "head_m"
-
-- type: entity
-  id: LeftArmDiona
-  name: "left diona arm"
-  parent: [PartDiona, BaseLeftArm]
-  components:
-  - type: Sprite
-    state: "l_arm"
-
-- type: entity
-  id: RightArmDiona
-  name: "right diona arm"
-  parent: [PartDiona, BaseRightArm]
-  components:
-  - type: Sprite
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandDiona
-  name: "left diona hand"
-  parent: [PartDiona, BaseLeftHand]
-  components:
-  - type: Sprite
-    state: "l_hand"
-
-- type: entity
-  id: RightHandDiona
-  name: "right diona hand"
-  parent: [PartDiona, BaseRightHand]
-  components:
-  - type: Sprite
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegDiona
-  name: "left diona leg"
-  parent: [PartDiona, BaseLeftLeg]
-  components:
-  - type: Sprite
-    state: "l_leg"
-
-- type: entity
-  id: RightLegDiona
-  name: "right diona leg"
-  parent: [PartDiona, BaseRightLeg]
-  components:
-  - type: Sprite
-    state: "r_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-
-- type: entity
-  id: LeftFootDiona
-  name: "left diona foot"
-  parent: [PartDiona, BaseLeftFoot]
-  components:
-  - type: Sprite
-    state: "l_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-
-- type: entity
-  id: RightFootDiona
-  name: "right diona foot"
-  parent: [PartDiona, BaseRightFoot]
-  components:
-  - type: Sprite
-    state: "r_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
diff --git a/Resources/Prototypes/Body/Parts/gingerbread.yml b/Resources/Prototypes/Body/Parts/gingerbread.yml
deleted file mode 100644
index db1dd86902b..00000000000
--- a/Resources/Prototypes/Body/Parts/gingerbread.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-- type: entity
-  id: PartGingerbread
-  parent: [BaseItem, BasePart]
-  name: "gingerbead body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Nutriment
-        Quantity: 3
-      - ReagentId: Sugar
-        Quantity: 10
-
-- type: entity
-  id: TorsoGingerbread
-  name: "gingerbread torso"
-  parent: [PartGingerbread, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Nutriment
-        Quantity: 10
-      - ReagentId: Sugar
-        Quantity: 20
-
-- type: entity
-  id: HeadGingerbread
-  name: "gingerbread head"
-  parent: [BaseHead, PartGingerbread] # WWDP
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Nutriment
-        Quantity: 5
-      - ReagentId: Sugar
-        Quantity: 10
-
-- type: entity
-  id: LeftArmGingerbread
-  name: "left gingerbread arm"
-  parent: [PartGingerbread, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmGingerbread
-  name: "right gingerbread arm"
-  parent: [PartGingerbread, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandGingerbread
-  name: "left gingerbread hand"
-  parent: [PartGingerbread, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandGingerbread
-  name: "right gingerbread hand"
-  parent: [PartGingerbread, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegGingerbread
-  name: "left gingerbread leg"
-  parent: [PartGingerbread, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegGingerbread
-  name: "right gingerbread leg"
-  parent: [PartGingerbread, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootGingerbread
-  name: "left gingerbread foot"
-  parent: [PartGingerbread, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootGingerbread
-  name: "right gingerbread foot"
-  parent: [PartGingerbread, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/harpy.yml b/Resources/Prototypes/Body/Parts/harpy.yml
deleted file mode 100644
index cae5364ff33..00000000000
--- a/Resources/Prototypes/Body/Parts/harpy.yml
+++ /dev/null
@@ -1,274 +0,0 @@
-- type: entity
-  id: PartHarpy
-  parent: BaseItem
-  name: "harpy body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: OrganicPart # Shitmed Change
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice #DynamicPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-  # Shitmed Change Start
-  - type: Gibbable
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 110
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 150
-      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
-  # Shitmed Change End
-
-- type: entity
-  id: TorsoHarpy
-  name: "harpy torso"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "torso_m"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "torso_m"
-  - type: BodyPart
-    partType: Torso
-  # Shitmed Change Start
-    toolName: "a torso"
-    containerName: "torso_slot"
-  - type: ContainerContainer
-    containers:
-      torso_slot: !type:ContainerSlot {}
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 400
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # Shitmed Change End
-
-- type: entity
-  id: HeadHarpy
-  name: "harpy head"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "head_m"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "head_m"
-  - type: BodyPart
-    partType: Head
-    vital: true
-    toolName: "a head" # Shitmed Change
-  - type: Input
-    context: "ghost"
-  - type: InputMover
-  - type: GhostOnMove
-  - type: Tag
-    tags:
-      - Head
-
-- type: entity
-  id: LeftArmHarpy
-  name: "left harpy arm"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_arm"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    toolName: "a left arm" # Shitmed Change
-
-- type: entity
-  id: RightArmHarpy
-  name: "right harpy arm"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_arm"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    toolName: "a right arm" # Shitmed Change
-    onAdd:
-    - type: Flight
-      speedModifier: 1.3 # For harpies, it gives an effective ~60% (60.16%) increase over sprinting (as sprinting has a 10% increase for harpies) with base harpy weightless modifier
-      isLayerAnimated: true
-      layer: "/Textures/Mobs/Customization/Harpy/harpy_wings.rsi"
-      animationKey: "Flap"
-
-- type: entity
-  id: LeftHandHarpy
-  name: "left harpy hand"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_hand"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-    toolName: "a left hand" # Shitmed Change
-
-- type: entity
-  id: RightHandHarpy
-  name: "right harpy hand"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_hand"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-    toolName: "a right hand" # Shitmed Change
-
-- type: entity
-  id: LeftLegHarpy
-  name: "left harpy leg"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_leg"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-    toolName: "a left leg" # Shitmed Change
-  - type: MovementBodyPart
-
-- type: entity
-  id: RightLegHarpy
-  name: "right harpy leg"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_leg"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-    toolName: "a right leg" # Shitmed Change
-  - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootHarpy
-  name: "left harpy foot"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_foot"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "l_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-    toolName: "a left foot" # Shitmed Change
-
-- type: entity
-  id: RightFootHarpy
-  name: "right harpy foot"
-  parent: PartHarpy
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_foot"
-  - type: Icon
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: "r_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
-    toolName: "a right foot" # Shitmed Change
diff --git a/Resources/Prototypes/Body/Parts/human.yml b/Resources/Prototypes/Body/Parts/human.yml
deleted file mode 100644
index 195f895277d..00000000000
--- a/Resources/Prototypes/Body/Parts/human.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartHuman
-  parent: [BaseItem, BasePart]
-  name: "human body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoHuman
-  name: "human torso"
-  parent: [PartHuman, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-- type: entity
-  id: HeadHuman
-  name: "human head"
-  parent: [BaseHead, PartHuman] # WWDP
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmHuman
-  name: "left human arm"
-  parent: [PartHuman, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmHuman
-  name: "right human arm"
-  parent: [PartHuman, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandHuman
-  name: "left human hand"
-  parent: [PartHuman, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandHuman
-  name: "right human hand"
-  parent: [PartHuman, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegHuman
-  name: "left human leg"
-  parent: [PartHuman, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegHuman
-  name: "right human leg"
-  parent: [PartHuman, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootHuman
-  name: "left human foot"
-  parent: [PartHuman, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootHuman
-  name: "right human foot"
-  parent: [PartHuman, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/ipc.yml b/Resources/Prototypes/Body/Parts/ipc.yml
deleted file mode 100644
index 290f2522cf2..00000000000
--- a/Resources/Prototypes/Body/Parts/ipc.yml
+++ /dev/null
@@ -1,265 +0,0 @@
-- type: entity
-  id: PartIPC
-  parent: BaseItem
-  name: "ipc body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: Inorganic # Shitmed Change
-  - type: BodyPart
-  - type: Gibbable
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 110
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 150
-      behaviors:
-      - !type:GibPartBehavior { }
-  # WD EDIT START
-  # - type: StaticPrice
-  #   price: 100
-  # WD EDIT END
-
-- type: entity
-  id: TorsoIPC
-  name: "ipc torso"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "torso_m"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "torso_m"
-  - type: BodyPart
-    partType: Torso
-    children: # I hate this so much I want to kill it AAAAAAAAAAAAAAAAAAAAAAAA
-      head:
-        id: "head"
-        type: Head
-      left arm:
-        id: "left arm"
-        type: Arm
-      right arm:
-        id: "right arm"
-        type: Arm
-      left leg:
-        id: "left leg"
-        type: Leg
-      right leg:
-        id: "right leg"
-        type: Leg
-    organs:
-      posbrain:
-        id: "posbrain"
-      pump:
-        id: "pump"
-  - type: ContainerContainer
-    containers:
-      torso_slot: !type:ContainerSlot {}
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-
-- type: entity
-  id: HeadIPC
-  name: "ipc head"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "head_m"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "head_m"
-  - type: BodyPart
-    partType: Head
-    organs:
-      eyes:
-        id: "eyes"
-    vital: true
-  - type: Input
-    context: "ghost"
-  - type: MovementSpeedModifier
-    baseWalkSpeed: 0
-    baseSprintSpeed: 0
-  - type: InputMover
-  - type: GhostOnMove
-  - type: Tag
-    tags:
-      - Head
-
-- type: entity
-  id: LeftArmIPC
-  name: "left ipc arm"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_arm"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    children:
-      left hand:
-        id: "left hand"
-        type: Hand
-
-- type: entity
-  id: RightArmIPC
-  name: "right ipc arm"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_arm"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    children:
-      right hand:
-        id: "right hand"
-        type: Hand
-
-- type: entity
-  id: LeftHandIPC
-  name: "left ipc hand"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_hand"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-
-- type: entity
-  id: RightHandIPC
-  name: "right ipc hand"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_hand"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-
-- type: entity
-  id: LeftLegIPC
-  name: "left ipc leg"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_leg"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-    children:
-      left foot:
-        id: "left foot"
-        type: Foot
-  - type: MovementBodyPart
-
-- type: entity
-  id: RightLegIPC
-  name: "right ipc leg"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_leg"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-    children:
-      right foot:
-        id: "right foot"
-        type: Foot
-  - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootIPC
-  name: "left ipc foot"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_foot"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "l_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-
-- type: entity
-  id: RightFootIPC
-  name: "right ipc foot"
-  parent: PartIPC
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_foot"
-  - type: Icon
-    sprite: Mobs/Species/IPC/parts.rsi
-    state: "r_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
diff --git a/Resources/Prototypes/Body/Parts/moth.yml b/Resources/Prototypes/Body/Parts/moth.yml
deleted file mode 100644
index 701ef115fd5..00000000000
--- a/Resources/Prototypes/Body/Parts/moth.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartMoth
-  parent: [BaseItem, BasePart]
-  name: "moth body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoMoth
-  name: "moth torso"
-  parent: [PartMoth, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-
-- type: entity
-  id: HeadMoth
-  name: "moth head"
-  parent: [BaseHead, PartMoth] # WWDP
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmMoth
-  name: "left moth arm"
-  parent: [PartMoth, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmMoth
-  name: "right moth arm"
-  parent: [PartMoth, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandMoth
-  name: "left moth hand"
-  parent: [PartMoth, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandMoth
-  name: "right moth hand"
-  parent: [PartMoth, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegMoth
-  name: "left moth leg"
-  parent: [PartMoth, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegMoth
-  name: "right moth leg"
-  parent: [PartMoth, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootMoth
-  name: "left moth foot"
-  parent: [PartMoth, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootMoth
-  name: "right moth foot"
-  parent: [PartMoth, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/plasmaman.yml b/Resources/Prototypes/Body/Parts/plasmaman.yml
deleted file mode 100644
index 96bb9020f4b..00000000000
--- a/Resources/Prototypes/Body/Parts/plasmaman.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartPlasmaman
-  parent: [BaseItem, BasePart]
-  name: plasmaman body part
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-  - type: Butcherable
-    butcheringType: Knife
-    butcherDelay: 4.0
-    spawned:
-    - id: SheetPlasma1
-      amount: 1
-  - type: IgniteFromGasPart
-    gas: Oxygen
-
-- type: entity
-  id: TorsoPlasmaman
-  name: plasmaman torso
-  parent: [PartPlasmaman, BaseTorso]
-  components:
-  - type: Sprite
-    state: torso_m
-  - type: Butcherable
-    butcherDelay: 6.0
-    spawned:
-    - id: SheetPlasma1
-      amount: 3
-  - type: IgniteFromGasPart
-    fireStacks: 0.06
-
-- type: entity
-  id: HeadPlasmaman
-  name: plasmaman head
-  parent: [BaseHead, PartPlasmaman] # WWDP
-  components:
-  - type: Sprite
-    state: head_m
-  - type: Butcherable
-    butcherDelay: 5.0
-  - type: IgniteFromGasPart
-    fireStacks: 0.02
-
-- type: entity
-  id: LeftArmPlasmaman
-  name: left plasmaman arm
-  parent: [PartPlasmaman, BaseLeftArm]
-  components:
-  - type: Sprite
-    state: l_arm
-  - type: IgniteFromGasPart
-    fireStacks: 0.02
-
-- type: entity
-  id: RightArmPlasmaman
-  name: right plasmaman arm
-  parent: [PartPlasmaman, BaseRightArm]
-  components:
-  - type: Sprite
-    state: r_arm
-  - type: IgniteFromGasPart
-    fireStacks: 0.02
-
-- type: entity
-  id: LeftHandPlasmaman
-  name: left plasmaman hand
-  parent: [PartPlasmaman, BaseLeftHand]
-  components:
-  - type: Sprite
-    state: l_hand
-  - type: Butcherable
-    butcherDelay: 3.0
-  - type: IgniteFromGasPart
-    fireStacks: 0.01
-
-- type: entity
-  id: RightHandPlasmaman
-  name: right plasmaman hand
-  parent: [PartPlasmaman, BaseRightHand]
-  components:
-  - type: Sprite
-    state: r_hand
-  - type: Butcherable
-    butcherDelay: 3.0
-  - type: IgniteFromGasPart
-    fireStacks: 0.01
-
-- type: entity
-  id: LeftLegPlasmaman
-  name: left plasmaman leg
-  parent: [PartPlasmaman, BaseLeftLeg]
-  components:
-  - type: Sprite
-    state: l_leg
-  - type: IgniteFromGasPart
-    fireStacks: 0.02
-
-- type: entity
-  id: RightLegPlasmaman
-  name: right plasmaman leg
-  parent: [PartPlasmaman, BaseRightLeg]
-  components:
-  - type: Sprite
-    state: r_leg
-  - type: IgniteFromGasPart
-    fireStacks: 0.02
-
-- type: entity
-  id: LeftFootPlasmaman
-  name: left plasmaman foot
-  parent: [PartPlasmaman, BaseLeftFoot]
-  components:
-  - type: Sprite
-    state: l_foot
-  - type: Butcherable
-    butcherDelay: 3.0
-  - type: IgniteFromGasPart
-    fireStacks: 0.01
-
-- type: entity
-  id: RightFootPlasmaman
-  name: right plasmaman foot
-  parent: [PartPlasmaman, BaseRightFoot]
-  components:
-  - type: Sprite
-    state: r_foot
-  - type: Butcherable
-    butcherDelay: 3.0
-  - type: IgniteFromGasPart
-    fireStacks: 0.01
diff --git a/Resources/Prototypes/Body/Parts/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml
deleted file mode 100644
index bd51e006f70..00000000000
--- a/Resources/Prototypes/Body/Parts/rat.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Just copypasta of some animal basic body parts for interaction,
-# It's basically as animals except a different torso with different organs
-- type: entity
-  id: TorsoRat
-  name: "animal torso"
-  parent: PartAnimal
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: BodyPart
-    partType: Torso
-  - type: Damageable
-    damageContainer: Biological
-  - type: Tag
-    tags:
-      - Trash
-  # TODO get a proper rat king & servant torso sprite.
-  # currently their torso is just a small dead rat....
-  - type: Sprite
-    sprite: Mobs/Animals/mouse.rsi
-    state: splat-0
diff --git a/Resources/Prototypes/Body/Parts/reptilian.yml b/Resources/Prototypes/Body/Parts/reptilian.yml
deleted file mode 100644
index 2d1fc2301a0..00000000000
--- a/Resources/Prototypes/Body/Parts/reptilian.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartReptilian
-  parent: [BaseItem, BasePart]
-  name: "reptilian body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoReptilian
-  name: "reptilian torso"
-  parent: [PartReptilian, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-- type: entity
-  id: HeadReptilian
-  name: "reptilian head"
-  parent: [BaseHead, PartReptilian] # WWDP
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmReptilian
-  name: "left reptilian arm"
-  parent: [PartReptilian, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmReptilian
-  name: "right reptilian arm"
-  parent: [PartReptilian, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandReptilian
-  name: "left reptilian hand"
-  parent: [PartReptilian, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandReptilian
-  name: "right reptilian hand"
-  parent: [PartReptilian, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegReptilian
-  name: "left reptilian leg"
-  parent: [PartReptilian, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegReptilian
-  name: "right reptilian leg"
-  parent: [PartReptilian, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootReptilian
-  name: "left reptilian foot"
-  parent: [PartReptilian, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootReptilian
-  name: "right reptilian foot"
-  parent: [PartReptilian, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/shadowkin.yml b/Resources/Prototypes/Body/Parts/shadowkin.yml
deleted file mode 100644
index f8ca620a409..00000000000
--- a/Resources/Prototypes/Body/Parts/shadowkin.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-- type: entity
-  id: PartShadowkin
-  parent: BaseItem
-  name: "Shadowkin body part"
-  abstract: true
-  components:
-    - type: Sprite
-      netsync: false
-      sprite: Mobs/Species/Shadowkin/parts.rsi
-    - type: Icon
-      sprite: Mobs/Species/Shadowkin/parts.rsi
-    - type: Damageable
-      damageContainer: OrganicPart # Shitmed
-    - type: BodyPart
-    - type: ContainerContainer
-      containers:
-        bodypart: !type:Container
-          ents: []
-
-- type: entity
-  id: TorsoShadowkin
-  name: "Shadowkin torso"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "torso_m"
-    - type: Icon
-      state: "torso_m"
-    - type: BodyPart
-      partType: Torso
-
-- type: entity
-  id: HeadShadowkin
-  name: "Shadowkin head"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "head_m"
-    - type: Icon
-      state: "head_m"
-    - type: BodyPart
-      partType: Head
-    - type: Input
-      context: "ghost"
-    - type: MovementSpeedModifier
-      baseWalkSpeed: 0
-      baseSprintSpeed: 0
-    - type: InputMover
-    - type: GhostOnMove
-
-- type: entity
-  id: LeftArmShadowkin
-  name: "left Shadowkin arm"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "l_arm"
-    - type: Icon
-      state: "l_arm"
-    - type: BodyPart
-      partType: Arm
-      symmetry: Left
-
-- type: entity
-  id: RightArmShadowkin
-  name: "right Shadowkin arm"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "r_arm"
-    - type: Icon
-      state: "r_arm"
-    - type: BodyPart
-      partType: Arm
-      symmetry: Right
-
-- type: entity
-  id: LeftHandShadowkin
-  name: "left Shadowkin hand"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "l_hand"
-    - type: Icon
-      state: "l_hand"
-    - type: BodyPart
-      partType: Hand
-      symmetry: Left
-
-- type: entity
-  id: RightHandShadowkin
-  name: "right Shadowkin hand"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "r_hand"
-    - type: Icon
-      state: "r_hand"
-    - type: BodyPart
-      partType: Hand
-      symmetry: Right
-
-- type: entity
-  id: LeftLegShadowkin
-  name: "left Shadowkin leg"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "l_leg"
-    - type: Icon
-      state: "l_leg"
-    - type: BodyPart
-      partType: Leg
-      symmetry: Left
-    - type: MovementBodyPart
-
-- type: entity
-  id: RightLegShadowkin
-  name: "right Shadowkin leg"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "r_leg"
-    - type: Icon
-      state: "r_leg"
-    - type: BodyPart
-      partType: Leg
-      symmetry: Right
-    - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootShadowkin
-  name: "left Shadowkin foot"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "l_foot"
-    - type: Icon
-      state: "l_foot"
-    - type: BodyPart
-      partType: Foot
-      symmetry: Left
-
-- type: entity
-  id: RightFootShadowkin
-  name: "right Shadowkin foot"
-  parent: PartShadowkin
-  components:
-    - type: Sprite
-      state: "r_foot"
-    - type: Icon
-      state: "r_foot"
-    - type: BodyPart
-      partType: Foot
-      symmetry: Right
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
deleted file mode 100644
index 0d7163e91f2..00000000000
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ /dev/null
@@ -1,164 +0,0 @@
-- type: entity
-  id: PartSilicon
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-  - type: Icon
-    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice
-    price: 5
-  - type: Tag
-    tags:
-    - Trash
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 25
-  - type: GuideHelp
-    guides:
-    - Cyborgs
-    - Robotics
-  # Shitmed Change Start
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg
-  - type: Gibbable
-  # Shitmed Change End
-
-- type: entity
-  id: LeftArmBorg
-  parent: PartSilicon
-  name: cyborg left arm
-  components:
-  - type: BodyPart
-    partType: Arm # Shitmed Change
-    symmetry: Left
-  - type: Sprite
-    state: borg_l_arm
-  - type: Icon
-    state: borg_l_arm
-    toolName: "a left arm" # Shitmed Change
-    children: # Shitmed Change
-      left hand:
-        id: "left hand"
-        type: Hand
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgLArm
-
-- type: entity
-  id: RightArmBorg
-  parent: PartSilicon
-  name: cyborg right arm
-  components:
-  - type: BodyPart
-    partType: Arm # Shitmed Change
-    symmetry: Right
-  - type: Sprite
-    state: borg_r_arm
-  - type: Icon
-    state: borg_r_arm
-    toolName: "a right arm" # Shitmed Change
-    children: # Shitmed Change
-      right hand:
-        id: "right hand"
-        type: Hand
-  - type: Tag
-    tags:
-    - Trash
-    - BorgArm
-    - BorgRArm
-
-- type: entity
-  id: LeftLegBorg
-  parent: PartSilicon
-  name: cyborg left leg
-  components:
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-  - type: Sprite
-    state: borg_l_leg
-  - type: Icon
-    state: borg_l_leg
-    toolName: "a left leg" # Shitmed Change
-    children: # Shitmed Change
-      left foot:
-        id: "left foot"
-        type: Foot
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgLLeg
-  - type: MovementBodyPart
-
-- type: entity
-  id: RightLegBorg
-  parent: PartSilicon
-  name: cyborg right leg
-  components:
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-  - type: Sprite
-    state: borg_r_leg
-  - type: Icon
-    state: borg_r_leg
-    toolName: "a right leg" # Shitmed Change
-    children: # Shitmed Change
-      right foot:
-        id: "right foot"
-        type: Foot
-  - type: Tag
-    tags:
-    - Trash
-    - BorgLeg
-    - BorgRLeg
-  - type: MovementBodyPart
-
-- type: entity
-  id: LightHeadBorg
-  parent: PartSilicon
-  name: cyborg head
-  components:
-  - type: BodyPart
-    partType: Head
-  - type: Sprite
-    state: borg_head
-  - type: Icon
-    state: borg_head
-    toolName: "a head" # Shitmed Change
-  - type: Tag
-    tags:
-    - Trash
-    - BorgHead
-
-- type: entity
-  id: TorsoBorg
-  parent: PartSilicon
-  name: cyborg torso
-  components:
-  - type: BodyPart
-    partType: Torso
-  - type: Sprite
-    state: borg_chest
-  - type: Icon
-    state: borg_chest
-    toolName: "a torso" # Shitmed Change
-  - type: Tag
-    tags:
-    - Trash
-    - BorgTorso
diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml
deleted file mode 100644
index d9a93e75009..00000000000
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ /dev/null
@@ -1,225 +0,0 @@
-# TODO BODY: Part damage
-- type: entity
-  id: PartSkeleton
-  parent: BaseItem
-  name: "skeleton body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: OrganicPart # Shitmed Change
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice
-    price: 20
-  - type: Gibbable
-  - type: Tag
-    tags:
-      - Trash
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 50
-      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
-
-- type: entity
-  id: TorsoSkeleton
-  name: "skeleton torso"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "torso_m"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "torso_m"
-    - type: BodyPart
-      partType: Torso
-
-- type: entity
-  id: HeadSkeleton
-  name: "skull"
-  description: Alas poor Yorick...
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "skull_icon"
-      scale: 0.5, 0.5 # DeltaV - Scale down sprite because it looks too big
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "skull_icon"
-    - type: BodyPart
-      partType: Head
-    - type: Input
-      context: "human"
-    - type: Speech
-      speechVerb: Skeleton
-    - type: SkeletonAccent
-    - type: Actions
-    - type: Vocal
-      sounds:
-        Male: Skeleton
-        Female: Skeleton
-        Unsexed: Skeleton
-    - type: Emoting
-    - type: Grammar
-      attributes:
-        proper: true
-    - type: Examiner
-    - type: DoAfter
-    - type: MobState
-      allowedStates:
-        - Alive
-    - type: Tag
-      tags:
-        - MindTransferTarget
-        - Head
-
-- type: entity
-  id: LeftArmSkeleton
-  name: "left skeleton arm"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_arm"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_arm"
-    - type: BodyPart
-      partType: Arm
-      symmetry: Left
-
-- type: entity
-  id: RightArmSkeleton
-  name: "right skeleton arm"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_arm"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_arm"
-    - type: BodyPart
-      partType: Arm
-      symmetry: Right
-
-- type: entity
-  id: LeftHandSkeleton
-  name: "left skeleton hand"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_hand"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_hand"
-    - type: BodyPart
-      partType: Hand
-      symmetry: Left
-
-- type: entity
-  id: RightHandSkeleton
-  name: "right skeleton hand"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_hand"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_hand"
-    - type: BodyPart
-      partType: Hand
-      symmetry: Right
-
-- type: entity
-  id: LeftLegSkeleton
-  name: "left skeleton leg"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_leg"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_leg"
-    - type: BodyPart
-      partType: Leg
-      symmetry: Left
-    - type: MovementBodyPart
-
-- type: entity
-  id: RightLegSkeleton
-  name: "right skeleton leg"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_leg"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_leg"
-    - type: BodyPart
-      partType: Leg
-      symmetry: Right
-    - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootSkeleton
-  name: "left skeleton foot"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_foot"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "l_foot"
-    - type: BodyPart
-      partType: Foot
-      symmetry: Left
-
-- type: entity
-  id: RightFootSkeleton
-  name: "right skeleton foot"
-  parent: PartSkeleton
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_foot"
-    - type: Icon
-      sprite: Mobs/Species/Skeleton/parts.rsi
-      state: "r_foot"
-    - type: BodyPart
-      partType: Foot
-      symmetry: Right
diff --git a/Resources/Prototypes/Body/Parts/slime.yml b/Resources/Prototypes/Body/Parts/slime.yml
deleted file mode 100644
index 87b0df3a172..00000000000
--- a/Resources/Prototypes/Body/Parts/slime.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-# TODO BODY: Part damage
-- type: entity
-  id: PartSlime
-  parent: [BaseItem, BasePart]
-  name: "slime body part"
-  abstract: true
-
-- type: entity
-  id: TorsoSlime
-  name: "slime torso"
-  parent: [PartSlime, BaseTorso]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "torso_m"
-
-- type: entity
-  id: HeadSlime
-  name: "slime head"
-  parent: [BaseHead, PartSlime] # WWDP
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "head_m"
-
-- type: entity
-  id: LeftArmSlime
-  name: "left slime arm"
-  parent: [PartSlime, BaseLeftArm]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "l_arm"
-
-- type: entity
-  id: RightArmSlime
-  name: "right slime arm"
-  parent: [PartSlime, BaseRightArm]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "r_arm"
-
-- type: entity
-  id: LeftHandSlime
-  name: "left slime hand"
-  parent: [PartSlime, BaseLeftHand]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "l_hand"
-
-- type: entity
-  id: RightHandSlime
-  name: "right slime hand"
-  parent: [PartSlime, BaseRightHand]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "r_hand"
-
-- type: entity
-  id: LeftLegSlime
-  name: "left slime leg"
-  parent: [PartSlime, BaseLeftLeg]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "l_leg"
-
-- type: entity
-  id: RightLegSlime
-  name: "right slime leg"
-  parent: [PartSlime, BaseRightLeg]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "r_leg"
-
-- type: entity
-  id: LeftFootSlime
-  name: "left slime foot"
-  parent: [PartSlime, BaseLeftFoot]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "l_foot"
-
-- type: entity
-  id: RightFootSlime
-  name: "right slime foot"
-  parent: [PartSlime, BaseRightFoot]
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Slime/parts.rsi
-      state: "r_foot"
diff --git a/Resources/Prototypes/Body/Parts/vox.yml b/Resources/Prototypes/Body/Parts/vox.yml
deleted file mode 100644
index b30fa484c70..00000000000
--- a/Resources/Prototypes/Body/Parts/vox.yml
+++ /dev/null
@@ -1,279 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartVox
-  parent: BaseItem
-  name: "vox body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: OrganicPart # Shitmed Change
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-  # Shitmed Change Start
-  - type: Gibbable
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 110
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 150
-      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
-  # Shitmed Change End
-
-- type: entity
-  id: TorsoVox
-  name: "vox torso"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "torso"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "torso"
-    - type: Extractable
-      juiceSolution:
-        reagents:
-        - ReagentId: Fat
-          Quantity: 3
-        - ReagentId: Blood
-          Quantity: 10
-    # Shitmed Change Start
-    - type: BodyPart
-      partType: Torso
-      toolName: "a torso"
-      containerName: "torso_slot"
-    - type: ContainerContainer
-      containers:
-        torso_slot: !type:ContainerSlot {}
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTypeTrigger
-          damageType: Blunt
-          damage: 400
-        behaviors:
-        - !type:GibPartBehavior { }
-      - trigger:
-          !type:DamageTypeTrigger
-          damageType: Slash
-          damage: 400
-        behaviors:
-        - !type:GibPartBehavior { }
-      - trigger:
-          !type:DamageTypeTrigger
-          damageType: Heat
-          damage: 400
-        behaviors:
-        - !type:SpawnEntitiesBehavior
-          spawnInContainer: true
-          spawn:
-            Ash:
-              min: 1
-              max: 1
-        - !type:BurnBodyBehavior { }
-        - !type:PlaySoundBehavior
-          sound:
-            collection: MeatLaserImpact
-    # Shitmed Change End
-
-- type: entity
-  id: HeadVox
-  name: "vox head"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "head"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "head"
-    - type: BodyPart
-      partType: Head
-      vital: true
-      toolName: "a head" # Shitmed Change
-    - type: Input
-      context: "ghost"
-    - type: Tag
-      tags:
-        - Head
-    - type: Extractable
-      juiceSolution:
-        reagents:
-        - ReagentId: Fat
-          Quantity: 5
-        - ReagentId: Blood
-          Quantity: 10
-
-- type: entity
-  id: LeftArmVox
-  name: "left vox arm"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_arm"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_arm"
-    - type: BodyPart
-      partType: Arm
-      symmetry: Left
-      toolName: "a left arm" # Shitmed Change
-
-- type: entity
-  id: RightArmVox
-  name: "right vox arm"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_arm"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_arm"
-    - type: BodyPart
-      partType: Arm
-      symmetry: Right
-      toolName: "a right arm" # Shitmed Change
-
-- type: entity
-  id: LeftHandVox
-  name: "left vox hand"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_hand"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_hand"
-    - type: BodyPart
-      partType: Hand
-      symmetry: Left
-      toolName: "a left hand" # Shitmed Change
-
-- type: entity
-  id: RightHandVox
-  name: "right vox hand"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_hand"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_hand"
-    - type: BodyPart
-      partType: Hand
-      symmetry: Right
-      toolName: "a right hand" # Shitmed Change
-
-- type: entity
-  id: LeftLegVox
-  name: "left vox leg"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_leg"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_leg"
-    - type: BodyPart
-      partType: Leg
-      symmetry: Left
-      toolName: "a left leg" # Shitmed Change
-    - type: MovementBodyPart
-
-- type: entity
-  id: RightLegVox
-  name: "right vox leg"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_leg"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_leg"
-    - type: BodyPart
-      partType: Leg
-      symmetry: Right
-      toolName: "a right leg" # Shitmed Change
-    - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootVox
-  name: "left vox foot"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_foot"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "l_foot"
-    - type: BodyPart
-      partType: Foot
-      symmetry: Left
-      toolName: "a left foot" # Shitmed Change
-
-- type: entity
-  id: RightFootVox
-  name: "right vox foot"
-  parent: PartVox
-  components:
-    - type: Sprite
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_foot"
-    - type: Icon
-      sprite: Mobs/Species/Vox/parts.rsi
-      state: "r_foot"
-    - type: BodyPart
-      partType: Foot
-      symmetry: Right
-      toolName: "a right foot" # Shitmed Change
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/animal.yml b/Resources/Prototypes/Body/Prototypes/Animal/animal.yml
deleted file mode 100644
index e37f329fa97..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Animal/animal.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-- type: body
-  id: Animal
-  name: "animal"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
-
-- type: body
-  id: Mouse
-  name: "mouse"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganMouseStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/bloodsucker.yml b/Resources/Prototypes/Body/Prototypes/Animal/bloodsucker.yml
deleted file mode 100644
index dd8750714ef..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Animal/bloodsucker.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: body
-  id: Bloodsucker
-  name: "bloodsucker"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganBloodsuckerStomach
-        liver: OrganBloodsuckerLiver
-        heart: OrganBloodsuckerHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml b/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml
deleted file mode 100644
index b29edadc806..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Animal/hemocyanin.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: body
-  id: AnimalHemocyanin
-  name: "hemocyanin"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganArachnidHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml b/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml
deleted file mode 100644
index 21aafe291c9..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-- type: body
-  id: AnimalNymphBrain
-  name: "nymph"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        brain: OrganDionaBrain
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
-
-- type: body
-  id: AnimalNymphLungs
-  name: "nymph"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganDionaLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
-
-- type: body
-  id: AnimalNymphStomach
-  name: "nymph"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganDionaStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml b/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml
deleted file mode 100644
index cd3ab1fdd78..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- type: body
-  id: AnimalRuminant
-  name: "ruminant"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalRuminantStomach
-        stomach2: OrganAnimalRuminantStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/slimes.yml b/Resources/Prototypes/Body/Prototypes/Animal/slimes.yml
deleted file mode 100644
index 8d9827e99a0..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Animal/slimes.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: body
-  id: Slimes
-  name: "slimes"
-  root: torso
-  slots:
-    torso:
-      part: TorsoSlime
-      connections:
-      - legs
-      organs:
-        core: SentientSlimesCore
-        lungs: OrganSlimesLungs
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/Friendshaped.yml b/Resources/Prototypes/Body/Prototypes/Friendshaped.yml
deleted file mode 100644
index 0ab85a03433..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Friendshaped.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: body
-  id: Friendshaped
-  name: "Friend-Shaped"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - hands
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganFriendStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    hands:
-      part: HandsAnimal
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml
deleted file mode 100644
index ef5df769def..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: body
-  id: Mothroach
-  name: "mothroach"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganMothStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
diff --git a/Resources/Prototypes/Body/Prototypes/Specific/squackroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/squackroach.yml
deleted file mode 100644
index 29ca1d102ee..00000000000
--- a/Resources/Prototypes/Body/Prototypes/Specific/squackroach.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: body
-  id: Squackroach
-  name: "squackroach"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      organs:
-        lungs: OrganHarpyLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
diff --git a/Resources/Prototypes/Body/Prototypes/a_ghost.yml b/Resources/Prototypes/Body/Prototypes/a_ghost.yml
deleted file mode 100644
index a2eaef3dd58..00000000000
--- a/Resources/Prototypes/Body/Prototypes/a_ghost.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- type: body
-  id: Aghost
-  name: "aghost"
-  root: torso
-  slots:
-    torso:
-      part: TorsoHuman
-      connections:
-      - right arm
-      - left arm
-    right arm:
-      part: RightArmHuman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHuman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHuman
-    left hand:
-      part: LeftHandHuman
diff --git a/Resources/Prototypes/Body/Prototypes/arachnid.yml b/Resources/Prototypes/Body/Prototypes/arachnid.yml
deleted file mode 100644
index 43062719303..00000000000
--- a/Resources/Prototypes/Body/Prototypes/arachnid.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Arachnid
-  name: "arachnid"
-  root: torso
-  slots:
-    head:
-      part: HeadArachnid
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganArachnidEyes
-    torso:
-      part: TorsoArachnid
-      organs:
-        heart: OrganArachnidHeart
-        lungs: OrganAnimalLungs
-        stomach: OrganArachnidStomach
-        liver: OrganArachnidLiver
-        kidneys: OrganArachnidKidneys
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-    right arm:
-      part: RightArmArachnid
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmArachnid
-      connections:
-      - left hand
-    right hand:
-      part: RightHandArachnid
-    left hand:
-      part: LeftHandArachnid
-    right leg:
-      part: RightLegArachnid
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegArachnid
-      connections:
-      - left foot
-    right foot:
-      part: RightFootArachnid
-    left foot:
-      part: LeftFootArachnid
diff --git a/Resources/Prototypes/Body/Prototypes/bot.yml b/Resources/Prototypes/Body/Prototypes/bot.yml
deleted file mode 100644
index 848db2a4fd5..00000000000
--- a/Resources/Prototypes/Body/Prototypes/bot.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- type: body
-  id: Bot
-  name: "bot"
-  root: hand 1
-  slots:
-    hand 1:
-      part: LeftArmBorg
diff --git a/Resources/Prototypes/Body/Prototypes/diona.yml b/Resources/Prototypes/Body/Prototypes/diona.yml
deleted file mode 100644
index 01335587b4e..00000000000
--- a/Resources/Prototypes/Body/Prototypes/diona.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-- type: body
-  id: Diona
-  name: diona
-  root: torso
-  slots:
-    head:
-      part: HeadDiona
-      connections:
-      - torso
-      organs:
-        brain: OrganDionaBrainNymph
-    torso:
-      part: TorsoDiona
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        stomach: OrganDionaStomachNymph
-        lungs: OrganDionaLungsNymph
-    right arm:
-      part: RightArmDiona
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmDiona
-      connections:
-      - left hand
-    right hand:
-      part: RightHandDiona
-    left hand:
-      part: LeftHandDiona
-    right leg:
-      part: RightLegDiona
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegDiona
-      connections:
-      - left foot
-    right foot:
-      part: RightFootDiona
-    left foot:
-      part: LeftFootDiona
diff --git a/Resources/Prototypes/Body/Prototypes/dwarf.yml b/Resources/Prototypes/Body/Prototypes/dwarf.yml
deleted file mode 100644
index b9317724b55..00000000000
--- a/Resources/Prototypes/Body/Prototypes/dwarf.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Dwarf
-  name: "dwarf"
-  root: torso
-  slots:
-    head:
-      part: HeadHuman
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoHuman
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        heart: OrganDwarfHeart
-        lungs: OrganHumanLungs
-        stomach: OrganDwarfStomach
-        liver: OrganDwarfLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmHuman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHuman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHuman
-    left hand:
-      part: LeftHandHuman
-    right leg:
-      part: RightLegHuman
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegHuman
-      connections:
-      - left foot
-    right foot:
-      part: RightFootHuman
-    left foot:
-      part: LeftFootHuman
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/gingerbread.yml b/Resources/Prototypes/Body/Prototypes/gingerbread.yml
deleted file mode 100644
index ae609e498ff..00000000000
--- a/Resources/Prototypes/Body/Prototypes/gingerbread.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Gingerbread
-  name: gingerbread
-  root: torso
-  slots:
-    head:
-      part: HeadGingerbread
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoGingerbread
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmGingerbread
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmGingerbread
-      connections:
-      - left hand
-    right hand:
-      part: RightHandGingerbread
-    left hand:
-      part: LeftHandGingerbread
-    right leg:
-      part: RightLegGingerbread
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegGingerbread
-      connections:
-      - left foot
-    right foot:
-      part: RightFootGingerbread
-    left foot:
-      part: LeftFootGingerbread
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/human.yml b/Resources/Prototypes/Body/Prototypes/human.yml
deleted file mode 100644
index 4e2ff43e2a6..00000000000
--- a/Resources/Prototypes/Body/Prototypes/human.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Human
-  name: "human"
-  root: torso
-  slots:
-    head:
-      part: HeadHuman
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoHuman
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmHuman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHuman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHuman
-    left hand:
-      part: LeftHandHuman
-    right leg:
-      part: RightLegHuman
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegHuman
-      connections:
-      - left foot
-    right foot:
-      part: RightFootHuman
-    left foot:
-      part: LeftFootHuman
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/ipc.yml b/Resources/Prototypes/Body/Prototypes/ipc.yml
deleted file mode 100644
index 42784305572..00000000000
--- a/Resources/Prototypes/Body/Prototypes/ipc.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-- type: body
-  id: IPC
-  name: "ipc"
-  root: torso
-  slots:
-    head:
-      part: HeadIPC
-      connections:
-      - torso
-      organs:
-        eyes: OrganIPCEyes
-    torso:
-      part: TorsoIPC
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        posibrain: PositronicBrain
-        heart: OrganIPCPump
-    right arm:
-      part: RightArmIPC
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmIPC
-      connections:
-      - left hand
-    right hand:
-      part: RightHandIPC
-    left hand:
-      part: LeftHandIPC
-    right leg:
-      part: RightLegIPC
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegIPC
-      connections:
-      - left foot
-    right foot:
-      part: RightFootIPC
-    left foot:
-      part: LeftFootIPC
diff --git a/Resources/Prototypes/Body/Prototypes/moth.yml b/Resources/Prototypes/Body/Prototypes/moth.yml
deleted file mode 100644
index d17af93644d..00000000000
--- a/Resources/Prototypes/Body/Prototypes/moth.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Moth
-  name: "moth"
-  root: torso
-  slots:
-    head:
-      part: HeadMoth
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoMoth
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganHumanLungs
-        stomach: OrganMothStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganHumanKidneys
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-    right arm:
-      part: RightArmMoth
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmMoth
-      connections:
-      - left hand
-    right hand:
-      part: RightHandMoth
-    left hand:
-      part: LeftHandMoth
-    right leg:
-      part: RightLegMoth
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegMoth
-      connections:
-      - left foot
-    right foot:
-      part: RightFootMoth
-    left foot:
-      part: LeftFootMoth
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/plasmaman.yml b/Resources/Prototypes/Body/Prototypes/plasmaman.yml
deleted file mode 100644
index a41ad0802a9..00000000000
--- a/Resources/Prototypes/Body/Prototypes/plasmaman.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Plasmaman
-  name: "plasmaman"
-  root: torso
-  slots:
-    head:
-      part: HeadPlasmaman
-      connections:
-      - torso
-      organs:
-        brain: OrganPlasmamanBrain
-        eyes: OrganPlasmamanEyes
-    torso:
-      part: TorsoPlasmaman
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        heart: OrganPlasmamanHeart
-        lungs: OrganPlasmamanLungs
-        stomach: OrganPlasmamanStomach
-        liver: OrganPlasmamanLiver
-        kidneys: OrganPlasmamanKidneys
-    right arm:
-      part: RightArmPlasmaman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmPlasmaman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandPlasmaman
-    left hand:
-      part: LeftHandPlasmaman
-    right leg:
-      part: RightLegPlasmaman
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegPlasmaman
-      connections:
-      - left foot
-    right foot:
-      part: RightFootPlasmaman
-    left foot:
-      part: LeftFootPlasmaman
diff --git a/Resources/Prototypes/Body/Prototypes/primate.yml b/Resources/Prototypes/Body/Prototypes/primate.yml
deleted file mode 100644
index a88b75e0a1f..00000000000
--- a/Resources/Prototypes/Body/Prototypes/primate.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- type: body
-  id: Primate
-  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 # Shitmed
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    hands:
-      part: HandsAnimal
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/rat.yml b/Resources/Prototypes/Body/Prototypes/rat.yml
deleted file mode 100644
index fe772889944..00000000000
--- a/Resources/Prototypes/Body/Prototypes/rat.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: body
-  id: Rat
-  name: "animal"
-  root: torso
-  slots:
-    torso:
-      part: TorsoRat
-      connections:
-      - legs
-      organs:
-        lungs: OrganRatLungs
-        stomach: OrganRatStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Body/Prototypes/reptilian.yml b/Resources/Prototypes/Body/Prototypes/reptilian.yml
deleted file mode 100644
index d28d25ce6f7..00000000000
--- a/Resources/Prototypes/Body/Prototypes/reptilian.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  name: "reptilian"
-  id: Reptilian
-  root: torso
-  slots:
-    head:
-      part: HeadReptilian
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoReptilian
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganHumanLungs
-        stomach: OrganReptilianStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganHumanKidneys
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-    right arm:
-      part: RightArmReptilian
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmReptilian
-      connections:
-      - left hand
-    right hand:
-      part: RightHandReptilian
-    left hand:
-      part: LeftHandReptilian
-    right leg:
-      part: RightLegReptilian
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegReptilian
-      connections:
-      - left foot
-    right foot:
-      part: RightFootReptilian
-    left foot:
-      part: LeftFootReptilian
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/shadowkin.yml b/Resources/Prototypes/Body/Prototypes/shadowkin.yml
deleted file mode 100644
index 3164c70bd03..00000000000
--- a/Resources/Prototypes/Body/Prototypes/shadowkin.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Shadowkin
-  name: "Shadowkin"
-  root: torso
-  slots:
-    head:
-      part: HeadShadowkin
-      connections:
-      - torso
-      organs:
-        brain: OrganShadowkinBrain
-        eyes: OrganShadowkinEyes
-    torso:
-      part: TorsoShadowkin
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        heart: OrganShadowkinHeart
-        stomach: OrganShadowkinStomach
-        liver:  OrganShadowkinLiver
-        kidneys: OrganShadowkinKidneys
-        lungs: OrganShadowkinCore
-    right arm:
-      part: RightArmShadowkin
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmShadowkin
-      connections:
-      - left hand
-    right hand:
-      part: RightHandShadowkin
-    left hand:
-      part: LeftHandShadowkin
-    right leg:
-      part: RightLegShadowkin
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegShadowkin
-      connections:
-      - left foot
-    right foot:
-      part: RightFootShadowkin
-    left foot:
-      part: LeftFootShadowkin
diff --git a/Resources/Prototypes/Body/Prototypes/skeleton.yml b/Resources/Prototypes/Body/Prototypes/skeleton.yml
deleted file mode 100644
index 0e55660e183..00000000000
--- a/Resources/Prototypes/Body/Prototypes/skeleton.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-- type: body
-  id: Skeleton
-  name: "skeleton"
-  root: torso
-  slots:
-    head:
-      part: HeadSkeleton
-      connections:
-      - torso
-    torso:
-      part: TorsoSkeleton
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-    right arm:
-      part: RightArmSkeleton
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmSkeleton
-      connections:
-      - left hand
-    right hand:
-      part: RightHandSkeleton
-    left hand:
-      part: LeftHandSkeleton
-    right leg:
-      part: RightLegSkeleton
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegSkeleton
-      connections:
-      - left foot
-    right foot:
-      part: RightFootSkeleton
-    left foot:
-      part: LeftFootSkeleton
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/slime.yml b/Resources/Prototypes/Body/Prototypes/slime.yml
deleted file mode 100644
index bdbf7d29d09..00000000000
--- a/Resources/Prototypes/Body/Prototypes/slime.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-- type: body
-  id: Slime
-  name: "slime"
-  root: torso
-  slots:
-    head:
-      part: HeadSlime
-      connections:
-      - torso
-    torso:
-      part: TorsoSlime
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        core: SentientSlimeCore
-        lungs: OrganSlimeLungs
-    right arm:
-      part: RightArmSlime
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmSlime
-      connections:
-      - left hand
-    right hand:
-      part: RightHandSlime
-    left hand:
-      part: LeftHandSlime
-    right leg:
-      part: RightLegSlime
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegSlime
-      connections:
-      - left foot
-    right foot:
-      part: RightFootSlime
-    left foot:
-      part: LeftFootSlime
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/vox.yml b/Resources/Prototypes/Body/Prototypes/vox.yml
deleted file mode 100644
index b60d9f6dae3..00000000000
--- a/Resources/Prototypes/Body/Prototypes/vox.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Vox
-  name: "vox"
-  root: torso
-  slots:
-    head:
-      part: HeadVox
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoVox
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganVoxLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmVox
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmVox
-      connections:
-      - left hand
-    right hand:
-      part: RightHandVox
-    left hand:
-      part: LeftHandVox
-    right leg:
-      part: RightLegVox
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegVox
-      connections:
-      - left foot
-    right foot:
-      part: RightFootVox
-    left foot:
-      part: LeftFootVox
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index a95fdbb1917..ac6d2ead288 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -12,7 +12,6 @@
       - id: Cautery
       - id: Retractor
       - id: Scalpel
-      - id: BoneGel # Shitmed Change
 
 - type: entity
   id: ClothingBackpackDuffelCBURNFilled
@@ -52,7 +51,6 @@
       - id: ScalpelAdvanced
       - id: ClothingHandsGlovesNitrile
       - id: EmergencyRollerBedSpawnFolded
-      - id: BoneGel # Shitmed Change
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
index 93a26f13bc9..f7fb73520af 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -65,12 +65,8 @@
       - id: Retractor
       - id: Cautery
       - id: Drill
-      - id: SawElectric # Shitmed Change
+      - id: Saw
       - id: Hemostat
-      # Shitmed Change
-      - id: BoneGel
-      - id: BoxLatexGloves
-      - id: BoxSterileMask
 
 - type: entity
   id: CrateMedicalScrubs
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index d138374208a..7b4277f0d5f 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -233,13 +233,11 @@
     - id: Hypospray
     - id: LunchboxCommandFilledRandom
       prob: 0.3
-    - id: MedicalBiofabMachineBoard
     - id: MedicalTechFabCircuitboard
     - id: MedkitFilled
     - id: PrinterDocFlatpack
     - id: RubberStampCMO
     - id: RubberStampPsychologist
-    - id: OmnimedToolLite # WD EDIT
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable
diff --git a/Resources/Prototypes/Chemistry/metabolism_groups.yml b/Resources/Prototypes/Chemistry/metabolism_groups.yml
deleted file mode 100644
index 1cc1f19311d..00000000000
--- a/Resources/Prototypes/Chemistry/metabolism_groups.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Default human metabolism groups.
-- type: metabolismGroup
-  id: Poison
-  name: metabolism-group-poison
-
-- type: metabolismGroup
-  id: Medicine
-  name: metabolism-group-medicine
-
-- type: metabolismGroup
-  id: Narcotic
-  name: metabolism-group-narcotic
-
-- type: metabolismGroup
-  id: Alcohol
-  name: metabolism-group-alcohol
-
-- type: metabolismGroup
-  id: Food
-  name: metabolism-group-food
-
-- type: metabolismGroup
-  id: Drink
-  name: metabolism-group-drink
-
-# Used for gases that have effects on being inhaled
-- type: metabolismGroup
-  id: Gas
-  name: metabolism-group-gas
-
-# Dummy for the guide
-- type: metabolismGroup
-  id: PlantMetabolisms
-  name: metabolism-group-plant-metabolisms
diff --git a/Resources/Prototypes/Damage/types.yml b/Resources/Prototypes/Damage/types.yml
index 2a82b4118c1..5a06eafad00 100644
--- a/Resources/Prototypes/Damage/types.yml
+++ b/Resources/Prototypes/Damage/types.yml
@@ -21,36 +21,42 @@
   name: damage-type-blunt
   armorCoefficientPrice: 2
   armorFlatPrice: 10
+  wound: WoundBlunt # WD EDIT
 
 - type: damageType
   id: Cellular
   name: damage-type-cellular
   armorCoefficientPrice: 5
   armorFlatPrice: 30
+  wound: WoundCellular # WD EDIT
 
 - type: damageType
   id: Caustic
   name: damage-type-caustic
   armorCoefficientPrice: 5
   armorFlatPrice: 30
+  wound: WoundCaustic # WD EDIT
 
 - type: damageType
   id: Cold
   name: damage-type-cold
   armorCoefficientPrice: 2.5
   armorFlatPrice: 20
+  wound: WoundCold # WD EDIT
 
 - type: damageType
   id: Heat
   name: damage-type-heat
   armorCoefficientPrice: 2.5
   armorFlatPrice: 20
+  wound: WoundHeat # WD EDIT
 
 - type: damageType
   id: Piercing
   name: damage-type-piercing
   armorCoefficientPrice: 2
   armorFlatPrice: 10
+  wound: WoundPiercing # WD EDIT
 
 # Poison damage. Generally caused by various reagents being metabolised.
 - type: damageType
@@ -70,12 +76,14 @@
   name: damage-type-shock
   armorCoefficientPrice: 2.5
   armorFlatPrice: 20
+  wound: WoundShock # WD EDIT
 
 - type: damageType
   id: Slash
   name: damage-type-slash
   armorCoefficientPrice: 2
   armorFlatPrice: 10
+  wound: WoundSlash # WD EDIT
 
 # Damage represent structures internal integrity.
 # Exclusive for structures such as walls, airlocks and others.
diff --git a/Resources/Prototypes/DeltaV/Body/Organs/chitinid.yml b/Resources/Prototypes/DeltaV/Body/Organs/chitinid.yml
deleted file mode 100644
index f82e055fbaa..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Organs/chitinid.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-- type: entity
-  id: OrganChitinidStomach
-  parent: OrganAnimalStomach
-  name: stomach
-  description: "Gross. This is hard to stomach."
-  components:
-  - type: Organ # Shitmed Change
-    slotId: stomach # Shitmed Change
-  - 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: [Animal]
-    groups:
-    - id: Food
-    - id: Drink
-
-- type: entity
-  id: OrganChitinidLiver
-  parent: BaseAnimalOrgan
-  name: liver
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Organ
-    slotId: liver # Shitmed
-    onAdd:
-    - type: UnpoweredFlashlight
-    - type: PointLight
-      enabled: false
-      radius: 3
-      softness: 5
-      color: "#2CFA1F"
-      autoRot: true
-  - type: Sprite
-    state: liver
-  - type: Metabolizer
-    maxReagents: 1
-    metabolizerTypes: [ Animal ]
-    groups:
-    - id: Alcohol
-      rateModifier: 0.1
-  - type: Liver # Shitmed
-  - type: Tag # goob edit
-    tags:
-    - Meat
-  - type: Item
-    size: Small
-    heldPrefix: liver
diff --git a/Resources/Prototypes/DeltaV/Body/Organs/harpy.yml b/Resources/Prototypes/DeltaV/Body/Organs/harpy.yml
deleted file mode 100644
index d573ce0dfba..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Organs/harpy.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-- type: entity
-  id: OrganHarpyLungs
-  parent: BaseHumanOrgan
-  name: lungs
-  description: "An advanced pair of avian lungs. Filters oxygen by way of moving air constantly through air sacs."
-  components:
-  - type: Sprite
-    layers:
-      - state: lung-l
-      - state: lung-r
-  - type: Lung
-  - type: Organ
-    slotId: lungs
-  - type: Metabolizer
-    updateInterval: 2.0
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Human ]
-    groups:
-    - id: Gas
-      rateModifier: 200.0
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 10
-      Lung:
-        maxVol: 100.0
-        canReact: false
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
diff --git a/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml b/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml
deleted file mode 100644
index 4d243971457..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: entity
-  id: OrganVulpkaninStomach
-  parent: OrganAnimalStomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Stomach
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml b/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml
deleted file mode 100644
index d91492559b7..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Parts/chitinid.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartChitinidBase
-  parent: [BaseItem, BasePart]
-  name: "Chitinid body part"
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoChitinid
-  name: "chitinid torso"
-  parent: [PartChitinidBase, BaseTorso]
-  components:
-  - type: Sprite
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-
-- type: entity
-  id: HeadChitinid
-  name: "chitinid head"
-  parent: [BaseHead, PartChitinidBase] # WWDP
-  components:
-  - type: Sprite
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmChitinid
-  name: "left chitinid arm"
-  parent: [PartChitinidBase, BaseLeftArm]
-  components:
-  - type: Sprite
-    state: "l_arm"
-
-- type: entity
-  id: RightArmChitinid
-  name: "right chitinid arm"
-  parent: [PartChitinidBase, BaseRightArm]
-  components:
-  - type: Sprite
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandChitinid
-  name: "left chitinid hand"
-  parent: [PartChitinidBase, BaseLeftHand]
-  components:
-  - type: Sprite
-    state: "l_hand"
-
-- type: entity
-  id: RightHandChitinid
-  name: "right chitinid hand"
-  parent: [PartChitinidBase, BaseRightHand]
-  components:
-  - type: Sprite
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegChitinid
-  name: "left chitinid leg"
-  parent: [PartChitinidBase, BaseLeftLeg]
-  components:
-  - type: Sprite
-    state: "l_leg"
-
-- type: entity
-  id: RightLegChitinid
-  name: "right chitinid leg"
-  parent: [PartChitinidBase, BaseRightLeg]
-  components:
-  - type: Sprite
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootChitinid
-  name: "left chitinid foot"
-  parent: [PartChitinidBase, BaseLeftFoot]
-  components:
-  - type: Sprite
-    state: "l_foot"
-
-- type: entity
-  id: RightFootChitinid
-  name: "right chitinid foot"
-  parent: [PartChitinidBase, BaseRightFoot]
-  components:
-  - type: Sprite
-    state: "r_foot"
diff --git a/Resources/Prototypes/DeltaV/Body/Parts/vulpkanin.yml b/Resources/Prototypes/DeltaV/Body/Parts/vulpkanin.yml
deleted file mode 100644
index e4fd2d77e9f..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Parts/vulpkanin.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO BODY: Part damage
-- type: entity
-  id: PartVulpkanin
-  parent: BaseItem
-  name: "vulpkanin body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: OrganicPart # Shitmed Change
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice #DynamicPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-  # Shitmed Change Start
-  - type: Gibbable
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 110
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 150
-      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
-    # Shitmed Change End
-
-- type: entity
-  id: TorsoVulpkanin
-  name: "vulpkanin torso"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "torso_m"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "torso_m"
-  # Shitmed Change Start
-  - type: BodyPart
-    partType: Torso
-    toolName: "a torso"
-    containerName: "torso_slot"
-  - type: ContainerContainer
-    containers:
-      torso_slot: !type:ContainerSlot {}
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Blunt
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Slash
-        damage: 400
-      behaviors:
-      - !type:GibPartBehavior { }
-    - trigger:
-        !type:DamageTypeTrigger
-        damageType: Heat
-        damage: 400
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawnInContainer: true
-        spawn:
-          Ash:
-            min: 1
-            max: 1
-      - !type:BurnBodyBehavior { }
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MeatLaserImpact
-  # Shitmed Change End
-
-- type: entity
-  id: HeadVulpkanin
-  name: "vulpkanin head"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "head_m"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "head_m"
-  - type: BodyPart
-    partType: Head
-    vital: true
-    toolName: "a head" # Shitmed Change
-  - type: Input
-    context: "ghost"
-  - type: InputMover
-  - type: GhostOnMove
-  - type: Tag
-    tags:
-      - Head
-
-- type: entity
-  id: LeftArmVulpkanin
-  name: "left vulpkanin arm"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_arm"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    toolName: "a left arm" # Shitmed Change
-
-- type: entity
-  id: RightArmVulpkanin
-  name: "right vulpkanin arm"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_arm"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_arm"
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    toolName: "a right arm" # Shitmed Change
-
-- type: entity
-  id: LeftHandVulpkanin
-  name: "left vulpkanin hand"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_hand"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Left
-    toolName: "a left hand" # Shitmed Change
-
-- type: entity
-  id: RightHandVulpkanin
-  name: "right vulpkanin hand"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_hand"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_hand"
-  - type: BodyPart
-    partType: Hand
-    symmetry: Right
-    toolName: "a right hand" # Shitmed Change
-
-- type: entity
-  id: LeftLegVulpkanin
-  name: "left vulpkanin leg"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_leg"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-    toolName: "a left leg" # Shitmed Change
-  - type: MovementBodyPart
-
-- type: entity
-  id: RightLegVulpkanin
-  name: "right vulpkanin leg"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_leg"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_leg"
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-    toolName: "a right leg" # Shitmed Change
-  - type: MovementBodyPart
-
-- type: entity
-  id: LeftFootVulpkanin
-  name: "left vulpkanin foot"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_foot"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "l_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Left
-    toolName: "a left foot" # Shitmed Change
-
-- type: entity
-  id: RightFootVulpkanin
-  name: "right vulpkanin foot"
-  parent: PartVulpkanin
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_foot"
-  - type: Icon
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: "r_foot"
-  - type: BodyPart
-    partType: Foot
-    symmetry: Right
-    toolName: "a right foot" # Shitmed Change
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/chitinid.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/chitinid.yml
deleted file mode 100644
index d4b44fba722..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Prototypes/chitinid.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- type: body
-  id: Chitinid
-  name: "chitinid"
-  root: torso
-  slots:
-    head:
-      part: HeadChitinid
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoChitinid
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganChitinidStomach
-        liver: OrganChitinidLiver
-        kidneys: OrganHumanKidneys
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-    right arm:
-      part: RightArmChitinid
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmChitinid
-      connections:
-      - left hand
-    right hand:
-      part: RightHandChitinid
-    left hand:
-      part: LeftHandChitinid
-    right leg:
-      part: RightLegChitinid
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegChitinid
-      connections:
-      - left foot
-    right foot:
-      part: RightFootChitinid
-    left foot:
-      part: LeftFootChitinid
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
deleted file mode 100644
index bfd4f62e1b9..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-- type: body
-  id: Harpy
-  name: "harpy"
-  root: torso
-  slots:
-    head:
-      part: HeadHarpy
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoHarpy
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed Change
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHarpyLungs
-        stomach: OrganAnimalStomach
-        liver:  OrganAnimalLiver
-        kidneys: OrganAnimalKidneys
-    right arm:
-      part: RightArmHarpy
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHarpy
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHarpy
-    left hand:
-      part: LeftHandHarpy
-    right leg:
-      part: RightLegHarpy
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegHarpy
-      connections:
-      - left foot
-    right foot:
-      part: RightFootHarpy
-    left foot:
-      part: LeftFootHarpy
-
diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
deleted file mode 100644
index cce26dbd870..00000000000
--- a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  name: "vulpkanin"
-  id: Vulpkanin
-  root: torso
-  slots:
-    head:
-      part: HeadVulpkanin
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoVulpkanin
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganHumanLungs
-        stomach: OrganVulpkaninStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganHumanKidneys
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed Change
-    right arm:
-      part: RightArmVulpkanin
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmVulpkanin
-      connections:
-      - left hand
-    right hand:
-      part: RightHandVulpkanin
-    left hand:
-      part: LeftHandVulpkanin
-    right leg:
-      part: RightLegVulpkanin
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegVulpkanin
-      connections:
-      - left foot
-    right foot:
-      part: RightFootVulpkanin
-    left foot:
-      part: LeftFootVulpkanin
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
index fbf78c92e52..9968dfdfb2e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
@@ -1,19 +1,25 @@
 - type: marking
   id: OniHornShaved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
     state: shaved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornBull
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
     state: bull
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/chitinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/chitinid.yml
index a8644a4e079..37ce63254fe 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/chitinid.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/chitinid.yml
@@ -1,458 +1,678 @@
 # Antennas
 - type: marking
   id: ChitinidAntennasDefault
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: default
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasCurly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: curly
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasGray
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: gray
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasSlick
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: slick
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasLong
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: long
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasBee
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: bee
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasShort
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: short
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasFirefly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: firefly_primary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: firefly_secondary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasRadar
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: radar
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidAntennasSpeed
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_antennas.rsi
     state: speed
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 
 # Wings
 - type: marking
   id: ChitinidWingsDefault
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: default
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsChitinid
+    # WD EDIT END
 
 - type: marking
   id: ChitinidWingsSmooth
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: smooth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsChitinid
+    # WD EDIT END
 
 - type: marking
   id: ChitinidWingsHoneypot
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: honeypot_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsChitinid
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: honeypot_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: ChitinidWingsStubby
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: stubby
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsChitinid
+    # WD EDIT END
 
 - type: marking
   id: ChitinidWingsBee
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: bee_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsChitinid
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: bee_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: ChitinidWingsFirefly
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: firefly_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsChitinid
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
     state: firefly_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 # Body markings:
 # Charred
 - type: marking
   id: ChitinidChestCharred
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: charred_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: ChitinidGroinCharred
+  markingCategory: Groin
+  speciesRestriction: [Chitinid]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
+    state: charred_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: ChitinidHeadCharred
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: charred_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLLegCharred
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: charred_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRLegCharred
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: charred_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLArmCharred
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: charred_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRArmCharred
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: charred_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Plated
 - type: marking
   id: ChitinidChestPlated
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: plated_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: ChitinidGroinPlated
+  markingCategory: Groin
+  speciesRestriction: [Chitinid]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
+    state: plated_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: ChitinidLArmPlated
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: plated_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRArmPlated
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: plated_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Stripes
 - type: marking
   id: ChitinidChestStripes
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: stripes_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChitinidHeadStripes
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: stripes_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLLegStripes
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: stripes_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRLegStripes
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: stripes_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLArmStripes
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: stripes_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRArmStripes
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: stripes_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Radiant
 - type: marking
   id: ChitinidChestRadiant
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: radiant_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+
+- type: marking
+  id: ChitinidGroinRadiant
+  markingCategory: Groin
+  speciesRestriction: [Chitinid]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
+    state: radiant_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: ChitinidHeadRadiant
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: radiant_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLLegRadiant
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: radiant_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRLegRadiant
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: radiant_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLArmRadiant
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: radiant_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRArmRadiant
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: radiant_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Toxic
 - type: marking
   id: ChitinidChestToxic
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: toxic_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: ChitinidGroinToxic
+  markingCategory: Groin
+  speciesRestriction: [Chitinid]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
+    state: toxic_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: ChitinidHeadToxic
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: toxic_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLLegToxic
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: toxic_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRLegToxic
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: toxic_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLArmToxic
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: toxic_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRArmToxic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: toxic_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Spotted
 - type: marking
   id: ChitinidChestSpotted
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: spotted_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: ChitinidGroinSpotted
+  markingCategory: Groin
+  speciesRestriction: [Chitinid]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
+    state: spotted_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: ChitinidHeadSpotted
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: spotted_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLLegSpotted
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: spotted_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRLegSpotted
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: spotted_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidLArmSpotted
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: spotted_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ChitinidRArmSpotted
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Chitinid]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi
     state: spotted_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml
index 91c199b330c..a898e940cc9 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml
@@ -1,41 +1,69 @@
 - type: marking
   id: FelinidFluffyTailRings
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
     state: Felinid_fluffy_tail_full
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
     state: felinid_fluffy_tail_rings
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: FelinidFluffyTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
     state: Felinid_fluffy_tail_full
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: FelinidAlternativeTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Tajaran
   sprites:
     - sprite: DeltaV/Mobs/Customization/Felinid/alternative_tail.rsi
       state: m_waggingtail_cat_FRONT
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailFelinid
+      # WD EDIT END
 
 - type: marking
   id: FelinidTiger
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Tajaran
   sprites:
     - sprite: DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi
       state: m_tail_tiger_primary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailFelinid
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi
       state: m_tail_tiger_secondary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi
       state: m_tail_tiger_tertiary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
index c929b854ffe..fda9936f8a2 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
@@ -1,79 +1,109 @@
 - type: marking
   id: HumanHairShortBedhead
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: short_bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairBobClassic
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_bob
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairMessyClassic
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_messy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairClassicNoFade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_nofade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairClassicGentle
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_gentle
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairClassicLowFade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_lowfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairClassicMedFade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_medfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairClassicOmbre
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_ombre
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairClassicCrewcut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_crewcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairClassicLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_long
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml
index 65af873fe6e..c46479ede3e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamia.yml
@@ -4,13 +4,24 @@
 
 - type: marking
   id: LamiaBottom
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Lamia]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi
     state: bottom3tone1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi
     state: bottom3tone2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi
     state: bottom3tone3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml
index 432b2ee8416..db1a3a79830 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/lamiasegment.yml
@@ -4,13 +4,24 @@
 
 - type: marking
   id: LamiaBottom-LamiaSegment
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [LamiaSegment]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi
     state: body3tone1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi
     state: body3tone2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Lamia/lamia_tails.rsi
     state: body3tone3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml
index 7097be16ffa..d1b633cfd1e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/moth.yml
@@ -1,7 +1,6 @@
 - type: marking
   id: MothWingsClassicSelene
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -12,16 +11,33 @@
   sprites:
   - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi
     state: selene
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsSelene
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi
     state: selene_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi
     state: selene_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
   - sprite: DeltaV/Mobs/Customization/Moth/moth_wings.rsi
     state: selene_tertiary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml
index 4a55ff585e9..722eb6b05d2 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml
@@ -1,46 +1,69 @@
 # Head
 - type: marking
   id: ThavenCheekBarbels
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Thaven]
   sprites:
   - sprite: _DV/Mobs/Customization/thaven.rsi
     state: cheek_barbels
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenEyebrowBarbels
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Thaven]
   sprites:
   - sprite: _DV/Mobs/Customization/thaven.rsi
     state: eyebrow_barbels
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenUnderbellyFace
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Thaven]
   sprites:
   - sprite: _DV/Mobs/Customization/thaven.rsi
     state: underbelly_face
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 # Torso
 - type: marking
   id: ThavenUnderbellyTorso
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Thaven]
   sprites:
   - sprite: _DV/Mobs/Customization/thaven.rsi
-    state: underbelly_torso
+    # WD EDIT START
+    state: underbelly_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _DV/Mobs/Customization/thaven.rsi
+    state: underbelly_groin
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenCarpSpots
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Thaven]
   sprites:
   - sprite: _DV/Mobs/Customization/thaven.rsi
-    state: carp_spots
+    # WD EDIT START
+    state: carp_spots_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _DV/Mobs/Customization/thaven.rsi
+    state: carp_spots_groin
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml
index 10670e36de5..b43d1c5a97b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml
@@ -3,560 +3,879 @@
 # Ears Markings
 - type: marking
   id: VulpEar
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: vulp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: vulp-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarFade
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: vulp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: vulp-fade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarSharp
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: vulp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: vulp-sharp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarJackal
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: jackal
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: jackal-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarTerrier
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: terrier
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: terrier-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarWolf
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: wolf
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: wolf-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarFennec
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: fennec
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: fennec-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarFox
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: fox
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: fox-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarOtie
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: otie
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: otie-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarTajaran
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: msai
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: msai-inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarShock
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: shock
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarCoyote
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: coyote
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpEarDalmatian
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/ear_markings.rsi
       state: dalmatian
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 # Head Markings (Snout)
 - type: marking
   id: VulpSnoutAlt
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: muzzle_alt
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: nose
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnout
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: muzzle
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: nose
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutSharp
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: muzzle_sharp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: nose
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutFade
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: muzzle_fade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: nose
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutNose
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: nose
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutMask
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: mask
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: nose
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutVulpine
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: vulpine
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: vulpine-lines
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutSwift
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: vulpine-lines
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutBlaze
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: blaze
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpSnoutPatch
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: patch
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 # Head Markings (Head)
 - type: marking
   id: VulpHeadTiger
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: tiger_head
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHeadTigerFace
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: tiger_face
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHeadSlash
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/head_markings.rsi
       state: slash
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 # Tail Markings
 - type: marking
   id: VulpTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp-fade
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_wag-tip #fade
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailTip
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp-tip
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailTipAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_wag-tip
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailAlt
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_alt
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_alt-fade
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailAltTip
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_alt
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: vulp_alt-tip
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailLong
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: long
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: long-tip
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFox
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox-fade
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFoxAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox_wag-fade
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFoxTip
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox-tip
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFoxTipAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox_wag-tip
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailBushy
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: bushfluff
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailBushyAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: bushfluff_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailCoyote
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: coyote
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailCoyoteAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: coyote_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailCorgi
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: corgi
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailCorgiAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: corgi_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailHusky
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: husky-inner
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: husky-outer
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailHuskyAlt
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: husky
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFox2
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFox3
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox3
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fox3-tip
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFennec
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fennec
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailOtie
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: otie
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailFluffy
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: fluffy
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailDalmatian
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Vulpkanin, Human]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: dalmatian
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 - type: marking
   id: VulpTailDalmatianAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
       state: dalmatian_wag
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailVulpkanin
+      # WD EDIT END
 
 # Body Markings (Chest)
 - type: marking
   id: VulpBellyCrest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
-      state: belly_crest
+    # WD EDIT START
+      state: belly_crest_chest
+      layer: enum.BodyAppearanceLayer.Chest
+      bodyPart: Chest
+    - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: belly_crest_groin
+      layer: enum.BodyAppearanceLayer.Groin
+      bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: VulpBellyFull
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
-      state: belly_full
+    # WD EDIT START
+      state: belly_full_chest
+      layer: enum.BodyAppearanceLayer.Chest
+      bodyPart: Chest
+    - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: belly_full_groin
+      layer: enum.BodyAppearanceLayer.Groin
+      bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: VulpBellyFox
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
-      state: belly_fox
+    # WD EDIT START
+      state: belly_fox_chest
+      layer: enum.BodyAppearanceLayer.Chest
+      bodyPart: Chest
+    - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
+      state: belly_fox_groin
+      layer: enum.BodyAppearanceLayer.Groin
+      bodyPart: Groin
+    # WD EDIT END
 
 # # Body Markings (Overlay)
 # Eventually layering will allow to have markings on the body not layering above jumpsuits
@@ -591,299 +910,398 @@
 - type: marking
   id: VulpPointsFeet
   markingCategory: RightFoot
-  bodyPart: RFoot
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_feet
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightFoot
+      bodyPart: RightFoot
+      # WD EDIT END
 
 - type: marking
   id: VulpPointsCrestLegs
   markingCategory: LeftLeg
-  bodyPart: LLeg
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_crest-legs
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: VulpPointsFadeLegs
   markingCategory: LeftLeg
-  bodyPart: LLeg
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_fade-legs
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: VulpPointsSharpLegs
   markingCategory: LeftLeg
-  bodyPart: LLeg
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_sharp-legs
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 # Arm Markings
 - type: marking
   id: VulpPointsHands
   markingCategory: RightHand
-  bodyPart: RHand
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_hands
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightHand
+      bodyPart: RightHand
+      # WD EDIT END
 
 - type: marking
   id: VulpPointsCrestArms
   markingCategory: LeftArm
-  bodyPart: LArm
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_crest-arms
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftArm
+      bodyPart: LeftArm
+      # WD EDIT END
 
 - type: marking
   id: VulpPointsFadeArms
   markingCategory: LeftArm
-  bodyPart: LArm
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_fade-arms
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftArm
+      bodyPart: LeftArm
+      # WD EDIT END
 
 - type: marking
   id: VulpPointsSharpArms
   markingCategory: LeftArm
-  bodyPart: LArm
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi
       state: points_sharp-arms
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftArm
+      bodyPart: LeftArm
+      # WD EDIT END
 
 # Hairs
 - type: marking
   id: VulpHairAdhara
-  bodyPart: Hair
   speciesRestriction: [Vulpkanin]
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: adhara
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairAnita
-  bodyPart: Hair
   speciesRestriction: [Vulpkanin]
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: anita
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairApollo
-  bodyPart: Hair
   speciesRestriction: [Vulpkanin]
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: apollo
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairBelle
-  bodyPart: Hair
   speciesRestriction: [Vulpkanin]
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: belle
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairBraided
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: braided
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairBun
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: bun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairCleanCut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: clean_cut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairCurl
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: curl
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairHawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: hawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairJagged
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: jagged
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairJeremy
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: jeremy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairKajam
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: kajam
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairKeid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: keid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairKleeia
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: kleeia
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairMizar
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: mizar
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairPunkBraided
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: punkbraided
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairRaine
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: raine
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairRough
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: rough
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairShort
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: short
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairShort2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: short2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpHairSpike
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/hair.rsi
       state: spike
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 # Facial Hairs
 - type: marking
   id: VulpFacialHairRuff
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/facial_hair.rsi
       state: ruff
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpFacialHairElder
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/facial_hair.rsi
       state: elder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpFacialHairElderChin
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/facial_hair.rsi
       state: elder_chin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VulpFacialHairKita
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vulpkanin]
   sprites:
     - sprite: DeltaV/Mobs/Customization/Vulpkanin/facial_hair.rsi
       state: kita
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
index 73f68735eae..6d1c5f14c6b 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml
@@ -146,7 +146,6 @@
         Structural: 1.5
   - type: Body
     prototype: Rat
-    requiredLegs: 1 # TODO: More than 1 leg
   - type: Bloodstream
     bloodMaxVolume: 60
   - type: CanEscapeInventory
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml
index bd33921e7d4..d5f8bdc3de5 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml
@@ -49,14 +49,19 @@
       - DeathAcidifierImplant
     - type: Sprite
       layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Chest" ]
+      - map: [ "enum.BodyAppearanceLayer.Groin" ]
+      - map: [ "enum.BodyAppearanceLayer.Head" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Eyes" ]
+      - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+      # WD EDIT END
 #     - shader: StencilClear
 #      sprite: Mobs/Species/Human/parts.rsi
 #      state: l_leg
@@ -66,10 +71,12 @@
         state: unisex_full
         visible: false
       - map: ["jumpsuit"]
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+      - map: ["enum.BodyAppearanceLayer.RightFoot"]
+      - map: ["enum.BodyAppearanceLayer.LeftHand"]
+      - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
       - map: [ "gloves" ]
       - map: [ "shoes" ]
       - map: [ "ears" ]
@@ -82,7 +89,7 @@
       - map: [ "enum.HumanoidVisualLayers.Hair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
       - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ]
+      - map: [ "enum.BodyAppearanceLayer.Tail" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "mask" ]
       - map: [ "head" ]
       - map: ["enum.HumanoidVisualLayers.Handcuffs"]
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml
index 9a0e2826bdb..676d24bf5d4 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml
@@ -14,8 +14,6 @@
   - Human
   # speciesBlacklist:
   #   - Shadowkin
-  #   - Monkey # Shitmed Change
-  #   - Kobold # Shitmed Change
   components:
     - type: Loadout
       prototypes: [SyndicateListenerGear]
@@ -45,8 +43,6 @@
     - Human
   # speciesBlacklist: # WWDP
   #   - Shadowkin
-  #   - Monkey # Shitmed Change
-  #   - Kobold # Shitmed Change
   components:
     - type: GhostRole
       name: Mobster
@@ -83,8 +79,6 @@
   - Human
   # speciesBlacklist: # WWDP
   #   - Shadowkin
-  #   - Monkey # Shitmed Change
-  #   - Kobold # Shitmed Change
   components:
     - type: GhostRole
       name: Mobster
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/chitinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/chitinid.yml
index ec2fd4c6bb2..48d2cd9eaae 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/chitinid.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/chitinid.yml
@@ -8,7 +8,9 @@
   - type: HumanoidAppearance
     species: Chitinid
     hideLayersOnEquip:
-    - HeadTop
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.HeadTop
+    # WD EDIT END
 
   - type: Hunger
     baseDecayRate: 0.0467 #needs to eat more to survive
@@ -22,7 +24,6 @@
 
   - type: Body
     prototype: Chitinid
-    requiredLegs: 2
 
   - type: Damageable
     damageContainer: Biological
@@ -101,19 +102,26 @@
     noRot: true
     drawdepth: Mobs
     layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Chest" ]
+      - map: [ "enum.BodyAppearanceLayer.Groin" ]
+      - map: [ "enum.BodyAppearanceLayer.Head" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Eyes" ]
+      - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+      # WD EDIT END
       - map: [ "jumpsuit" ]
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+      - map: ["enum.BodyAppearanceLayer.RightFoot"]
+      - map: ["enum.BodyAppearanceLayer.LeftHand"]
+      - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi
@@ -128,7 +136,10 @@
       - map: [ "id" ]
       - map: [ "back" ]
       - map: [ "neck" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Tail" ]
+      - map: [ "enum.BodyAppearanceLayer.Wings" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       - map: [ "enum.HumanoidVisualLayers.Hair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
@@ -175,3 +186,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Chitinid
+  # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml
index f96d2c05ec2..015f23375c2 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/lamia.yml
@@ -59,36 +59,15 @@
     offset: 0, 0.4
     layers: #TODO: manually fix these layers
       - map: [ "enum.HumanoidVisualLayers.Chest" ]
-        color: "#e8b59b"
-        sprite: Nyanotrasen/Mobs/Species/lamia.rsi
-        state: torso_m
       - map: [ "enum.HumanoidVisualLayers.Head" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: head_m
       - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-        color: "#008800"
-        sprite: Mobs/Customization/eyes.rsi
-        state: eyes
       - map: [ "enum.HumanoidVisualLayers.Face" ]
       - map: [ "enum.HumanoidVisualLayers.RArm" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: r_arm
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: l_arm
       - map: [ "enum.HumanoidVisualLayers.Tail" ]
       - map: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.LHand" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: l_hand
       - map: [ "enum.HumanoidVisualLayers.RHand" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: r_hand
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi
@@ -126,10 +105,13 @@
   - type: DamageVisuals
     thresholds: [ 60, 120, 200 ] #these values aren't final, adjust accordingly with thresholds above'
     targetLayers:
-      - "enum.HumanoidVisualLayers.Chest"
-      - "enum.HumanoidVisualLayers.Head"
-      - "enum.HumanoidVisualLayers.LArm"
-      - "enum.HumanoidVisualLayers.RArm"
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - "enum.BodyAppearanceLayer.Chest"
+    - "enum.BodyAppearanceLayer.Groin"
+    - "enum.BodyAppearanceLayer.Head"
+    - "enum.BodyAppearanceLayer.LeftArm"
+    - "enum.BodyAppearanceLayer.LeftLeg"
+    # WD EDIT END
     damageOverlayGroups:
       Brute:
         sprite: Nyanotrasen/Mobs/Effects/Lamia/brute_damage.rsi
@@ -247,36 +229,15 @@
     scale: 1, 1
     layers:
       - map: [ "enum.HumanoidVisualLayers.Chest" ]
-        color: "#e8b59b"
-        sprite: Nyanotrasen/Mobs/Species/lamia.rsi
-        state: torso_m
       - map: [ "enum.HumanoidVisualLayers.Head" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: head_m
       - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-        color: "#008800"
-        sprite: Mobs/Customization/eyes.rsi
-        state: eyes
       - map: [ "enum.HumanoidVisualLayers.Face" ]
       - map: [ "enum.HumanoidVisualLayers.RArm" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: r_arm
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: l_arm
       - map: [ "jumpsuit" ]
         shader: StencilDraw
       - map: [ "enum.HumanoidVisualLayers.LHand" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: l_hand
       - map: [ "enum.HumanoidVisualLayers.RHand" ]
-        color: "#e8b59b"
-        sprite: Mobs/Species/Human/parts.rsi
-        state: r_hand
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
index 32caf2ae019..a2eee10d003 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
@@ -16,7 +16,6 @@
     state: full
   - type: Body
     prototype: Vulpkanin
-    requiredLegs: 2
   - type: Speech
     speechSounds: Vulpkanin
     speechVerb: Vulpkanin
@@ -25,15 +24,20 @@
     noRot: true
     drawdepth: Mobs
     layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Chest" ]
+      - map: [ "enum.BodyAppearanceLayer.Groin" ]
+      - map: [ "enum.BodyAppearanceLayer.Head" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "enum.HumanoidVisualLayers.Face" ]
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+      # WD EDIT END
 #     - shader: StencilClear
 #      sprite: Mobs/Species/Human/parts.rsi
 #      state: l_leg
@@ -42,10 +46,12 @@
       - map: [ "underpants" ]
       - map: [ "undershirt" ]
       - map: [ "jumpsuit" ]
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+      - map: ["enum.BodyAppearanceLayer.RightFoot"]
+      - map: ["enum.BodyAppearanceLayer.LeftHand"]
+      - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi
@@ -66,7 +72,10 @@
       - map: [ "enum.HumanoidVisualLayers.Hair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
       - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Tail" ]
+      - map: [ "enum.BodyAppearanceLayer.Wings" ]
+      # WD EDIT END
       - map: [ "mask" ]
       - map: [ "head" ]
       - map: [ "pocket1" ]
@@ -138,9 +147,11 @@
   - type: HumanoidAppearance
     species: Vulpkanin
     hideLayersOnEquip:
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: Inventory
     speciesId: vulpkanin
     femaleDisplacements:
@@ -149,3 +160,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Vulpkanin
+  # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml
index 42db09785bd..dc95f8c0743 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/soda.yml
@@ -12,7 +12,7 @@
       - !type:SatiateThirst
         factor: 2.0
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Human
           shouldHave: false
     Food:
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
index e11eba7b117..0db83a042cd 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -51,8 +51,8 @@
   - !type:AddComponentSpecial
     components:
     - type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 2.0
+    # - type: SurgerySpeedModifier
+    #   speedModifier: 2.0
   afterLoadoutSpecial:
   - !type:ModifyEnvirosuitSpecial
     charges: 6
diff --git a/Resources/Prototypes/DeltaV/Species/chitinid.yml b/Resources/Prototypes/DeltaV/Species/chitinid.yml
index 4f34de2e575..4635f4386c8 100644
--- a/Resources/Prototypes/DeltaV/Species/chitinid.yml
+++ b/Resources/Prototypes/DeltaV/Species/chitinid.yml
@@ -3,10 +3,6 @@
   name: species-name-chitinid
   roundStart: false # THESE ARE CURRENTLY A SERVER PERFORMANCE DISASTER. IF YOU ENABLE THEM AND THEN COMPLAIN ABOUT SERVER PERFORMANCE, I WILL BAN YOU FROM THE DISCORD.
   prototype: MobChitinid
-  # WD EDIT START
-  bodyTypes:
-  - ChitinidNormal
-  # WD EDIT END
   defaultSkinTone: "#ffda93"
   markingLimits: MobChitinidMarkingLimits
   dollPrototype: MobChitinidDummy
@@ -15,36 +11,6 @@
   femaleFirstNames: NamesChitinidFirstFemale
   naming: First
 
-# WD EDIT START
-- type: bodyType
-  id: ChitinidNormal
-  name: body-normal
-  # WD EDIT END
-  sprites:
-    Head: MobChitinidHead
-    Snout: MobHumanoidAnyMarking
-    Chest: MobChitinidTorso
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobChitinidEyes
-    LArm: MobChitinidLArm
-    RArm: MobChitinidRArm
-    LHand: MobChitinidLHand
-    RHand: MobChitinidRHand
-    LLeg: MobChitinidLLeg
-    RLeg: MobChitinidRLeg
-    LFoot: MobChitinidLFoot
-    RFoot: MobChitinidRFoot
-
-- type: humanoidBaseSprite
-  id: MobChitinidEyes
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: eyes
-
 - type: markingPoints
   id: MobChitinidMarkingLimits
   onlyWhitelisted: true
@@ -55,10 +21,6 @@
     FacialHair:
       points: 0
       required: false
-    Tail:
-      points: 1
-      required: true
-      defaultMarkings: [ ChitinidWingsDefault ]
     Snout:
       points: 1
       required: false
@@ -75,6 +37,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     LeftLeg:
       points: 6
       required: false
@@ -87,87 +54,8 @@
     RightArm:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobChitinidHead
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobChitinidHeadMale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobChitinidHeadFemale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobChitinidTorso
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobChitinidTorsoMale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobChitinidTorsoFemale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobChitinidLLeg
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobChitinidLHand
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobChitinidLArm
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobChitinidLFoot
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobChitinidRLeg
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobChitinidRHand
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobChitinidRArm
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobChitinidRFoot
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
-    state: r_foot
+    # WD EDIT START
+    Wings:
+      points: 1
+      required: false
+    # WD EDIT END
diff --git a/Resources/Prototypes/DeltaV/Species/lamia.yml b/Resources/Prototypes/DeltaV/Species/lamia.yml
index 28d88f287e5..b0d196a5fb2 100644
--- a/Resources/Prototypes/DeltaV/Species/lamia.yml
+++ b/Resources/Prototypes/DeltaV/Species/lamia.yml
@@ -4,10 +4,6 @@
   roundStart: false
   prototype: MobLamia
   dollPrototype: MobLamiaDummy
-  # WD EDIT START
-  bodyTypes:
-  - LamiaNormal
-  # WD EDIT END
   defaultSkinTone: "#c0967f"
   markingLimits: MobLamiaMarkingLimits
   skinColoration: HumanToned
@@ -40,6 +36,11 @@
     Chest:
       points: 1
       required: false
+    # WD EDIT START
+    Groin:
+      points: 1
+      required: false
+    # WD EDIT END
     RightArm:
       points: 2
       required: false
@@ -52,24 +53,3 @@
     LeftHand:
       points: 3
       required: false
-
-# WD EDIT START
-- type: bodyType
-  id: LamiaNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobHumanHead
-    Face: MobHumanoidAnyMarking
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobHumanTorso
-    Eyes: MobHumanoidEyes
-    LArm: MobHumanLArm
-    RArm: MobHumanRArm
-    LHand: MobHumanLHand
-    RHand: MobHumanRHand
-    Tail: MobHumanoidAnyMarking
diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
index c55bc08c628..9ec53798bec 100644
--- a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml
@@ -3,10 +3,6 @@
   name: species-name-vulpkanin
   roundStart: true
   prototype: MobVulpkanin
-  # WD EDIT START
-  bodyTypes:
-    - VulpkaninNormal
-  # WD EDIT END
   defaultSkinTone: "#985629"
   markingLimits: MobVulpkaninMarkingLimits
   dollPrototype: MobVulpkaninDummy
@@ -15,33 +11,6 @@
   femaleFirstNames: names_vulpkanin_female
   lastNames: names_vulpkanin_last
 
-# WD EDIT START
-- type: bodyType
-  id: VulpkaninNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobVulpkaninHead
-    Face: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobVulpkaninTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobVulpkaninLArm
-    RArm: MobVulpkaninRArm
-    LHand: MobVulpkaninLHand
-    RHand: MobVulpkaninRHand
-    LLeg: MobVulpkaninLLeg
-    RLeg: MobVulpkaninRLeg
-    LFoot: MobVulpkaninLFoot
-    RFoot: MobVulpkaninRFoot
-
 - type: markingPoints
   id: MobVulpkaninMarkingLimits
   points:
@@ -53,8 +22,7 @@
       required: false
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [ VulpTail ]
+      required: false # WD EDIT: true -> false
     RightLeg:
       points: 6
       required: false
@@ -89,87 +57,3 @@
     HeadSide:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninHead
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninHeadMale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninHeadFemale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninTorso
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninTorsoMale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninTorsoFemale
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninLLeg
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninLHand
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninLArm
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninLFoot
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninRLeg
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninRHand
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninRArm
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobVulpkaninRFoot
-  baseSprite:
-    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 5ffb333959f..286e9cadc99 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -296,7 +296,6 @@
   #       - AutoinjectorCartridge #Goobstation - ParamedHypo
   #       - Tourniquet #Goobstation - ParamedHypo
   #     components:
-  #       - SurgeryTool # Shitmed Change
   #       - Hypospray
   #       - Injector
   #       - Pill
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 3f59d66e5f5..062109a2a29 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -132,10 +132,12 @@
   - type: IdentityBlocker
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 - type: entity
   abstract: true
@@ -166,10 +168,12 @@
   - type: IdentityBlocker
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 - type: entity
   abstract: true
@@ -215,10 +219,12 @@
   - type: IdentityBlocker
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   # WD EDIT START
   #- type: Reflect
   #  spread: 270
@@ -278,8 +284,10 @@
     - PlasmamanSafe
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
     clothingSlots:
     - mask
   - type: ToggleableLightVisuals
@@ -397,7 +405,7 @@
 - type: entity
   abstract: true
   # No parent since it isn't an item
-  # must parent both this and the desired helmet base when using 
+  # must parent both this and the desired helmet base when using
   id: ClothingHeadSuitWithLightBase
   name: base hardsuit helmet with light
   categories: [ HideSpawnMenu ]
@@ -470,6 +478,8 @@
   - type: GroupExamine
   - type: HideLayerClothing
     slots:
-    - Hair
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 8d4bb76aa34..c4760d02a85 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -18,10 +18,12 @@
     sprite: Clothing/Head/Hardsuits/basic.rsi
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 #Atmospherics Hardsuit
 - type: entity
@@ -471,8 +473,10 @@
     lowPressureMultiplier: 1000
   - type: HideLayerClothing
     slots:
-    - Snout
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: Armor
     modifiers:
       coefficients:
@@ -535,8 +539,10 @@
     lowPressureMultiplier: 1000
   - type: HideLayerClothing
     slots:
-    - Snout
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: Armor
     modifiers:
       coefficients:
@@ -566,8 +572,10 @@
     lowPressureMultiplier: 1000
   - type: HideLayerClothing
     slots:
-    - Snout
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: TemperatureProtection
     heatingCoefficient: 0.1 # WD EDIT: 0.005 -> 0.1
     coolingCoefficient: 0.1 # WD EDIT: 0.005 -> 0.1
@@ -631,8 +639,10 @@
     lowPressureMultiplier: 1000
   - type: HideLayerClothing
     slots:
-    - Snout
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: Armor
     modifiers:
       coefficients:
@@ -660,8 +670,10 @@
     lowPressureMultiplier: 1000
   - type: HideLayerClothing
     slots:
-    - Snout
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 26496a3727f..d5078c23952 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -483,9 +483,11 @@
     - ClothMade
   - type: HideLayerClothing
     slots:
-    - Hair
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadHatWizardBase
@@ -655,7 +657,9 @@
     - ClothMade
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
@@ -1323,7 +1327,9 @@
     coolingCoefficient: 0.5
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 9f5c792b1c3..2a424171c3a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -18,8 +18,10 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 #Basic Helmet (Security Helmet)
 - type: entity
@@ -132,10 +134,12 @@
         Piercing: 0.95
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: TinfoilHat # WWDP
     destroyOnFry: false
 
@@ -194,10 +198,12 @@
   - type: IdentityBlocker
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: Unremoveable
   - type: TinfoilHat # WWDP
     destroyOnFry: false
@@ -273,10 +279,12 @@
     - FireHelmet
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: TinfoilHat # WWDP
     destroyOnFry: false
 
@@ -308,10 +316,12 @@
     - FireHelmet
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: BreathMask
   - type: TinfoilHat # WWDP
     destroyOnFry: false
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index 109fd9fa13e..3a34a3d10fa 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -16,10 +16,12 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadHatHoodBioGeneral
@@ -103,7 +105,9 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
@@ -120,7 +124,9 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
@@ -138,7 +144,9 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
@@ -159,10 +167,12 @@
   - type: BreathMask
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
@@ -179,7 +189,9 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
@@ -194,7 +206,9 @@
     sprite: Clothing/Head/Hoods/iansuit.rsi
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadBase
@@ -209,7 +223,9 @@
     sprite: Clothing/Head/Hoods/carpsuit.rsi
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadHatHoodCarp
@@ -244,10 +260,12 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 #Winter Coat Hoods
 - type: entity
@@ -762,4 +780,6 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
index 4854df983ba..c07a53c934f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -22,7 +22,9 @@
     - WeldingMask
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: DamageOtherOnHit
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
index fc12688c8ed..ed3683eaae4 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -13,7 +13,9 @@
     - MASK
     foldedHideLayers: []
     unfoldedHideLayers:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: Mask
   - type: IngestionBlocker
   - type: IdentityBlocker
@@ -30,7 +32,9 @@
     - Bandana
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
     hideOnToggle: true
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 71880ee3b1c..f7145a43e99 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -18,7 +18,9 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
     hideOnToggle: true
 
 - type: entity
@@ -227,7 +229,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskClownBase
@@ -240,8 +244,8 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Snout
   # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
   - type: Construction
     graph: BananaClownMask
     node: basemask
@@ -295,7 +299,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
@@ -316,7 +322,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskPullableBase
@@ -372,7 +380,9 @@
   - type: IdentityBlocker
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
     hideOnToggle: true
 
 - type: entity
@@ -405,8 +415,10 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
     hideOnToggle: true
   - type: Armor
     modifiers:
@@ -449,8 +461,10 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
     hideOnToggle: true
   - type: FlashImmunity
   - type: EyeProtection
@@ -500,7 +514,9 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: IdentityBlocker
 
 - type: entity
@@ -520,7 +536,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
@@ -539,7 +557,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
@@ -558,7 +578,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
@@ -577,7 +599,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
@@ -596,7 +620,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
@@ -615,7 +641,9 @@
     - IPCMaskWearable
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
index d8da80611cf..d5378b48e18 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
@@ -22,7 +22,9 @@
           type: ChameleonBoundUserInterface
     - type: HideLayerClothing
       slots:
-      - Snout
+    # WD EDIT START
+      - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskGasChameleon
@@ -32,7 +34,9 @@
     - type: VoiceMask
     - type: HideLayerClothing
       slots:
-      - Snout
+      # WD EDIT START
+      - enum.HumanoidVisualLayers.Snout
+      # WD EDIT END
     - type: UserInterface
       interfaces:
         enum.ChameleonUiKey.Key:
@@ -67,7 +71,9 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
 
 - type: entity
   parent: ClothingMaskBase
@@ -102,7 +108,9 @@
         Piercing: 0.4
   - type: HideLayerClothing
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: IngestionBlocker
   - type: StaticPrice
     price: 5000
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index c427639dafb..74bafacf8db 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -149,7 +149,7 @@
     coolingCoefficient: 0.01
   - type: IgniteFromGasImmunity
     parts:
-    - Torso
+    - Chest # WD EDIT: Torso -> Chest
     - Groin
     - LeftArm
     - LeftHand
@@ -343,7 +343,7 @@
     coolingCoefficient: 0.2 # WD EDIT: 0.01 -> 0.2
   - type: IgniteFromGasImmunity
     parts:
-    - Torso
+    - Chest # WD EDIT: Torso -> Chest
     - Groin
     - LeftArm
     - LeftHand
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index d31ff15f79c..9e4da7335e8 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -114,8 +114,10 @@
   - type: HideLayerClothing
     force: true
     slots:
-    - LFoot
-    - RFoot
+    # WD EDIT START
+    - enum.BodyAppearanceLayer.LeftFoot
+    - enum.BodyAppearanceLayer.RightFoot
+    # WD EDIT END
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepHighHeels
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index 87eb1863ea1..bdfb55d62b9 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -162,8 +162,10 @@
   - type: HideLayerClothing
     force: true
     slots:
-    - LFoot
-    - RFoot
+    # WD EDIT START
+    - enum.BodyAppearanceLayer.LeftFoot
+    - enum.BodyAppearanceLayer.RightFoot
+    # WD EDIT END
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepHighHeels
@@ -181,8 +183,10 @@
   - type: HideLayerClothing
     force: true
     slots:
-    - LFoot
-    - RFoot
+    # WD EDIT START
+    - enum.BodyAppearanceLayer.LeftFoot
+    - enum.BodyAppearanceLayer.RightFoot
+    # WD EDIT END
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepHighHeels
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index 6ca15bda6e9..b3f2fd22b19 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -172,7 +172,7 @@
   components:
   - type: IgniteFromGasImmunity
     parts:
-    - Torso
+    - Chest # WD EDIT: Torso -> Chest
     - Groin
     - LeftArm
     - LeftHand
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml
index aa8f8c9ef63..2d48bca168c 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml
@@ -1,131 +1,297 @@
 # Chelicerae
 - type: marking
   id: ArachnidCheliceraeDownwards
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chelicerae.rsi
     state: downwards
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ArachnidCheliceraeInwards
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chelicerae.rsi
     state: inwards
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 # Appendages
 - type: marking
   id: ArachnidAppendagesDefault
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: long_primary
+  # WD EDIT START
+    state: long_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: long_secondary
+    state: long_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+  # WD EDIT START
+    state: long_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: long_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesSharp
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: sharp_primary
+  # WD EDIT START
+    state: sharp_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: sharp_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: sharp_secondary
+  # WD EDIT START
+    state: sharp_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: sharp_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesStingers
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: stingers_primary
+  # WD EDIT START
+    state: stingers_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: stingers_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: stingers_secondary
+  # WD EDIT START
+    state: stingers_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: stingers_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesZigZag
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: zigzag_primary
+  # WD EDIT START
+    state: zigzag_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: zigzag_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+  # WD EDIT START
+    state: zigzag_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: zigzag_secondary
+    state: zigzag_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesCurled
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: curled_primary
+  # WD EDIT START
+    state: curled_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: curled_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+  # WD EDIT START
+    state: curled_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: curled_secondary
+    state: curled_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesChipped
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: chipped_primary
+  # WD EDIT START
+    state: chipped_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: chipped_secondary
+    state: chipped_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+  # WD EDIT START
+    state: chipped_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: chipped_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesHarvest
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: harvest_primary
+  # WD EDIT START
+    state: harvest_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: harvest_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: harvest_secondary
+  # WD EDIT START
+    state: harvest_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: harvest_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesShort
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: short_primary
+  # WD EDIT START
+    state: short_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: short_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: short_secondary
+  # WD EDIT START
+    state: short_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: short_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 - type: marking
   id: ArachnidAppendagesFreaky
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: freaky_primary
+  # WD EDIT START
+    state: freaky_chest_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: freaky_groin_primary
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+  # WD EDIT END
   - sprite: Mobs/Customization/Arachnid/appendages.rsi
-    state: freaky_secondary
+    # WD EDIT START
+    state: freaky_chest_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  - sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: freaky_groin_secondary
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+  # WD EDIT END
 
 # Chest
 - type: marking
   id: ArachnidTorsoStripes
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: stripes
+  # WD EDIT START
+    state: stripes_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: stripes_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -133,12 +299,19 @@
 
 - type: marking
   id: ArachnidTorsoSlashes
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: slashes
+  # WD EDIT START
+    state: slashes_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: slashes_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -146,12 +319,19 @@
 
 - type: marking
   id: ArachnidTorsoX
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: x
+  # WD EDIT START
+    state: x_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: x_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -159,12 +339,19 @@
 
 - type: marking
   id: ArachnidTorsoCross
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: cross
+  # WD EDIT START
+    state: cross_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: cross_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -172,12 +359,19 @@
 
 - type: marking
   id: ArachnidTorsoHeart
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: heart
+  # WD EDIT START
+    state: heart_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: heart_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -185,12 +379,19 @@
 
 - type: marking
   id: ArachnidTorsoHourglass
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: hourglass
+  # WD EDIT START
+    state: hourglass_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: hourglass_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -198,12 +399,19 @@
 
 - type: marking
   id: ArachnidTorsoNailAndHammer
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: nail-and-hammer
+  # WD EDIT START
+    state: nail-and-hammer_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: nail-and-hammer_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -211,12 +419,19 @@
 
 - type: marking
   id: ArachnidTorsoStar
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: star
+  # WD EDIT START
+    state: star_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: star_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -224,12 +439,19 @@
 
 - type: marking
   id: ArachnidTorsoArrows
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: arrows
+  # WD EDIT START
+    state: arrows_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: arrows_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -237,12 +459,19 @@
 
 - type: marking
   id: ArachnidTorsoCore
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: core
+  # WD EDIT START
+    state: core_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: core_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -250,12 +479,19 @@
 
 - type: marking
   id: ArachnidTorsoFiddleback
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: fiddleback
+  # WD EDIT START
+    state: fiddleback_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: fiddleback_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -263,12 +499,19 @@
 
 - type: marking
   id: ArachnidTorsoSkull
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
-    state: skull
+  # WD EDIT START
+    state: skull_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/chest.rsi
+    state: skull_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -276,12 +519,15 @@
 
 - type: marking
   id: ArachnidTorsoTarget
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/chest.rsi
     state: target
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -290,12 +536,15 @@
 # Arms
 - type: marking
   id: ArachnidRArmStripes
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/arms.rsi
     state: stripes_right
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -303,12 +552,15 @@
 
 - type: marking
   id: ArachnidLArmStripes
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Arachnid, Arachne]
   sprites:
   - sprite: Mobs/Customization/Arachnid/arms.rsi
     state: stripes_left
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -317,12 +569,15 @@
 # Legs
 - type: marking
   id: ArachnidRLegStripes
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/legs.rsi
     state: stripes_right
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -330,12 +585,15 @@
 
 - type: marking
   id: ArachnidLLegStripes
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/legs.rsi
     state: stripes_left
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+  # WD EDIT END
   coloring:
     default:
       type:
@@ -344,10 +602,41 @@
 # Overlay
 - type: marking
   id: ArachnidOverlayFuzzy
-  bodyPart: Chest
   markingCategory: Overlay
   forcedColoring: true
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: Mobs/Customization/Arachnid/overlay.rsi
-    state: fuzzy
+    state: fuzzy_chest
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy_head
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy_l_arm
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy_l_hand
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy_l_leg
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy_r_arm
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy_r_hand
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+  - sprite: Mobs/Customization/Arachnid/overlay.rsi
+    state: fuzzy_r_leg
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
index de88a17fd77..d902607e93b 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: CatEars
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human]
   coloring:
@@ -18,12 +17,19 @@
   sprites:
   - sprite: Mobs/Customization/cat_parts.rsi
     state: ears_cat_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/cat_parts.rsi
     state: ears_cat_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: CatTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human]
   coloring:
@@ -38,3 +44,8 @@
   sprites:
   - sprite: Mobs/Customization/cat_parts.rsi
     state: tail_cat
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml
index 569fb5f2b8c..784cec39bf6 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/diona.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: DionaThornsHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -11,10 +10,14 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: thorns_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
-  id: DionaThornsBody
-  bodyPart: Chest
+  id: DionaThornsChest
   markingCategory: Chest
   speciesRestriction: [Diona]
   coloring:
@@ -24,11 +27,28 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/diona.rsi
-    state: thorns_body
+    state: thorns_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: DionaThornsGroin
+  markingCategory: Groin
+  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/diona.rsi
+    state: thorns_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: DionaFlowersHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -39,10 +59,14 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: flowers_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
-  id: DionaFlowersBody
-  bodyPart: Chest
+  id: DionaFlowersChest
   markingCategory: Chest
   speciesRestriction: [Diona]
   coloring:
@@ -52,11 +76,27 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/diona.rsi
-    state: flowers_body
+    state: flowers_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
 
 - type: marking
-  id: DionaLeafCover
-  bodyPart: Chest
+  id: DionaFlowersGroin
+  markingCategory: Groin
+  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/diona.rsi
+    state: flowers_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+
+- type: marking
+  id: DionaLeafCoverChest
   markingCategory: Chest
   speciesRestriction: [Diona]
   coloring:
@@ -65,11 +105,27 @@
         !type:SkinColoring
   sprites:
   - sprite: Mobs/Customization/diona.rsi
-    state: leaf_cover
+    state: leaf_cover_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: DionaLeafCoverGroin
+  markingCategory: Groin
+  speciesRestriction: [Diona]
+  coloring:
+    default:
+      type:
+        !type:SkinColoring
+  sprites:
+  - sprite: Mobs/Customization/diona.rsi
+    state: leaf_cover_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: DionaBloomHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -80,10 +136,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: bloom
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaBracketHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -94,10 +153,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: bracket
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaBrushHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -107,10 +169,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: brush
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaCornflowerHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -121,10 +186,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: cornflower
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaFicusHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -135,10 +203,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: ficus
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaGarlandHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -149,10 +220,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: garland
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaKingHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -163,10 +237,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: king
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaLaurelHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -177,10 +254,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: laurel
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaLeafyHeadTop
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   coloring:
@@ -191,10 +271,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: leafy
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaLotusHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -205,10 +288,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: lotus
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaMeadowHeadTop
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   coloring:
@@ -219,10 +305,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: meadow
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaOakHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -233,10 +322,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: oak
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaPalmHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -247,10 +339,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: palm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaRootHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -261,10 +356,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: root
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaRoseHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -275,10 +373,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: rose
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaRoseyHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -289,10 +390,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: rosey
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaShrubHeadTop
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   coloring:
@@ -303,10 +407,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: shrub
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaSpinnerHeadSide
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Diona]
   coloring:
@@ -317,10 +424,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: spinner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaSproutHeadSide
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Diona]
   coloring:
@@ -331,10 +441,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: sprout
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaVineHeadTop
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   coloring:
@@ -345,10 +458,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: vine
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaVinelHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -359,10 +475,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: vinel
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaVinesHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -373,10 +492,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: vines
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaWildflowerHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -387,10 +509,13 @@
   sprites:
   - sprite: Mobs/Customization/diona.rsi
     state: wildflower
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaVineOverlay
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Diona]
   coloring:
@@ -400,4 +525,48 @@
         color: "#5f7039"
   sprites:
   - sprite: Mobs/Customization/diona.rsi
-    state: overlay
+    state: overlay_chest
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_head
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_l_arm
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_l_foot
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_l_hand
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_l_leg
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_r_arm
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_r_foot
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_r_hand
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+  - sprite: Mobs/Customization/diona.rsi
+    state: overlay_r_leg
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml
index 0eb4d207a96..f4b3b8e445e 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: EarringsStudLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -12,10 +11,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: stud_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsStudRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -27,10 +29,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: stud_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsHeavyLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -42,10 +47,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: heavy_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsHeavyRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -57,10 +65,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: heavy_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDropBasicLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -72,10 +83,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDropBasicRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -87,10 +101,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDropColoredLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -102,12 +119,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_colored_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_colored_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDropColoredRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -119,12 +143,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_colored_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_colored_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDropLongLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -136,12 +167,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_long_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_long_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDropLongRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -153,12 +191,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_long_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: drop_long_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrescentLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -170,10 +215,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: crescent_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrescentRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -185,10 +233,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: crescent_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsBangleLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -200,10 +251,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: bangle_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsBangleRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -215,10 +269,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: bangle_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsHoopBasicLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -230,10 +287,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: hoop_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsHoopBasicRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -245,10 +305,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: hoop_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsHoopMiniLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -260,10 +323,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: hoop_mini_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsHoopMiniRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -275,10 +341,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: hoop_mini_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrossBasicLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -290,10 +359,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: cross_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrossBasicRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -305,10 +377,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: cross_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrossSaintPeterLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -320,10 +395,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: cross_saint_peter_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrossSaintPeterRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -335,10 +413,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: cross_saint_peter_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsGemstoneBasicLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -350,12 +431,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsGemstoneBasicRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -367,12 +455,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsGemstoneLongLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -384,12 +479,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_long_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_long_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsGemstoneLongRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -401,12 +503,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_long_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_long_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsGemstoneDoubleLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -418,14 +527,25 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_double_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_double_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_double_tone_3_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsGemstoneDoubleRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -437,14 +557,25 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_double_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_double_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: gemstone_double_tone_3_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDangleBasicLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -456,12 +587,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDangleBasicRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -473,12 +611,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDangleLongLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -490,12 +635,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_long_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_long_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsDangleLongRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -507,12 +659,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_long_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: dangle_long_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsEightLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -524,10 +683,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: eight_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsEightRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -539,10 +701,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: eight_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrystalBasicLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -554,12 +719,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrystalBasicRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -571,12 +743,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrystalLongLeft
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -588,12 +767,19 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_long_tone_1_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_long_tone_2_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EarringsCrystalLongRight
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Moth, Vox, Rodentia, Shadowkin, Plasmaman, Chitinid, Tajaran]
   invertSpeciesRestriction: true
@@ -605,5 +791,13 @@
   sprites:
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_long_tone_1_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/earrings.rsi
     state: crystal_long_tone_2_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml
index b5ae0fe1117..c51c24f064d 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: FaceBindi
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran, Tajaran]
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: bindi
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceFullblush
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -25,10 +27,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: fullblush
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceCheekspotRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -39,10 +44,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: cheekspot_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceCheekspotLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -53,10 +61,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: cheekspot_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceChesireRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -67,10 +78,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: chesire_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceChesireLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -81,10 +95,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: chesire_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceCrowRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -95,10 +112,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: crow_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceCrowLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -109,10 +129,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: crow_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEarRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -123,10 +146,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: ear_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEarLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -137,10 +163,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: ear_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEyebrowRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -151,11 +180,14 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyebrow_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 
 - type: marking
   id: FaceEyebrowLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -166,11 +198,14 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyebrow_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 
 - type: marking
   id: FaceEyebrows
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -181,10 +216,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyebrows
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEyecornerRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -195,10 +233,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyecorner_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEyecornerLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -209,10 +250,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyecorner_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEyelashRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -223,10 +267,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyelash_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEyelashLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -237,10 +284,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyelash_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceEyestripe
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -251,10 +301,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: eyestripe
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceLipcornerRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -265,10 +318,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: lipcorner_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceLipcornerLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -279,10 +335,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: lipcorner_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceGlabella
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -293,10 +352,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: glabella
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceLowercheekRight
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -307,10 +369,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: lowercheek_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceLowercheekLeft
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -321,10 +386,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: lowercheek_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceNosetape
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -335,10 +403,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: nosetape
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceNosetip
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -349,11 +420,14 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: nosetip
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 
 - type: marking
   id: FaceNosestripe
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -364,10 +438,13 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: nosestripe
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceUnibrow
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   coloring:
@@ -378,50 +455,65 @@
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: unibrow
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceNeckSlim
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: neck_f
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceNeckWide
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: neck_m
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceNeckSlimThick
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: neck_thick_f
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FaceNeckWideThick
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/face.rsi
     state: neck_thick_m
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: IronJaw
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran]
   coloring:
@@ -432,3 +524,7 @@
   sprites:
   - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
     state: iron_jaw
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
index aa1caadb63c..26a00fc96c5 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: GauzeLefteyePatch
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lefteye_2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeLefteyePad
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -25,10 +27,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lefteye_1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeRighteyePatch
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -39,10 +44,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_righteye_2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeRighteyePad
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -53,10 +61,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_righteye_1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeBlindfold
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Harpy, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -67,10 +78,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_blindfold
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeShoulder
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -80,11 +94,18 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_shoulder
+  # WD EDIT START
+    state: gauze_shoulder_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_shoulder_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: GauzeStomach
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -95,10 +116,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_abdomen
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: GauzeUpperArmRight
-  bodyPart: RArm
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -109,10 +133,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_upperarm_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: GauzeLowerArmRight
-  bodyPart: RArm, RHand
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -123,10 +150,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lowerarm_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: GauzeLeftArm
-  bodyPart: LArm, LHand
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -137,10 +167,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: GauzeLowerLegLeft
-  bodyPart: LFoot
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -151,10 +184,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lowerleg_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: GauzeUpperLegLeft
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -165,10 +201,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_upperleg_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: GauzeUpperLegRight
-  bodyPart: RLeg
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -179,10 +218,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_upperleg_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: GauzeLowerLegRight
-  bodyPart: RFoot
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -193,10 +235,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lowerleg_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: GauzeBoxerWrapRight
-  bodyPart: RHand
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -207,10 +252,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_boxerwrap_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: GauzeBoxerWrapLeft
-  bodyPart: LHand
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin; Einstein Engines - Tajaran
   coloring:
@@ -221,10 +269,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_boxerwrap_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: GauzeHead
-  bodyPart: Head
   markingCategory: Overlay
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne, Lamia, IPC, Thaven] # Delta V - Felinid, Oni, Vulpkanin # EE - Arachne, Lamia
   coloring:
@@ -235,11 +286,14 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 # Lizard Specific Markings
 - type: marking
   id: GauzeLizardLefteyePatch
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
@@ -250,10 +304,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lizard_lefteye
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeLizardRighteyePatch
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
@@ -264,10 +321,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lizard_righteye
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeLizardFootRight
-  bodyPart: RFoot
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
@@ -278,10 +338,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lizard_foot_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: GauzeLizardFootLeft
-  bodyPart: LFoot
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
@@ -292,10 +355,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lizard_foot_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: GauzeLizardBlindfold
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
@@ -306,11 +372,14 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_lizard_blindfold
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 # Moth Specific Markings
 - type: marking
   id: GauzeMothBlindfold
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -321,10 +390,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_blindfold
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothShoulder
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -334,11 +406,20 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
-    state: gauze_moth_shoulder
+    state: gauze_moth_shoulder_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
+  - sprite: Mobs/Customization/gauze.rsi
+    state: gauze_moth_shoulder_groin
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothStomach
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -349,10 +430,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_abdomen
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothLeftEyePatch
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -363,10 +447,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_lefteye_2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothLeftEyePad
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -377,10 +464,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_lefteye_1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothRightEyePatch
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -391,10 +481,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_righteye_2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothRightEyePad
-  bodyPart: Eyes
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -405,10 +498,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_righteye_1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothUpperArmRight
-  bodyPart: RArm
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -419,10 +515,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_upperarm_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothUpperArmLeft
-  bodyPart: LArm
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -433,10 +532,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_upperarm_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothUpperLegRight
-  bodyPart: RLeg
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -447,10 +549,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_upperleg_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothUpperLegLeft
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -461,10 +566,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_upperleg_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothLowerLegRight
-  bodyPart: RFoot
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -475,10 +583,13 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_lowerleg_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: GauzeMothLowerLegLeft
-  bodyPart: LFoot
   markingCategory: Overlay
   speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid
   coloring:
@@ -489,3 +600,7 @@
   sprites:
   - sprite: Mobs/Customization/gauze.rsi
     state: gauze_moth_lowerleg_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
index 64feb0de93a..1efc1c7d6e4 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
@@ -3,7 +3,6 @@
 # Ears Markings
 - type: marking
   id: HarpyWingDefaultHuescale
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -17,10 +16,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: huescale_harpy
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingDefaultWhitescale
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -34,10 +36,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: whitescale_harpy
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingClassic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -51,10 +56,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: classic_harpy
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingFoldedHuescale
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -68,10 +76,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: huescale_harpy_folded
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingFoldedWhitescale
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -85,10 +96,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: whitescale_harpy_folded
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingOwlHuescale
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -102,10 +116,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: huescale_harpy_wing_owl
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingOwlWhitescale
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -119,10 +136,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: whitescale_harpy_wing_owl
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyEarsDefault
-  bodyPart: Head
   markingCategory: HeadTop
   speciesRestriction: [Harpy]
   coloring:
@@ -136,10 +156,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
       state: harpy_ears_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HarpyEarsLarge
-  bodyPart: Head
   markingCategory: HeadTop
   speciesRestriction: [Harpy]
   coloring:
@@ -153,27 +176,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_ears.rsi
       state: harpy_ears_large
-
-- type: marking
-  id: HarpyTailPhoenix
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Harpy]
-  coloring:
-    default:
-      type:
-        !type:CategoryColoring
-          category: Hair
-      fallbackTypes:
-        - !type:SimpleColoring
-          color: "#964b00"
-  sprites:
-    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
-      state: phoenix_tail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailRooster
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -186,10 +195,14 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: rooster_tail
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailForkedWhitescale
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -202,10 +215,14 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: whitescale_forked_tailfin
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailForkedHuescale
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -218,10 +235,14 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: huescale_forked_tailfin
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailFinch
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -234,10 +255,14 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails36x36.rsi
       state: finch_tail
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailPeacock
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -250,12 +275,20 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
       state: peacock_tail_feathers
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
       state: peacock_tail_eyes
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailHaven
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -268,12 +301,20 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: haven_tone_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: haven_tone_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailForkedLong
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -286,10 +327,14 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: forked_long
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
 
 - type: marking
   id: HarpyTailSwallow
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Harpy]
   coloring:
@@ -302,91 +347,147 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
       state: swallow_tail
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailHarpy
+      # WD EDIT END
 
 - type: marking
   id: HarpyWing2ToneClassic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_2tone_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_2tone_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWing3ToneClassic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_3tone_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_3tone_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_3tone_3
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingSpeckledClassic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_speckled_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_speckled_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingUndertoneClassic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_undertone_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_undertone_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingTipsClassic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_wingtip_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_wingtip_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingBat
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: bat_wings_tone_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: bat_wings_tone_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyWingBionic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
-  shaders:
-    bionic_wings_tone_2: unshaded
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: bionic_wings_tone_1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: bionic_wings_tone_2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      shader: unshaded
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyChestDefault
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Harpy]
   coloring:
@@ -400,12 +501,19 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: upper
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Chest
+      bodyPart: Chest
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_chest.rsi
       state: lower
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Groin
+      bodyPart: Groin
+      # WD EDIT END
 
 - type: marking
   id: HarpyLegsDefault
-  bodyPart: LLeg
   markingCategory: RightLeg
   speciesRestriction: [Harpy]
   coloring:
@@ -419,10 +527,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: thighs
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: HarpyFeetDefault
-  bodyPart: RFoot
   markingCategory: RightLeg
   speciesRestriction: [Harpy]
   coloring:
@@ -433,5 +544,13 @@
   sprites:
     - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: feet
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: RightFoot
+      # WD EDIT END
     - sprite: Mobs/Customization/Harpy/harpy_legs.rsi
       state: talons
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: RightFoot
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_facial_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_facial_hair.yml
index 1b4175ed540..b6616ce2123 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_facial_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_facial_hair.yml
@@ -1,245 +1,350 @@
 - type: marking
   id: HumanFacialHairAbe
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: abe
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairBrokenman
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: brokenman
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairChin
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: chin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairDwarf
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: dwarf
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairFullbeard
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: fullbeard
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairCroppedfullbeard
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: croppedfullbeard
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairGt
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: gt
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairHip
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: hip
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairJensen
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: jensen
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairNeckbeard
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: neckbeard
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairWise
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: wise
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairMuttonmus
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: muttonmus
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairMartialartist
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: martialartist
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairChinlessbeard
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: chinlessbeard
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairMoonshiner
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: moonshiner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairLongbeard
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: longbeard
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairVolaju
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: volaju
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHair3oclock
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: 3oclock
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairFiveoclock
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: fiveoclock
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHair5oclockmoustache
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: 5oclockmoustache
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHair7oclock
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: 7oclock
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHair7oclockmoustache
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: 7oclockmoustache
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairMoustache
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: moustache
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairPencilstache
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: pencilstache
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairSmallstache
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: smallstache
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairWalrus
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: walrus
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairFumanchu
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: fumanchu
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairHogan
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: hogan
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairSelleck
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: selleck
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairChaplin
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: chaplin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairVandyke
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: vandyke
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairWatson
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: watson
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairElvis
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: elvis
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairMutton
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: mutton
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairSideburn
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: Mobs/Customization/human_facial_hair.rsi
       state: sideburn
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index af0674eb766..6501e51edab 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1,1386 +1,1980 @@
 - type: marking
   id: HumanHairAfro
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: afro
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairAfro2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: afro2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBigafro
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bigafro
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairAntenna
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: antenna
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBalding
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: e
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBedhead
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBedheadv2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedheadv2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBedheadv3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedheadv3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPulato
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: pulato
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongBedhead
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long_bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongBedhead2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long_bedhead2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairFloorlengthBedhead
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: floorlength_bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBeehive
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: beehive
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBeehivev2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: beehivev2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBob
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bob
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBob2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bob2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBobcut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bobcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBob4
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bob4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBob5
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bob5
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBobcurl
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bobcurl
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBoddicker
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: boddicker
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBowlcut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bowlcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBowlcut2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bowlcut2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: braid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBraided
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: braided
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBraidfront
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: braidfront
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBraid2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: braid2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHbraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: hbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShortbraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shortbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBraidtail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: braidtail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBunhead2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bunhead2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBun3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bun3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLargebun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: largebun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairManbun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: manbun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTightbun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: tightbun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBusiness
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: business
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBusiness2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: business2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBusiness3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: business3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBusiness4
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: business4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBuzzcut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: buzzcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCia
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cia
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicAfro
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classicafro
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicBigAfro
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classicbigafro
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicBusiness
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classicbusiness
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicCia
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classiccia
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicCornrows2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classiccornrows2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicFloorlengthBedhead
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classicfloorlength_bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicModern
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classicmodern
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicMulder
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classicmulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicWisp
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classicwisp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCoffeehouse
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: coffeehouse
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCombover
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: combover
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCornrows
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cornrows
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCornrows2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cornrows2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCornrowbun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cornrowbun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCornrowbraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cornrowbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCornrowtail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cornrowtail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCrewcut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: crewcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCrewcut2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: crewcut2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCurls
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: curls
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairC
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: c
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairDandypompadour
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: dandypompadour
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairDevilock
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: devilock
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairDoublebun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: doublebun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairDoublebunLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: Mobs/Customization/human_hair.rsi
     state: doublebun_long
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairDreads
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: dreads
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairDrillruru
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: drillruru
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairDrillhairextended
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: drillhairextended
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairEmo
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: emo
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairEmofringe
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: emofringe
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairNofade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: nofade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHighfade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: highfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairMedfade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: medfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLowfade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: lowfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBaldfade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: baldfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairFeather
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: feather
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairFather
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: father
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSargeant
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: sargeant
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairFlair
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: flair
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBigflattop
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bigflattop
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairFlow
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: f
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairGelled
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: gelled
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairGentle
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: gentle
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHalfbang
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: halfbang
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHalfbang2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: halfbang2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHalfshaved
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: halfshaved
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHedgehog
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: hedgehog
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHimecut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: himecut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHimecut2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: himecut2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShorthime
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shorthime
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHimeup
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: himeup
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHitop
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: hitop
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairJade
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: jade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairJensen
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: jensen
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairJoestar
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: joestar
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairKeanu
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: keanu
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairKusanagi
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: kusanagi
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLong2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLong3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongWithBundles
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longbundled
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongovereye
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longovereye
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLbangs
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: lbangs
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongemo
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longemo
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongfringe
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longfringe
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongsidepart
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longsidepart
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairMegaeyebrows
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: megaeyebrows
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairMessy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: messy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairModern
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: modern
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairMohawk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: d
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairNitori
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: nitori
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairReversemohawk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: reversemohawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairUnshavenMohawk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: unshaven_mohawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairMulder
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: mulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairOdango
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: odango
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairOmbre
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ombre
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairOneshoulder
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: oneshoulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShortovereye
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shortovereye
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairOxton
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: oxton
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairParted
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: parted
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPart
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: part
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairKagami
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: kagami
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPigtails
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: pigtails
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPigtails2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: pigtails2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPixie
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: pixie
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPompadour
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: pompadour
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairBigpompadour
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bigpompadour
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPonytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPonytail2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ponytail2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPonytail3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ponytail3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPonytail4
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ponytail4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPonytail5
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ponytail5
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPonytail6
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ponytail6
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPonytail7
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ponytail7
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairHighponytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: highponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairStail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: stail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongstraightponytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longstraightponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairCountry
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: country
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairFringetail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: fringetail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSidetail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: sidetail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSidetail2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: sidetail2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSidetail3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: sidetail3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSidetail4
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: sidetail4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSpikyponytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: spikyponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairPoofy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: poofy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairQuiff
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: quiff
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairRonin
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: ronin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShaved
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shaved
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShavedpart
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shavedpart
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShortbangs
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shortbangs
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairA
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: a
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShorthair2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shorthair2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShorthair3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shorthair3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairD
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: d
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairE
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: e
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairF
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: f
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShorthairg
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shorthairg
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHair80s
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: 80s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairRosa
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: rosa
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairB
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: b
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSidecut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: sidecut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSkinhead
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: skinhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairProtagonist
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: protagonist
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSpikey
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: spikey
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSpiky
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: spiky
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSpiky2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: spiky2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSpookyLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: spookylong
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSwept
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: swept
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairSwept2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: swept2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShoulderLengthOverEye
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shoulderlengthovereye
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairThinning
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: thinning
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairThinningfront
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: thinningfront
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairThinningrear
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: thinningrear
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTopknot
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: topknot
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTressshoulder
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: tressshoulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTrimmed
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: trimmed
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTrimflat
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: trimflat
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTwintail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: twintail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTwoStrands
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: twostrands
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairUndercut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: undercut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairUndercutleft
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: undercutleft
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairUndercutright
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: undercutright
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairUnkept
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: unkept
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairUpdo
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: updo
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairVlong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: vlong
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongest
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longest
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongest2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longest2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairVeryshortovereyealternate
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: veryshortovereyealternate
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairVlongfringe
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: vlongfringe
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairVolaju
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: volaju
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairWisp
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: wisp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairUneven
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: uneven
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairTailed
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: tailed
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicLong2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classiclong2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairClassicLong3
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classiclong3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairShaped
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: shaped
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairLongBow
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: longbow
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
index 1319e4f539e..276d904d9f2 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: HumanNoseSchnozz
-  bodyPart: Snout
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
@@ -8,10 +7,13 @@
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: schnozz
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HumanNoseNubby
-  bodyPart: Snout
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
@@ -19,10 +21,13 @@
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: nubby
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HumanNoseDroop
-  bodyPart: Snout
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
@@ -30,10 +35,13 @@
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: droop
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HumanNoseBlob
-  bodyPart: Snout
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
@@ -41,10 +49,13 @@
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: blob
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HumanNoseUppie
-  bodyPart: Snout
   markingCategory: Snout
   followSkinColor: true
   forcedColoring: true
@@ -52,3 +63,7 @@
   sprites:
   - sprite: Mobs/Customization/human_noses.rsi
     state: uppie
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml
index 69d9aedb4c4..a82db3a6b9a 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_ears.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: BullishHorns
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   coloring:
@@ -13,10 +12,13 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: bullishhorns
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: BunnyEars
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC]
   coloring:
@@ -34,12 +36,19 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: bunnyearstone1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: bunnyearstone2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: BunnyEarsAlt
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC]
   coloring:
@@ -52,10 +61,13 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: bunnyearsalt
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FoxEars
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC]
   coloring:
@@ -68,10 +80,13 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: foxears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GoatHorns
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC]
   coloring:
@@ -89,5 +104,13 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: goathornstone1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/kemonomimi-ears.rsi
     state: goathornstone2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml
index 2bef4e93f2c..a743ac01cdf 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: BunnyTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -15,10 +14,14 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: bunnytail
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: BunnyTailAlt
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -33,10 +36,14 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: bunnytailalt
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: DobleFur
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -51,12 +58,20 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: doblefurtailtone1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: doblefurtailtone2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: FluffyTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -71,10 +86,14 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: fluffytail
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: FoxNineTails
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -89,12 +108,20 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: foxninetailstone1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END`
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: foxninetailstone2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: FoxThreeTails
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -109,12 +136,20 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: foxthreetailstone1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: foxthreetailstone2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: HorseTailCulty
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -129,10 +164,14 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: horsetailculty
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: HorseTailLong
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -147,10 +186,14 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: horsetaillong
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: SharkTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -165,10 +208,14 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: sharktail
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: TasselTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   coloring:
@@ -183,5 +230,14 @@
   sprites:
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: tasseltailtone1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: Mobs/Customization/kemonomimi-tails.rsi
     state: tasseltailtone2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
index b6b3f803a64..d4b4e3c405e 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: MakeupLips
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Harpy
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: Mobs/Customization/makeup.rsi
     state: lips
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MakeupBlush
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Vulpkanin, Harpy
   coloring:
@@ -25,10 +27,13 @@
   sprites:
   - sprite: Mobs/Customization/makeup.rsi
     state: blush
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MakeupNailPolishRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
@@ -39,10 +44,13 @@
   sprites:
   - sprite: Mobs/Customization/makeup.rsi
     state: nail_polish_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: MakeupNailPolishLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Vulpkanin
   coloring:
@@ -53,12 +61,15 @@
   sprites:
   - sprite: Mobs/Customization/makeup.rsi
     state: nail_polish_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 # Moth-specific
 
 - type: marking
   id: MakeupMothLips
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Moth]
   coloring:
@@ -69,10 +80,13 @@
   sprites:
   - sprite: Mobs/Customization/makeup.rsi
     state: moth_lips
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MakeupMothBlush
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Moth]
   coloring:
@@ -83,3 +97,7 @@
   sprites:
   - sprite: Mobs/Customization/makeup.rsi
     state: moth_blush
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
index 1428092baa1..d22014a21de 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/moth.yml
@@ -1,1122 +1,1670 @@
 # Antennas
 - type: marking
   id: MothAntennasDefault
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: default
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasCharred
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: charred
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasDbushy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: dbushy
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasDcurvy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: dcurvy
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasDfan
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: dfan
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasDpointy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: dpointy
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasFeathery
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: feathery
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasFirewatch
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: firewatch
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasGray
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: gray
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasJungle
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: jungle
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasMoffra
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: moffra
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasOakworm
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: oakworm
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasPlasmafire
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: plasmafire
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasMaple
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: maple
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasRoyal
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: royal
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasStriped
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: striped
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasWhitefly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: whitefly
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasWitchwing
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: witchwing
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasUnderwing
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: underwing_primary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_antennas.rsi
     state: underwing_secondary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 # Wings
 - type: marking
   id: MothWingsDefault
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: default
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsCharred
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: charred
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsDbushy
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: dbushy_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: dbushy_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothWingsDeathhead
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: deathhead_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: deathhead_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothWingsFan
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: fan
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsDfan
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: dfan
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsFeathery
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: feathery
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsFirewatch
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: firewatch_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: firewatch_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothWingsGothic
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: gothic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsJungle
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: jungle
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsLadybug
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: ladybug
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsMaple
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: maple
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsMoffra
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: moffra_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: moffra_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothWingsOakworm
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: oakworm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsPlasmafire
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: plasmafire_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: plasmafire_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothWingsPointy
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: pointy
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsRoyal
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: royal_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: royal_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothWingsStellar
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: stellar
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsStriped
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: striped
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsSwirly
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: swirly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsWhitefly
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: whitefly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsWitchwing
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: witchwing
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsUnderwing
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: underwing_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: Mobs/Customization/Moth/moth_wings.rsi
     state: underwing_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 # Body markings:
 # Charred
 - type: marking
   id: MothChestCharred
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: charred_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinCharred
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: charred_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadCharred
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: charred_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegCharred
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: charred_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegCharred
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: charred_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmCharred
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: charred_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmCharred
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: charred_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Death's-Head
 - type: marking
   id: MothChestDeathhead
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: deathhead_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinDeathhead
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: deathhead_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadDeathhead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: deathhead_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegDeathhead
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: deathhead_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegDeathhead
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: deathhead_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmDeathhead
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: deathhead_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmDeathhead
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: deathhead_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Fan
 - type: marking
   id: MothChestFan
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: fan_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinFan
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: fan_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadFan
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: fan_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegFan
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: fan_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegFan
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: fan_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmFan
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: fan_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmFan
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: fan_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Firewatch
 - type: marking
   id: MothChestFirewatch
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: firewatch_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinFirewatch
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: firewatch_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadFirewatch
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: firewatch_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegFirewatch
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: firewatch_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegFirewatch
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: firewatch_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmFirewatch
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: firewatch_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmFirewatch
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: firewatch_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Gothic
 - type: marking
   id: MothChestGothic
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: gothic_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinGothic
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: gothic_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadGothic
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: gothic_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegGothic
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: gothic_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegGothic
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: gothic_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmGothic
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: gothic_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmGothic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: gothic_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Jungle
 - type: marking
   id: MothChestJungle
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: jungle_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinJungle
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: jungle_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadJungle
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: jungle_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegJungle
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: jungle_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegJungle
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: jungle_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmJungle
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: jungle_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmJungle
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: jungle_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Moonfly
 - type: marking
   id: MothChestMoonfly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: moonfly_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinMoonfly
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: moonfly_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadMoonfly
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: moonfly_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegMoonfly
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: moonfly_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegMoonfly
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: moonfly_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmMoonfly
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: moonfly_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmMoonfly
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: moonfly_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Oak Worm
 - type: marking
   id: MothChestOakworm
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: oakworm_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinOakworm
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: oakworm_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadOakworm
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: oakworm_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegOakworm
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: oakworm_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegOakworm
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: oakworm_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmOakworm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: oakworm_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmOakworm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: oakworm_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Pointy
 - type: marking
   id: MothChestPointy
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: pointy_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinPointy
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: pointy_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadPointy
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: pointy_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegPointy
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: pointy_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegPointy
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: pointy_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmPointy
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: pointy_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmPointy
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: pointy_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Ragged
 - type: marking
   id: MothChestRagged
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: ragged_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinRagged
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: ragged_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadRagged
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: ragged_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegRagged
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: ragged_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegRagged
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: ragged_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmRagged
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: ragged_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmRagged
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: ragged_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Royal
 - type: marking
   id: MothChestRoyal
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: royal_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinRoyal
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: royal_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadRoyal
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: royal_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegRoyal
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: royal_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegRoyal
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: royal_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmRoyal
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: royal_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmRoyal
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: royal_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # White Fly
 - type: marking
   id: MothChestWhitefly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: whitefly_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinWhitefly
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: whitefly_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadWhitefly
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: whitefly_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegWhitefly
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: whitefly_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegWhitefly
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: whitefly_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmWhitefly
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: whitefly_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmWhitefly
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: whitefly_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Witch Wing
 - type: marking
   id: MothChestWitchwing
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: witchwing_chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinWitchwing
+  markingCategory: Groin
+  speciesRestriction: [Moth]
+  sprites:
+  - sprite: Mobs/Customization/Moth/moth_parts.rsi
+    state: witchwing_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothHeadWitchwing
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: witchwing_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothLLegWitchwing
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: witchwing_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegWitchwing
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: witchwing_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothLArmWitchwing
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: witchwing_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmWitchwing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: Mobs/Customization/Moth/moth_parts.rsi
     state: witchwing_r_arm
-    
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
+
 # Marking for Chitinid Merger reasons
 
 - type: marking
   id: MothRegularSnout
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/bodyparts.rsi
-    state: mothhead
\ No newline at end of file
+    state: mothhead
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml
index 552b6322cdf..e279b7c9da5 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: OniTwoToedFeet
-  bodyPart: RFoot # Can't be LFoot to avoid visual glitches
   markingCategory: RightFoot
   speciesRestriction: [Oni]
   coloring:
@@ -10,4 +9,12 @@
           color: "#454545"
   sprites:
   - sprite: Mobs/Customization/oni_feet.rsi
-    state: two_toes
+  # WD EDIT START
+    state: two_toes_r_foot
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+  - sprite: Mobs/Customization/oni_feet.rsi
+    state: two_toes_l_foot
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml
index 88d4ee493db..d0f31ea6d91 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml
@@ -1,525 +1,837 @@
 - type: marking
   id: OniHornTallCurved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_curved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: OniHornTallCurved3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_curved_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_curved_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_curved_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: OniHornTallBull
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_bull
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: OniHornTallBull3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_bull_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_bull_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: tall_bull_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: OniHornCrowned
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: crowned
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornSerket
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: serket
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornSerket3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: serket_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: serket_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: serket_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornPisces
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: pisces
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornPisces2Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: pisces_2tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: pisces_2tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornPisces3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: pisces_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: pisces_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: pisces_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornVirgo
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: virgo
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornVirgo3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: virgo_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: virgo_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: virgo_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornSagittarius
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: sagittarius
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornSagittarius3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: sagittarius_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: sagittarius_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: sagittarius_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornVantas
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: vantas
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornVantas3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: vantas_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: vantas_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: vantas_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornMakara
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: makara
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornMakara2Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: makara_2tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: makara_2tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornMakara3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: makara_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: makara_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi
     state: makara_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornNepeta
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: nepeta
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornNepeta3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: nepeta_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: nepeta_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: nepeta_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornTaurus
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: taurus
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornTaurus2Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: taurus_2tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: taurus_2tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornTaurus3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: taurus_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: taurus_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: taurus_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornAries
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: aries
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornAries3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: aries_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: aries_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: aries_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornTavris
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: tavris
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornTavris3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: tavris_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: tavris_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: tavris_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornInclined
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: inclined
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornInclined3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: inclined_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: inclined_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: inclined_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornWavy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: wavy
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornWavy2Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: wavy_2tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: wavy_2tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornWavy3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: wavy_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: wavy_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: wavy_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornAntlers
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: antlers_2tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: antlers_2tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornAntlers3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: antlers_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: antlers_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: antlers_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornUnicorn
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: unicorn
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornErebia
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: erebia
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornErebia3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: erebia_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: erebia_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: erebia_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornErebiaRings
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: erebia
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: erebia_rings
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleThick
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_thick
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleThick2Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_thick_2tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_thick_2tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleThick3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_thick_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_thick_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_thick_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleCurved3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_curved_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_curved_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_curved_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleCurvedOutwards3Tone
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_curved_outwards_3tone_1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_curved_outwards_3tone_2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/Oni/oni_horns.rsi
     state: double_curved_outwards_3tone_3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml
index a66528a75a4..edafcad3a9b 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml
@@ -1,8 +1,12 @@
 - type: marking
   id: WingsSkeleton
-  bodyPart: Wings
   markingCategory: Wings
   speciesRestriction: [Plasmaman]
   sprites:
     - sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi
       state: skeleton
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Wings
+      bodyPart: Wings
+      replacementBodyPart: BodyPartWingsPlasmaman
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
index 47d6b5499d2..38410be7760 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml
@@ -1,89 +1,116 @@
 - type: marking
   id: PointyEarsStandard
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_standard
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsWide
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_wide
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsSmall
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_small
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsUpwards
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_upwards
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsTall
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_tall
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsSlanted
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_slanted
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsThin
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_thin
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsLarge
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_large
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: PointyEarsNone
-  bodyPart: HeadSide
   markingCategory: HeadSide
   forcedColoring: true
   speciesRestriction: [Oni]
   sprites:
   - sprite: Mobs/Customization/pointy_ears.rsi
     state: pointy_ears_none
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index f490b5a0979..973a7370645 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -1,388 +1,587 @@
 - type: marking
   id: LizardFrillsAquatic
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_aquatic
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardFrillsShort
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_short
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardFrillsSimple
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_simple
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardFrillsDivinity
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_divinity
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardFrillsBig
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_big
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardFrillsAxolotl
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_axolotl
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardFrillsHood
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_hood_primary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_hood_secondary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardFrillsNeckfull
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_neckfull
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsAngler
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_angler
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsCurled
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_curled_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_curled_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsRam
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_ram_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_ram_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsShort
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_short_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_short_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsSimple
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_simple_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_simple_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsDouble
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_double_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_double_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardTailSmooth
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_smooth_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+    # WD EDIT END
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_smooth_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: LizardTailLarge
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_large
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+    # WD EDIT END
 
 - type: marking
   id: LizardTailSpikes
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_spikes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+    # WD EDIT END
 
 - type: marking
   id: LizardTailLTiger
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_ltiger
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+    # WD EDIT END
 
 - type: marking
   id: LizardTailDTiger
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: tail_dtiger
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+    # WD EDIT END
 
 - type: marking
   id: LizardSnoutRound
-  bodyPart: Snout
   markingCategory: Snout
   forcedColoring: true
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: snout_round
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardSnoutSharp
-  bodyPart: Snout
   markingCategory: Snout
   forcedColoring: true
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: snout_sharp
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardSnoutSplotch
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: snout_splotch_primary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: snout_splotch_secondary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardChestTiger
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian, Shadowkin, Lamia]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: body_tiger
+# WD EDIT START
+    state: chest_tiger
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: LizardGroinTiger
+  markingCategory: Groin
+  speciesRestriction: [Reptilian, Shadowkin, Lamia]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: groin_tiger
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: LizardHeadTiger
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: head_tiger
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardLArmTiger
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Reptilian, Lamia]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: l_arm_tiger
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: LizardLLegTiger
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: l_leg_tiger
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LizardRArmTiger
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Reptilian, Lamia]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: r_arm_tiger
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: LizardRLegTiger
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: r_leg_tiger
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsArgali
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_argali_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_argali_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsAyrshire
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_ayrshire_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_ayrshire_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsMyrsore
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_myrsore_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_myrsore_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsBighorn
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Lamia, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, Lamia, IPC]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_bighorn_l
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi # WWDP-Edit
     state: horns_bighorn_r
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsKoboldEars
-  bodyPart: HeadTop
   markingCategory: HeadTop
-  speciesRestriction: [Reptilian, Human, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_kobold_ears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsFloppyKoboldEars
-  bodyPart: HeadSide
   markingCategory: HeadSide
-  speciesRestriction: [Reptilian, Human, Kobold, IPC] # Shitmed Change
+  speciesRestriction: [Reptilian, Human, IPC]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: horns_floppy_kobold_ears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardChestUnderbelly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: body_underbelly
+  # WD EDIT START
+    state: chest_underbelly
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: groin_underbelly
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: LizardChestBackspikes
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian, Lamia]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: body_backspikes
+    # WD EDIT START
+    state: chest_backspikes
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: groin_backspikes
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 # Animated
 - type: marking
   id: LizardTailSmoothAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: Mobs/Customization/reptilian_parts.rsi
       state: tail_smooth_wagging_primary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
     - sprite: Mobs/Customization/reptilian_parts.rsi
       state: tail_smooth_wagging_secondary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: LizardTailSpikesAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: Mobs/Customization/reptilian_parts.rsi
       state: tail_spikes_wagging
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
 
 - type: marking
   id: LizardTailLTigerAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: Mobs/Customization/reptilian_parts.rsi
       state: tail_ltiger_wagging
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
 
 - type: marking
   id: LizardTailDTigerAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
     - sprite: Mobs/Customization/reptilian_parts.rsi
       state: tail_dtiger_wagging
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
index 61186f40663..c0d18b61071 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -1,26 +1,31 @@
 - type: marking
   id: ScarEyeRight
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Harpy; Einstein Engines - Tajaran
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_right
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarEyeLeft
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni, Harpy; Einstein Engines - Tajaran
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_left
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarTopSurgeryShort
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sexRestriction: [Male]
@@ -28,10 +33,13 @@
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_top_surgery_short
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ScarTopSurgeryLong
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid,  Oni, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sexRestriction: [Male]
@@ -39,13 +47,24 @@
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_top_surgery_long
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ScarChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_chest
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml
index f86852a9879..5d22ea98dfa 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml
@@ -2,17 +2,19 @@
 
 - type: marking
   id: EarsShadowkin
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   forcedColoring: true
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadowkinStriped
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -27,57 +29,71 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin_stripes
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 # Tails
 
-- type: marking
-  id: TailShadowkin
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Shadowkin]
-  forcedColoring: true
-  sprites:
-    - sprite: Mobs/Customization/Shadowkin/tails64x32.rsi
-      state: shadowkin
-
 - type: marking
   id: TailShadowkinBig
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   forcedColoring: true
   sprites:
     - sprite: Mobs/Customization/Shadowkin/tails64x32.rsi
       state: shadowkin_big
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
 
 - type: marking
   id: TailShadowkinBigFluff
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   forcedColoring: true
   sprites:
     - sprite: Mobs/Customization/Shadowkin/tails64x32.rsi
       state: shadowkin_big_fluff
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
 
 - type: marking
   id: TailShadowkinShorter
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   forcedColoring: true
   sprites:
     - sprite: Mobs/Customization/Shadowkin/tails32x32.rsi
       state: shadowkin_shorter
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
 
 - type: marking
   id: TailShadowkinMedium
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   forcedColoring: true
   sprites:
     - sprite: Mobs/Customization/Shadowkin/tails32x32.rsi
-      state: shadowkin_medium
\ No newline at end of file
+      state: shadowkin_medium
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
index 0bff2347471..fe22a427140 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
@@ -1,71 +1,95 @@
 - type: marking
   id: SlimeGradientLeftArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: SlimeGradientRightArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: SlimeGradientLeftLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: SlimeGradientRightLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: SlimeGradientLeftFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: SlimeGradientRightFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: SlimeGradientLeftHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_l_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: SlimeGradientRightHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [SlimePerson, Shadowkin]
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
index 01dce0105e7..0aecddb55a6 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: TattooHiveChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -11,10 +10,17 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_hive_chest
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_hive_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: TattooNightlingChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -24,11 +30,18 @@
       fallbackColor: "#666666"
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
-    state: tattoo_nightling
+  # WD EDIT START
+    state: tattoo_nightling_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_nightling_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: TattooNanotrasenChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Dwarf, SlimePerson]
   coloring:
@@ -39,10 +52,17 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_nanotrasen_chest
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/tattoos.rsi
+    state: tattoo_nanotrasen_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: TattooSilverburghLeftLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -53,10 +73,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_silverburgh_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: TattooSilverburghRightLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -67,10 +90,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_silverburgh_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: TattooCampbellLeftArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -81,10 +107,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_campbell_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: TattooCampbellRightArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne, Lamia, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -95,10 +124,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_campbell_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: TattooCampbellLeftLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -109,10 +141,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_campbell_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: TattooCampbellRightLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Tajaran] # Delta V - Felinid, Oni
   coloring:
@@ -123,10 +158,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_campbell_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: TattooEyeRight
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmaman, Tajaran] # Delta V - Felinid, Oni, Harpy
   coloring:
@@ -137,10 +175,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: TattooEyeLeft
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmama, Tajaran] # Delta V - Felinid, Oni, Harpy
   coloring:
@@ -151,10 +192,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: TattooEyeArachneRight
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Arachne]
   coloring:
@@ -165,10 +209,13 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_arachne_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: TattooEyeArachneLeft
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Arachne]
   coloring:
@@ -179,3 +226,7 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_arachne_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml
index 675293798aa..06b4f85bf27 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: GoblinTusksSmall
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Oni]
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: Mobs/Customization/goblin_tusks.rsi
     state: goblin_tusks_small
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: GoblinTusksBig
-  bodyPart: Face
   markingCategory: Face
   speciesRestriction: [Oni]
   coloring:
@@ -25,3 +27,7 @@
   sprites:
   - sprite: Mobs/Customization/goblin_tusks.rsi
     state: goblin_tusks_big
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Face
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undershirt.yml
index 95b7b5ee38a..396c3b76045 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undershirt.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undershirt.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: UndershirtDefault
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: undershirt
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtRolled
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -25,10 +27,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: rolled_undershirt
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtSleeveless
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -39,10 +44,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: sleeveless
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtRolledSleeveless
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -53,10 +61,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: rolled_undershirt_sleeveless
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtGrossSleeveless
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -67,10 +78,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: gross_sleeveless
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtNanotrasen
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -81,10 +95,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: nanotrasen
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtBinder
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -95,10 +112,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: binder
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtBraClassic
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -109,10 +129,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: classic
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtBraSports
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -123,10 +146,13 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: sports
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: UndershirtBraStrapless
-  bodyPart: Undershirt
   markingCategory: Undershirt
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin, Arachne]
   coloring:
@@ -137,3 +163,7 @@
   sprites:
   - sprite: Mobs/Customization/undershirt.rsi
     state: strapless
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Undershirt
+    bodyPart: Chest
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/underwear.yml
index 25afdb89e56..50749297743 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/underwear.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/underwear.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: UnderwearDefault
-  bodyPart: Underwear
   markingCategory: Underwear
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin]
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: Mobs/Customization/underwear.rsi
     state: boxers
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Underwear
+    bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: UnderwearBriefs
-  bodyPart: Underwear
   markingCategory: Underwear
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin]
   coloring:
@@ -25,10 +27,13 @@
   sprites:
   - sprite: Mobs/Customization/underwear.rsi
     state: briefs
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Underwear
+    bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: UnderwearLowriders
-  bodyPart: Underwear
   markingCategory: Underwear
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin]
   coloring:
@@ -39,10 +44,13 @@
   sprites:
   - sprite: Mobs/Customization/underwear.rsi
     state: lowriders
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Underwear
+    bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: UnderwearSatin
-  bodyPart: Underwear
   markingCategory: Underwear
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin]
   coloring:
@@ -53,10 +61,13 @@
   sprites:
   - sprite: Mobs/Customization/underwear.rsi
     state: satin
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Underwear
+    bodyPart: Groin
+    # WD EDIT END
 
 - type: marking
   id: UnderwearTanga
-  bodyPart: Underwear
   markingCategory: Underwear
   speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Harpy, Tajaran, Oni, Felinid, Chitinid, IPC, Vulpkanin, Shadowkin]
   coloring:
@@ -67,3 +78,7 @@
   sprites:
   - sprite: Mobs/Customization/underwear.rsi
     state: tanga
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Underwear
+    bodyPart: Groin
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
index 6ec5f8999a1..34731197bf1 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
@@ -1,44 +1,59 @@
 - type: marking
   id: VoxFacialHairBeard
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
       state: beard_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxFacialHairColonel
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
       state: colonel_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxFacialHairFu
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
       state: fu_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxFacialHairMane
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
       state: mane_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxFacialHairNeck
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
       state: neck_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
index 9a847b40a99..61444c15f15 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -1,197 +1,263 @@
 - type: marking
   id: VoxHairAfro
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: afro_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairBraids
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: braid_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairCrestedQuills
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: crestedquills_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairEmperorQuills
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: emperorquills_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairFlowing
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: flowing_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairHawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: hawk_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairHorns
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: horns_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairKeelQuills
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: keelquills_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairKeetQuills
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: keetquills_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairKingly
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: kingly_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairLongBraid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: afro_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairMange
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: mange_s
-      
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
+
 - type: marking
   id: VoxHairMohawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: mohawk_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairNights
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: nights_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairPony
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: ponytail_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairRazorClipped
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: razor_clipped_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairRazor
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: razor_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairSortBraid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: short_braid_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairShortQuills
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: shortquills_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairSurf
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: surf_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairTielQuills
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: tielquills_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: VoxHairYasu
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: yasu_s
\ No newline at end of file
+      state: yasu_s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
index 96acd068828..fcadbc8e48c 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml
@@ -1,12 +1,15 @@
 - type: marking
   id: VoxBeak
-  bodyPart: Snout
   markingCategory: Snout
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: beak
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -15,13 +18,16 @@
 
 - type: marking
   id: VoxLArmScales
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -30,13 +36,16 @@
 
 - type: marking
   id: VoxLLegScales
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -45,13 +54,16 @@
 
 - type: marking
   id: VoxRArmScales
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -60,13 +72,16 @@
 
 - type: marking
   id: VoxRLegScales
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -75,13 +90,16 @@
 
 - type: marking
   id: VoxRHandScales
-  bodyPart: RHand
   markingCategory: RightHand
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: r_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -90,13 +108,16 @@
 
 - type: marking
   id: VoxLHandScales
-  bodyPart: LHand
   markingCategory: LeftHand
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: l_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -105,13 +126,16 @@
 
 - type: marking
   id: VoxLFootScales
-  bodyPart: LFoot
   markingCategory: LeftFoot
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: l_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
   coloring:
     default:
       type:
@@ -120,26 +144,18 @@
 
 - type: marking
   id: VoxRFootScales
-  bodyPart: RFoot
   markingCategory: RightFoot
   forcedColoring: true
   speciesRestriction: [Vox]
   sprites:
   - sprite: Mobs/Customization/vox_parts.rsi
     state: r_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
   coloring:
     default:
       type:
         !type:SimpleColoring
         color: "#937e3d"
-
-- type: marking
-  id: VoxTail
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Vox]
-  forcedColoring: true
-  sprites:
-  - sprite: Mobs/Customization/vox_parts.rsi
-    # Ideally this should use the normal tail sprite and apply an actual mask over it, not just use a butchered sprite
-    state: tail_stenciled
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
index a802d284f3b..820a3e8d00f 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: TattooVoxHeartLeftArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Vox]
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: Mobs/Customization/vox_tattoos.rsi
     state: heart_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: TattooVoxHeartRightArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Vox]
   coloring:
@@ -25,10 +27,13 @@
   sprites:
   - sprite: Mobs/Customization/vox_tattoos.rsi
     state: heart_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: TattooVoxHiveChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Vox]
   coloring:
@@ -38,11 +43,18 @@
       fallbackColor: "#666666"
   sprites:
   - sprite: Mobs/Customization/vox_tattoos.rsi
-    state: hive_s
+  # WD EDIT START
+    state: hive_s_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: hive_s_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: TattooVoxNightlingChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Vox]
   coloring:
@@ -52,4 +64,12 @@
       fallbackColor: "#666666"
   sprites:
   - sprite: Mobs/Customization/vox_tattoos.rsi
-    state: nightling_s
+  # WD EDIT START
+    state: nightling_s_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: Mobs/Customization/vox_tattoos.rsi
+    state: nightling_s_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml
index b5382064ed8..692fab5949f 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: WristBraceletRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -11,11 +10,14 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: bracelet_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 # Dionae don't have left wrist markings because the markings are currently blocked by their body.
 - type: marking
   id: WristBraceletLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -26,10 +28,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: bracelet_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: WristBraceletArmRight
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -40,10 +45,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: bracelet_arm_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: WristBraceletArmLeft
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -54,10 +62,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: bracelet_arm_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: WristWatchRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -68,10 +79,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -82,10 +96,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchSilverRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -96,10 +113,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_silver_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchSilverLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -110,10 +130,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_silver_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchGoldRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -124,10 +147,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_gold_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchGoldLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -138,10 +164,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_gold_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchHoloRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -152,10 +181,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_holo_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchHoloLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -166,10 +198,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_holo_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchLeatherRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -180,10 +215,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_leather_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchLeatherLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -194,10 +232,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_leather_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchColorableRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -208,12 +249,19 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_colorable_r_tone_1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_colorable_r_tone_2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: WristWatchColorableLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne, Lamia, Tajaran]
   coloring:
@@ -224,5 +272,13 @@
   sprites:
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_colorable_l_tone_1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
   - sprite: Mobs/Customization/wrist.rsi
     state: watch_colorable_l_tone_2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/antenna.yml b/Resources/Prototypes/Entities/Mobs/Customization/antenna.yml
index 657e5406eb7..9b31424fabf 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/antenna.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/antenna.yml
@@ -1,89 +1,119 @@
 - type: marking
   speciesRestriction: [IPC]
   id: RobotAntennaTv
-  bodyPart: HeadTop
   markingCategory: HeadTop
   sprites:
     - sprite: Mobs/Customization/ipc_antenna.rsi
       state: ipc_antenna_tv
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   speciesRestriction: [IPC]
   id: RobotAntennaTesla
-  bodyPart: HeadTop
   markingCategory: HeadTop
   sprites:
     - sprite: Mobs/Customization/ipc_antenna.rsi
       state: ipc_antenna_tesla
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 # - type: marking
 #   speciesRestriction: [IPC]
 #   id: RobotAntennaLightb
-#   bodyPart: HeadTop
 #   markingCategory: HeadTop
 #   sprites:
 #     - sprite: Mobs/Customization/ipc_antenna.rsi
 #       state: ipc_antenna_lightb
+#       # WD EDIT START
+#       layer: enum.HumanoidVisualLayers.HeadTop
+#       bodyPart: Head
+#       # WD EDIT END
 
 # - type: marking
 #   speciesRestriction: [IPC]
 #   id: RobotAntennaLight
-#   bodyPart: HeadTop
 #   markingCategory: HeadTop
 #   sprites:
 #     - sprite: Mobs/Customization/ipc_antenna.rsi
 #       state: ipc_antenna_light
+#       # WD EDIT START
+#       layer: enum.HumanoidVisualLayers.HeadTop
+#       bodyPart: Head
+#       # WD EDIT END
 
 - type: marking
   speciesRestriction: [IPC]
   id: RobotAntennaCyberhead
-  bodyPart: HeadTop
   markingCategory: HeadTop
   sprites:
     - sprite: Mobs/Customization/ipc_antenna.rsi
       state: ipc_antenna_cyberhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 # - type: marking
 #   speciesRestriction: [IPC]
 #   id: RobotAntennaSidelights
-#   bodyPart: HeadTop
 #   markingCategory: HeadTop
 #   sprites:
 #     - sprite: Mobs/Customization/ipc_antenna.rsi
 #       state: ipc_antenna_sidelights
+#       # WD EDIT START
+#       layer: enum.HumanoidVisualLayers.HeadTop
+#       bodyPart: Head
+#       # WD EDIT END
 
 - type: marking
   speciesRestriction: [IPC]
   id: RobotAntennaAntlers
-  bodyPart: HeadTop
   markingCategory: HeadTop
   sprites:
     - sprite: Mobs/Customization/ipc_antenna.rsi
       state: ipc_antenna_antlers
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   speciesRestriction: [IPC]
   id: RobotAntennaDroneeyes
-  bodyPart: HeadTop
   markingCategory: HeadTop
   sprites:
     - sprite: Mobs/Customization/ipc_antenna.rsi
       state: ipc_antenna_droneeyes
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   speciesRestriction: [IPC]
   id: RobotAntennaCrowned
-  bodyPart: HeadTop
   markingCategory: HeadTop
   sprites:
     - sprite: Mobs/Customization/ipc_antenna.rsi
       state: ipc_antenna_crowned
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   speciesRestriction: [IPC]
   id: RobotAntennaTowers
-  bodyPart: HeadTop
   markingCategory: HeadTop
   sprites:
     - sprite: Mobs/Customization/ipc_antenna.rsi
       state: ipc_antenna_towers
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml
index bd416eb7fbd..60fcec38456 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml
@@ -1,128 +1,221 @@
 - type: marking
   id: CyberLimbsMarkingBishopHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_monitor.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_monitor.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingBishopHeadAlt
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingBishopHeadAlt1
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_alt1.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
   id: CyberLimbsMarkingBishopChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: torso-primary
+    state: chest-primary
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    replacementBodyPart: BodyPartChestIPC
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: torso-secondary
+    state: chest-secondary
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: CyberLimbsMarkingBishopGroin
+  markingCategory: Groin
+  speciesRestriction: [IPC]
+  sprites:
+  - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
+    state: groin-primary
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    replacementBodyPart: BodyPartGroinIPC
+  - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
+    state: groin-secondary
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingBishopLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: l_arm-primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    replacementBodyPart: BodyPartLeftArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: l_arm-secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: l_arm-tertiary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingBishopLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: l_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    replacementBodyPart: BodyPartLeftHandIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingBishopLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: l_leg-primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    replacementBodyPart: BodyPartLeftLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: l_leg-secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingBishopLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: l_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    replacementBodyPart: BodyPartLeftFootIPC
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingBishopRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: r_arm-primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    replacementBodyPart: BodyPartRightArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: r_arm-secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: r_arm-tertiary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingBishopRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: r_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    replacementBodyPart: BodyPartRightHandIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingBishopRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: r_leg-primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    replacementBodyPart: BodyPartRightLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: r_leg-secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingBishopRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
     state: r_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    replacementBodyPart: BodyPartRightFootIPC
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/eyes.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/eyes.yml
index e81ccd7e470..c8f384660de 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/eyes.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/eyes.yml
@@ -1,10 +1,7 @@
 - type: marking
   id: EmissiveEyeRight
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmaman, Tajaran]
-  shaders:
-    tattoo_eye_r: unshaded
   coloring:
     default:
       type:
@@ -13,14 +10,16 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    shader: unshaded
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: EmissiveEyeLeft
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Oni, Harpy, Lamia, Plasmama, Tajaran]
-  shaders:
-    tattoo_eye_l: unshaded
   coloring:
     default:
       type:
@@ -29,3 +28,8 @@
   sprites:
   - sprite: Mobs/Customization/tattoos.rsi
     state: tattoo_eye_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    shader: unshaded
+    organ: Eyes
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml
index abac4e6d53e..a8953dbb205 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml
@@ -1,128 +1,233 @@
 - type: marking
   id: CyberLimbsMarkingHesphiastosHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_monitor.rsi
     state: head-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_monitor.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosHeadAlt
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_alt1.rsi
     state: head-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_alt1.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_alt1.rsi
     state: head-3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
   id: CyberLimbsMarkingHesphiastosChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
-    state: torso-1
+    state: chest-1
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    replacementBodyPart: BodyPartChestIPC
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
-    state: torso-2
+    state: chest-2
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: CyberLimbsMarkingHesphiastosGroin
+  markingCategory: Groin
+  speciesRestriction: [IPC]
+  sprites:
+  - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
+    state: groin-1
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    replacementBodyPart: BodyPartGroinIPC
+  - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
+    state: groin-2
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    replacementBodyPart: BodyPartLeftArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    replacementBodyPart: BodyPartLeftHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    replacementBodyPart: BodyPartLeftLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_foot-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    replacementBodyPart: BodyPartLeftFootIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: l_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    replacementBodyPart: BodyPartRightArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne, Lamia, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    replacementBodyPart: BodyPartRightHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    replacementBodyPart: BodyPartRightLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingHesphiastosRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Tajaran] # Einstein Engines - Tajaran
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_foot-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    replacementBodyPart: BodyPartRightFootIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi
     state: r_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml
index 4456c288df8..e5660f8a4eb 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/morpheus.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: CyberLimbsMarkingMorpheusHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   coloring:
@@ -11,10 +10,14 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingMorpheusHeadAlt
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   coloring:
@@ -25,10 +28,15 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_alt1.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
   id: CyberLimbsMarkingMorpheusChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [IPC]
   coloring:
@@ -38,11 +46,30 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
-    state: torso
+    state: chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    replacementBodyPart: BodyPartChestIPC
+
+- type: marking
+  id: CyberLimbsMarkingMorpheusGroin
+  markingCategory: Groin
+  speciesRestriction: [IPC]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
+    state: groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    replacementBodyPart: BodyPartGroinIPC
+# WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingMorpheusLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [IPC]
   coloring:
@@ -53,10 +80,14 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    replacementBodyPart: BodyPartLeftArmIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingMorpheusLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [IPC]
   coloring:
@@ -67,10 +98,14 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: l_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    replacementBodyPart: BodyPartLeftHandIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingMorpheusLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [IPC]
   coloring:
@@ -81,11 +116,15 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    replacementBodyPart: BodyPartLeftLegIPC
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingMorpheusLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [IPC]
   coloring:
@@ -96,12 +135,16 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: l_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    replacementBodyPart: BodyPartLeftFootIPC
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingMorpheusRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [IPC]
   coloring:
@@ -112,11 +155,15 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    replacementBodyPart: BodyPartRightArmIPC
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingMorpheusRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [IPC]
   coloring:
@@ -127,10 +174,14 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: r_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    replacementBodyPart: BodyPartRightHandIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingMorpheusRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [IPC]
   coloring:
@@ -141,11 +192,15 @@
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
     state: r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    replacementBodyPart: BodyPartRightLegIPC
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingMorpheusRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [IPC]
   coloring:
@@ -155,4 +210,9 @@
           color: "#FFFFFF"
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi
-    state: r_foot
\ No newline at end of file
+    state: r_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    replacementBodyPart: BodyPartRightFootIPC
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml
index 81f4396d06e..92f03f75bda 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/shellguard.yml
@@ -1,125 +1,226 @@
 - type: marking
   id: CyberLimbsMarkingShellguardHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_monitor.rsi
     state: head-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_monitor.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingShellguardHeadAlt
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_alt1.rsi
     state: head-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_alt1.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
   id: CyberLimbsMarkingShellguardChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
-    state: torso-1
+    state: chest-1
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    replacementBodyPart: BodyPartChestIPC
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
-    state: torso-2
+    state: chest-2
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: CyberLimbsMarkingShellguardGroin
+  markingCategory: Groin
+  speciesRestriction: [IPC]
+  sprites:
+  - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
+    state: groin-1
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    replacementBodyPart: BodyPartGroinIPC
+  - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
+    state: groin-2
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingShellguardLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    replacementBodyPart: BodyPartLeftArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingShellguardLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    replacementBodyPart: BodyPartLeftHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingShellguardLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    replacementBodyPart: BodyPartLeftLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingShellguardLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_foot-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    replacementBodyPart: BodyPartLeftFootIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: l_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingShellguardRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: r_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    replacementBodyPart: BodyPartRightArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: r_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingShellguardRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: r_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    replacementBodyPart: BodyPartRightHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: r_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingShellguardRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: r_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    replacementBodyPart: BodyPartRightLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: r_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingShellguardRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
     state: r_foot-1
-  - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
-    state: r_foot-2
\ No newline at end of file
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    replacementBodyPart: BodyPartRightFootIPC
+    # WD EDIT END
+  - sprite: Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi
+    state: r_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml
index f331309ca94..18e02c4eaf9 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/wardtakahashi.yml
@@ -1,112 +1,171 @@
 - type: marking
   id: CyberLimbsMarkingWardtakahashiHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_monitor.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiHeadAlt
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiHeadAlt1
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_alt1.rsi
     state: head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
   id: CyberLimbsMarkingWardtakahashiChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
-    state: torso
+    state: chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    replacementBodyPart: BodyPartChestIPC
+
+- type: marking
+  id: CyberLimbsMarkingWardtakahashiGroin
+  markingCategory: Groin
+  speciesRestriction: [IPC]
+  sprites:
+  - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
+    state: groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    replacementBodyPart: BodyPartGroinIPC
+# WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    replacementBodyPart: BodyPartLeftArmIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: l_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    replacementBodyPart: BodyPartLeftHandIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    replacementBodyPart: BodyPartLeftLegIPC
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: l_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    replacementBodyPart: BodyPartLeftFootIPC
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    replacementBodyPart: BodyPartRightArmIPC
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: r_hand
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    replacementBodyPart: BodyPartRightHandIPC
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
     state: r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    replacementBodyPart: BodyPartRightLegIPC
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingWardtakahashiRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi
-    state: r_foot
\ No newline at end of file
+    state: r_foot
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    replacementBodyPart: BodyPartRightFootIPC
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml
index 84b630b788b..c7ffa0030e4 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/xion.yml
@@ -1,126 +1,227 @@
 - type: marking
   id: CyberLimbsMarkingXionHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_monitor.rsi
     state: head-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_monitor.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingXionHeadAlt
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_alt1.rsi
     state: head-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_alt1.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
   id: CyberLimbsMarkingXionChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
-    state: torso-1
+    state: chest-1
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    replacementBodyPart: BodyPartChestIPC
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
-    state: torso-2
+    state: chest-2
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: CyberLimbsMarkingXionGroin
+  markingCategory: Groin
+  speciesRestriction: [IPC]
+  sprites:
+  - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
+    state: groin-1
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    replacementBodyPart: BodyPartGroinIPC
+  - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
+    state: groin-2
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingXionLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    replacementBodyPart: BodyPartLeftArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingXionLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    replacementBodyPart: BodyPartLeftHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingXionLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    replacementBodyPart: BodyPartLeftLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingXionLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_foot-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    replacementBodyPart: BodyPartLeftFootIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: l_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingXionRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: r_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    replacementBodyPart: BodyPartRightArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: r_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingXionRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: r_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    replacementBodyPart: BodyPartRightHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: r_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingXionRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: r_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    replacementBodyPart: BodyPartRightLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: r_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingXionRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
     state: r_foot-1
-  - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
-    state: r_foot-2
\ No newline at end of file
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    replacementBodyPart: BodyPartRightFootIPC
+    # WD EDIT END
+  - sprite: Mobs/Customization/cyberlimbs/xion/xion_main.rsi
+    state: r_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml
index 9b6811b084f..7f75ee03ea7 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/zenghu.yml
@@ -1,115 +1,208 @@
 - type: marking
   id: CyberLimbsMarkingZenghuHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: head-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    replacementBodyPart: BodyPartHeadIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: head-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
+# WD EDIT START
 - type: marking
   id: CyberLimbsMarkingZenghuChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
-    state: torso-1
+    state: chest-1
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    replacementBodyPart: BodyPartChestIPC
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
-    state: torso-2
+    state: chest-2
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: CyberLimbsMarkingZenghuGroin
+  markingCategory: Groin
+  speciesRestriction: [IPC]
+  sprites:
+  - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
+    state: groin-1
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+    replacementBodyPart: BodyPartGroinIPC
+  - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
+    state: groin-2
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingZenghuLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    replacementBodyPart: BodyPartLeftArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingZenghuLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    replacementBodyPart: BodyPartLeftHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingZenghuLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    replacementBodyPart: BodyPartLeftLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingZenghuLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_foot-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    replacementBodyPart: BodyPartLeftFootIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: l_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingZenghuRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: r_arm-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    replacementBodyPart: BodyPartRightArmIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: r_arm-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 
 
 - type: marking
   id: CyberLimbsMarkingZenghuRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: r_hand-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    replacementBodyPart: BodyPartRightHandIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: r_hand-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: CyberLimbsMarkingZenghuRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: r_leg-1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    replacementBodyPart: BodyPartRightLegIPC
+    # WD EDIT END
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: r_leg-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 
 - type: marking
   id: CyberLimbsMarkingZenghuRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [IPC]
   sprites:
   - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
     state: r_foot-1
-  - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
-    state: r_foot-2
\ No newline at end of file
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    replacementBodyPart: BodyPartRightFootIPC
+    # WD EDIT END
+  - sprite: Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi
+    state: r_foot-2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/screens.yml b/Resources/Prototypes/Entities/Mobs/Customization/screens.yml
index 236a82f3ce5..35094b77b6a 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/screens.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/screens.yml
@@ -1,466 +1,544 @@
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenStatic
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_static: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_static
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenBlue
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_blue: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_blue
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenBreakout
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_breakout: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_breakout
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenEight
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_eight: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_eight
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenGoggles
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_goggles: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_goggles
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenExclaim
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_exclaim: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_exclaim
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenHeart
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_heart: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_heart
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenMonoeye
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_monoeye: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_monoeye
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenNature
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_nature: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_nature
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenOrange
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_orange: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_orange
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenPink
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_pink: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_pink
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenQuestion
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_question: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_question
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenShower
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_shower: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_shower
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenYellow
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_yellow: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_yellow
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenScroll
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_scroll: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_scroll
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenConsole
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_console: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_console
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenRgb
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_rgb: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_rgb
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenGlider
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_glider: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_glider
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenRainbowhoriz
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_rainbowhoriz: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_rainbowhoriz
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenBsod
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_bsod: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_bsod
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenRedtext
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_redtext: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_redtext
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenSinewave
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_sinewave: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_sinewave
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenSquarewave
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_squarewave: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_squarewave
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenEcgwave
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_ecgwave: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_ecgwave
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenEyes
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_eyes: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_eyes
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenEyestall
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_eyestall: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_eyestall
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenEyesangry
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_eyesangry: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_eyesangry
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenLoading
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_loading: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_loading
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenWindowsxp
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_windowsxp: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_windowsxp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenTetris
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_tetris: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_tetris
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenTv
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_tv: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_tv
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenTextdrop
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_textdrop: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_textdrop
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenStars
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_stars: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_stars
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenRainbowdiag
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_rainbowdiag: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_rainbowdiag
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenBlank
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_blank: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_blank
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenSmile
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_smile: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_smile
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenFrown
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_frown: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_frown
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenRing
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_ring: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_ring
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
 
 - type: marking
   speciesRestriction: [ IPC ]
   id: ScreenL
-  bodyPart: Face
   markingCategory: Face
-  shaders:
-    ipc_screen_l: unshaded
   sprites:
     - sprite: Mobs/Customization/ipc_screens.rsi
       state: ipc_screen_l
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Face
+      shader: unshaded
+      bodyPart: Head
+      # WD EDIT END
 
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 879059b426d..3a4f2fdde88 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -140,8 +140,6 @@
     slots:
       cell_slot:
         name: power-cell-slot-component-slot-name-default
-  - type: Body
-    thermalVisibility: false
   - type: StatusEffects
     allowed:
     - Stun
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 0991ffc7994..8d0824096dd 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -418,7 +418,6 @@
         damage: 10
       behaviors:
       - !type:GibBehavior
-        gibContents: Skip
         recursive: false # WD EDIT
   - type: NonSpreaderZombie
   - type: LanguageKnowledge
@@ -618,14 +617,11 @@
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
-  - type: SurgeryTarget
   - type: Strippable
   - type: UserInterface
     interfaces:
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: InventorySlots
   - type: Inventory
     speciesId: hamster
@@ -816,11 +812,8 @@
   - type: FootPrints
     leftBarePrint: "footprint-left-bare-lizard"
     rightBarePrint: "footprint-right-bare-lizard"
-  - type: SurgeryTarget
   - type: UserInterface
     interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
       enum.InstrumentUiKey.Key:
         type: InstrumentBoundUserInterface
         requireInputValidation: false
@@ -922,11 +915,6 @@
   - type: RandomBark
     barkType: chicken # Duh
     barkMultiplier: 0.7
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
 
 - type: entity
   name: white duck #Quack
@@ -1106,7 +1094,7 @@
     factions:
     - Passive
   - type: Body
-    prototype: AnimalRuminant
+    prototype: Ruminant # WD EDIT: AnimalRuminant -> Ruminant
   - type: HTN
     rootTask:
       task: RuminantCompound
@@ -1188,15 +1176,8 @@
   - type: HTN
     rootTask:
       task: RuminantCompound
-  - type: Body
-    prototype: AnimalHemocyanin
   - type: RandomBark
     barkType: crab
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
 
 - type: entity
   name: goat
@@ -1293,18 +1274,13 @@
     factions:
     - Passive
   - type: Body
-    prototype: AnimalRuminant
+    prototype: Ruminant # WD EDIT: AnimalRuminant -> Ruminant
   - type: NPCRetaliation
     attackMemoryLength: 5
   - type: FactionException
   - 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
@@ -1522,12 +1498,6 @@
   abstract: true
   components:
   - type: CombatMode
-  # Shitmed Change Start
-  - type: SurgeryTarget
-  - type: Targeting
-  - type: HumanoidAppearance
-    species: Monkey
-  # Shitmed Change End
   - type: Inventory
     templateId: monkey
     speciesId: monkey
@@ -1553,51 +1523,43 @@
     interfaces:
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: Sprite
     drawdepth: Mobs
     layers:
-    # Shitmed Change Start
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
-    - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    # WD EDIT START: BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    - map: [ "enum.BodyAppearanceLayer.Head" ]
+    - map: [ "enum.BodyAppearanceLayer.Eyes" ]
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    # WD EDIT END
     - map: ["jumpsuit"]
-    - map: ["enum.HumanoidVisualLayers.LFoot"]
-    - map: ["enum.HumanoidVisualLayers.RFoot"]
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-    - map: ["enum.HumanoidVisualLayers.RHand"]
+    # WD EDIT START: BodyAppearanceLayer
+    - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+    - map: ["enum.BodyAppearanceLayer.RightFoot"]
+    - map: ["enum.BodyAppearanceLayer.LeftHand"]
+    - map: ["enum.BodyAppearanceLayer.RightHand"]
+    # WD EDIT END
     - map: ["enum.HumanoidVisualLayers.Handcuffs"]
       color: "#ffffff"
       sprite: Objects/Misc/handcuffs.rsi
       state: body-overlay-2
       visible: false
-    - map: [ "gloves" ]
-    - map: [ "shoes" ]
     - map: [ "ears" ]
-    - map: [ "innerBelt" ] # Einstein Engines
-    - map: [ "innerNeck" ] # Einstein Engines
     - map: [ "outerClothing" ]
-    - map: [ "eyes" ]
-    - map: [ "belt" ]
     - map: [ "id" ]
-    - map: [ "neck" ]
-    - map: [ "back" ]
-    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-    - map: [ "enum.HumanoidVisualLayers.Hair" ]
-    - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-    - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
     - map: [ "mask" ]
     - map: [ "head" ]
-    - map: [ "pocket1" ]
-    - map: [ "pocket2" ]
-    # Shitmed Change End
+    - map: [ "enum.BodyAppearanceLayer.Tail" ] # WD EDIT: BodyAppearanceLayer
+    - map: [ "innerBelt" ] # Einstein Engines
+    - map: [ "innerNeck" ] # Einstein Engines
+    - map: [ "clownedon" ]
+      sprite: "Effects/creampie.rsi"
+      state: "creampie_human"
+      visible: false
   - type: Carriable
   - type: Hands
   - type: ComplexInteraction
@@ -1607,9 +1569,6 @@
         clownedon:
           True: {visible: true}
           False: {visible: false}
-  - type: Body # Shitmed Change
-    prototype: Monkey
-    requiredLegs: 2
   - type: CreamPied
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
@@ -1664,7 +1623,11 @@
       methods: [ Touch ]
       effects:
       - !type:WashCreamPieReaction
-
+  # WD EDIT START
+  - type: Body
+    prototype: Monkey
+  - type: BodyAppearance
+  # WD EDIT END
 
 
 - type: entity
@@ -1838,13 +1801,10 @@
   - type: RandomBark
     barkMultiplier: 0.65
     barkType: kobold
-  # Shitmed Change Start
-  - type: HumanoidAppearance
-    species: Kobold
+  # WD EDIT START
   - type: Body
     prototype: Kobold
-    requiredLegs: 2
-  # Shitmed Change End
+  # WD EDIT END
 
 - type: entity
   name: kobold
@@ -2078,11 +2038,6 @@
     whitelist:
       types:
       - Landmine
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: FoodSequenceElement
     entries:
       Taco: RatTaco
@@ -2103,7 +2058,6 @@
         damage: 100
       behaviors:
       - !type:GibBehavior
-        gibContents: Skip
         recursive: false
   # WD EDIT END
 
@@ -2699,8 +2653,6 @@
     - id: FoodMeatSpider
       amount: 2
   - type: CombatMode
-  - type: Body
-    prototype: AnimalHemocyanin
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -2773,11 +2725,6 @@
   - type: BloodSucker
     webRequired: true
   - type: Cocooner
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: Fauna # Lavaland Change
 
 - type: entity
@@ -4013,6 +3960,7 @@
     understands:
     - TauCetiBasic
     - RootSpeak
+  - type: IsDeadIC # WD EDIT
 
 - type: entity
   parent: MobDionaNymph
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 726e4064210..d3ecb0add75 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -82,13 +82,6 @@
       accent: genericAggressive
     - type: Speech
       speechVerb: LargeMob
-    - type: Body # Shitmed - Adds carp organs.
-      prototype: Carp
-    - type: SurgeryTarget
-    - type: UserInterface
-      interfaces:
-        enum.SurgeryUIKey.Key:
-          type: SurgeryBui
     - type: NightVision
       isActive: true
       toggleAction: null
@@ -260,7 +253,6 @@
           BaseUnshaded: dead_mouth
     - type: Body
       prototype: Bloodsucker
-      requiredLegs: 1
     - type: Butcherable
       spawned:
         - id: FoodMeatFish
@@ -273,11 +265,6 @@
         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/fillbot.yml b/Resources/Prototypes/Entities/Mobs/NPCs/fillbot.yml
index a0c6089dc17..7257e9e68a6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/fillbot.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/fillbot.yml
@@ -22,11 +22,14 @@
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
   - type: Hands
+    # WD EDIT START
+    hands:
+      hand:
+        name: hand
+        location: Middle
+    # WD EDIT END
     showInHands: false
   - type: ComplexInteraction
-  - type: Body
-    prototype: SiliconHand
-    requiredLegs: 0
   - type: HTN
     rootTask:
       task: FillbotCompound
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index 3596dcb6d41..c3e73d8cee6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -4,8 +4,6 @@
   parent: SimpleMobBase
   description: From the Viking age.
   components:
-  - type: Body # Shitmed Change
-    prototype: LaserRaptor
   - type: NpcFactionMember
     factions:
     - SimpleHostile
@@ -210,4 +208,4 @@
       types:
         Blunt: 0.11
   - type: StaticPrice
-    price: 400
\ No newline at end of file
+    price: 400
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 69c5b571eaa..f93894a98c4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -58,7 +58,6 @@
         Piercing: 8
   - type: Body
     prototype: Rat
-    requiredLegs: 1 # TODO: More than 1 leg
   - type: Hunger # probably should be prototyped
     thresholds:
       Overfed: 200
@@ -129,11 +128,6 @@
     understands:
     - TauCetiBasic
     - Mouse
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: NightVision
     isActive: true
     toggleAction: null
@@ -219,11 +213,6 @@
     - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
       state: eyes
       shader: unshaded
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: SpriteMovement
     movementLayers:
       movement:
@@ -263,7 +252,6 @@
         Piercing: 3
   - type: Body
     prototype: Rat
-    requiredLegs: 1 # TODO: More than 1 leg
   - type: Hunger # probably should be prototyped
     thresholds:
       Overfed: 200
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index e95689510f6..38f51c37830 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -102,8 +102,6 @@
     context: "human"
   - type: InputMover
   - type: MobMover
-  - type: Body
-    prototype: Bot
   - type: GuideHelp
     guides:
     - Robotics
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index a3cdd6b5096..8875f6ae372 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -91,8 +91,7 @@
         messages: [ "slime-hurt-by-water-popup" ]
         probability: 0.25
   - type: Body
-    prototype: Slimes
-    requiredLegs: 1
+    prototype: SimpleSlime # WD EDIT: Slimes -> SimpleSlime
   - type: MeleeWeapon
     altDisarm: false
     soundHit:
@@ -113,11 +112,6 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
-  - type: SurgeryTarget
-  - type: UserInterface
-    interfaces:
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: Fauna # Lavaland Change
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 67b49666d94..728f1463d9c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -289,8 +289,6 @@
   parent: MobSpaceBasic
   description: Long fangs and a glowing hood, and the alluring look begs to come closer.
   components:
-    - type: Body # Shitmed Change
-      prototype: SpaceCobra
     - type: Sprite
       drawdepth: Mobs
       sprite: Mobs/Animals/spacecobra.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
index 0c5f153da0a..aae145ea0e3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
@@ -157,8 +157,7 @@
       proper: true
       gender: male
   - type: Body
-    prototype: Friendshaped
-    requiredLegs: 1 # TODO: More than 1 leg
+    prototype: FriendShaped # WD EDIT: Friendshaped -> FriendShaped
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-reptile
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 49793fa6780..978b788e9a7 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -32,6 +32,15 @@
     canInteract: true
   - type: GhostHearing
   - type: Hands
+    # WD EDIT START
+    hands:
+      right_hand:
+        name: right_hand
+        location: Right
+      left_hand:
+        name: left_hand
+        location: Left
+    # WD EDIT END
   - type: ComplexInteraction
   - type: Puller
     needsHands: false # Tail Drag
@@ -41,9 +50,6 @@
   - type: Physics
     ignorePaused: true
     bodyType: Kinematic
-  - type: Body
-    prototype: Aghost
-    thermalVisibility: false
   - type: Access
     groups:
     - AllAccess
@@ -126,6 +132,7 @@
   - type: ShowJobIcons
   - type: ShowMindShieldIcons
   - type: ShowCriminalRecordIcons
+  - type: TargetDoll
   # WD EDIT END
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 7ffd4b309ad..9668ccb46ad 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -6,8 +6,6 @@
   description: A flying leviathan, loosely related to space carps.
   abstract: true
   components:
-  - type: Body # Shitmed
-    prototype: SpaceDragon
   - type: Bloodstream
     bloodMaxVolume: 650
   - type: GhostRole
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 9f3abe3fdca..c715b5cb282 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -238,8 +238,6 @@
       map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
       color: "#8adaff"
       shader: unshaded
-  - type: Body
-    prototype: Primate
   - type: Tag
     tags:
     - CannotSuicide
@@ -248,6 +246,12 @@
   - type: Inventory
     templateId: holoclown
   - type: Hands
+    # WD EDIT START
+    hands:
+      right_hand:
+        name: right_hand
+        location: Right
+    # WD EDIT END
   - type: ComplexInteraction
   - type: Clumsy
     gunShootFailDamage:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
index 33463c621cf..40c6f92ce26 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml
@@ -164,3 +164,7 @@
     species: IPC
   - type: Inventory
     templateId: ipc
+  # WD EDIT START
+  - type: Body
+    prototype: IPC
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml
index a723ee655d4..a8207e531c2 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon_base.yml
@@ -102,15 +102,20 @@
       noRot: true
       drawdepth: Mobs
       layers:
-        - map: ["enum.HumanoidVisualLayers.Chest"]
-        - map: ["enum.HumanoidVisualLayers.Head"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.Chest" ]
+        - map: [ "enum.BodyAppearanceLayer.Groin" ]
+        - map: [ "enum.BodyAppearanceLayer.Head" ]
+        # WD EDIT END
         - map: ["enum.HumanoidVisualLayers.Snout"]
-        - map: ["enum.HumanoidVisualLayers.Eyes"]
+        - map: ["enum.BodyAppearanceLayer.Eyes"] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
         - map: ["enum.HumanoidVisualLayers.Face"]
-        - map: ["enum.HumanoidVisualLayers.RArm"]
-        - map: ["enum.HumanoidVisualLayers.LArm"]
-        - map: ["enum.HumanoidVisualLayers.RLeg"]
-        - map: ["enum.HumanoidVisualLayers.LLeg"]
+        # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+        - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+        - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+        - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+        # WD EDIT END
 #     - shader: StencilClear
 #      sprite: Mobs/Species/Human/parts.rsi
 #      state: l_leg
@@ -119,14 +124,18 @@
           sprite: Mobs/Customization/masking_helpers.rsi
           state: female_full
           visible: false
-        - map: ["enum.HumanoidVisualLayers.LFoot"]
-        - map: ["enum.HumanoidVisualLayers.RFoot"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+        - map: ["enum.BodyAppearanceLayer.RightFoot"]
+        # WD EDIT END
         - map: ["socks"]
         - map: ["underpants"]
         - map: ["undershirt"]
         - map: ["jumpsuit"]
-        - map: ["enum.HumanoidVisualLayers.LHand"]
-        - map: ["enum.HumanoidVisualLayers.RHand"]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: ["enum.BodyAppearanceLayer.LeftHand"]
+        - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
         - map: ["enum.HumanoidVisualLayers.Handcuffs"]
           color: "#ffffff"
           sprite: Objects/Misc/handcuffs.rsi
@@ -151,7 +160,10 @@
         - map: ["head"]
         - map: ["pocket1"]
         - map: ["pocket2"]
-        - map: ["enum.HumanoidVisualLayers.Tail"]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.Tail" ]
+        - map: [ "enum.BodyAppearanceLayer.Wings" ]
+      # WD EDIT END
         - map: ["clownedon"] # Dynamically generated
           sprite: "Effects/creampie.rsi"
           state: "creampie_human"
@@ -217,8 +229,6 @@
     - type: Stripping
     - type: Strippable
     - type: ComplexInteraction
-    - type: SurgeryTarget
-    - type: Targeting
     - type: UserInterface
       interfaces:
         enum.HumanoidMarkingModifierKey.Key:
@@ -232,8 +242,6 @@
           type: TrackedRadialSelectorMenuBUI # WD EDIT: RadialSelectorMenuBUI -> TrackedRadialSelectorMenuBUI
         enum.ListViewSelectorUiKey.Key:
           type: ListViewSelectorBUI
-        enum.SurgeryUIKey.Key:
-          type: SurgeryBui
     - type: Emoting
     - type: Grammar
       attributes:
@@ -248,7 +256,6 @@
       species: IPC
     - type: Body
       prototype: IPC
-      requiredLegs: 2
       thermalVisibility: false
     - type: Ensnareable
       sprite: Objects/Misc/ensnare.rsi
@@ -272,7 +279,6 @@
           Blunt: 6 # It's tough.
       heavyRateModifier: 1
       heavyDamageBaseModifier: 1
-      heavyPartDamageMultiplier: 1
       heavyStaminaCost: 0
       maxTargets: 1
     - type: MobPrice
@@ -288,12 +294,15 @@
     - type: DamageVisuals
       thresholds: [ 10, 20, 30, 50, 70, 100 ]
       targetLayers:
-        - "enum.HumanoidVisualLayers.Chest"
-        - "enum.HumanoidVisualLayers.Head"
-        - "enum.HumanoidVisualLayers.LArm"
-        - "enum.HumanoidVisualLayers.LLeg"
-        - "enum.HumanoidVisualLayers.RArm"
-        - "enum.HumanoidVisualLayers.RLeg"
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - "enum.BodyAppearanceLayer.Chest"
+        - "enum.BodyAppearanceLayer.Groin"
+        - "enum.BodyAppearanceLayer.Head"
+        - "enum.BodyAppearanceLayer.LeftArm"
+        - "enum.BodyAppearanceLayer.LeftLeg"
+        - "enum.BodyAppearanceLayer.RightArm"
+        - "enum.BodyAppearanceLayer.RightLeg"
+        # WD EDIT END
       damageOverlayGroups:
         Brute:
           sprite: Mobs/Effects/brute_damage.rsi
@@ -334,6 +343,9 @@
     - type: FootPrints
     - type: Carriable
     - type: LayingDown
-    - type: ExaminableCharacter # WWDP
-    - type: TTS # WD EDIT
+    # WD EDIT START
+    - type: ExaminableCharacter
+    - type: TTS
+    - type: BodyAppearance
+    # WD EDIT END
 
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
index 78b7e7d1073..412e3a843c0 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
@@ -8,51 +8,32 @@
   - type: Sprite
     # Arachne are one of the species that needs a manual visual layers setup.
     layers:
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      sprite: Mobs/Species/arachne.rsi
-      state: spider_body
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: torso_m
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    # WD EDIT END
       sprite: Mobs/Species/arachne.rsi
       state: spider_body_front
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: head_m
+    - map: [ "enum.BodyAppearanceLayer.Head" ] # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
     - map: [ "enum.HumanoidVisualLayers.Snout" ]
     - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      color: "#008800"
-      sprite: Mobs/Species/eyes.rsi
-      state: eyes
     - map: [ "enum.HumanoidVisualLayers.Face" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: r_arm
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: l_arm
-#     - shader: StencilClear
-#      sprite: Mobs/Species/Human/parts.rsi
-#      state: l_leg
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    # WD EDIT END
     - shader: StencilMask
       map: [ "enum.HumanoidVisualLayers.StencilMask" ]
       sprite: Mobs/Customization/anytaur_masking_helpers.rsi
       state: unisex_full
       visible: false
     - map: [ "jumpsuit" ]
-    - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: l_hand
-    - map: [ "enum.HumanoidVisualLayers.RHand" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: r_hand
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.LeftHand" ]
+    - map: [ "enum.BodyAppearanceLayer.RightHand" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
       color: "#ffffff"
       sprite: Objects/Misc/handcuffs.rsi
@@ -78,10 +59,10 @@
     - map: [ "head" ]
     - map: [ "pocket1" ]
     - map: [ "pocket2" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
-      sprite: Mobs/Customization/masking_helpers.rsi
-      state: none
-      visible: false
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Tail" ]
+    - map: [ "enum.BodyAppearanceLayer.Wings" ]
+    # WD EDIT END
     - map: [ "clownedon" ] # Dynamically generated
       sprite: "Effects/creampie.rsi"
       state: "creampie_human"
@@ -107,7 +88,6 @@
         - MobLayer
   - type: Body
     prototype: Arachne
-    requiredLegs: 8
   - type: Speech
     speechSounds: Alto
   - type: Inventory
@@ -127,10 +107,13 @@
   - type: Cocooner
   - type: DamageVisuals
     targetLayers:
-      - "enum.HumanoidVisualLayers.Chest"
-      - "enum.HumanoidVisualLayers.Head"
-      - "enum.HumanoidVisualLayers.LArm"
-      - "enum.HumanoidVisualLayers.RArm"
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - "enum.BodyAppearanceLayer.Chest"
+      - "enum.BodyAppearanceLayer.Groin"
+      - "enum.BodyAppearanceLayer.Head"
+      - "enum.BodyAppearanceLayer.LeftArm"
+      - "enum.BodyAppearanceLayer.RightArm"
+      # WD EDIT END
   - type: MovedByPressure
   - type: Barotrauma
     damage:
@@ -162,34 +145,21 @@
   components:
   - type: Sprite
     layers:
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-      sprite: Mobs/Species/arachne.rsi
-      state: spider_body
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: torso_m
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    # WD EDIT END
       sprite: Mobs/Species/arachne.rsi
       state: spider_body_front
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: head_m
     - map: [ "enum.HumanoidVisualLayers.Snout" ]
     - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-      color: "#008800"
-      sprite: Mobs/Species/eyes.rsi
-      state: eyes
     - map: [ "enum.HumanoidVisualLayers.Face" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: r_arm
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: l_arm
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    # WD EDIT END
 #     - shader: StencilClear
 #      sprite: Mobs/Species/Human/parts.rsi
 #      state: l_leg
@@ -199,14 +169,10 @@
       state: unisex_full
       visible: false
     - map: [ "jumpsuit" ]
-    - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: l_hand
-    - map: [ "enum.HumanoidVisualLayers.RHand" ]
-      color: "#e8b59b"
-      sprite: Mobs/Species/Human/parts.rsi
-      state: r_hand
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.LeftHand" ]
+    - map: [ "enum.BodyAppearanceLayer.RightHand" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
       color: "#ffffff"
       sprite: Objects/Misc/handcuffs.rsi
@@ -232,7 +198,10 @@
     - map: [ "head" ]
     - map: [ "pocket1" ]
     - map: [ "pocket2" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Tail" ]
+    - map: [ "enum.BodyAppearanceLayer.Wings" ]
+    # WD EDIT END
       sprite: Mobs/Customization/masking_helpers.rsi
       state: none
       visible: false
@@ -240,3 +209,7 @@
     templateId: anytaur
   - type: HumanoidAppearance
     species: Arachne
+  # WD EDIT START
+  - type: Body
+    prototype: Arachne
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 9f089aafd12..5da346ee84d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -7,7 +7,6 @@
   components:
   - type: Body
     prototype: Arachnid
-    requiredLegs: 2 # It would be funny if arachnids could use their little back limbs to move around once they lose their legs, but just something to consider post-woundmed
   - type: HumanoidAppearance
     species: Arachnid
   - type: Hunger
@@ -78,22 +77,29 @@
     proto: spider
   - type: Sprite # I'd prefer if these maps were better. Insert map pun here.
     layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Chest" ]
+      - map: [ "enum.BodyAppearanceLayer.Groin" ]
+      - map: [ "enum.BodyAppearanceLayer.Head" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "enum.HumanoidVisualLayers.Face" ]
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Underwear" ]
       - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
       - map: ["jumpsuit"]
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+      - map: ["enum.BodyAppearanceLayer.RightFoot"]
+      - map: ["enum.BodyAppearanceLayer.LeftHand"]
+      - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
       - map: [ "gloves" ]
       - map: [ "shoes" ]
       - map: [ "ears" ]
@@ -103,7 +109,10 @@
       - map: [ "eyes" ]
       - map: [ "belt" ]
       - map: [ "id" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol.
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Tail" ]
+      - map: [ "enum.BodyAppearanceLayer.Wings" ]
+      # WD EDIT END
       - map: [ "neck" ]
       - map: [ "back" ]
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
@@ -140,5 +149,9 @@
     species: Arachnid
   - type: Inventory
     templateId: arachnid
+  # WD EDIT START
+  - type: Body
+    prototype: Arachnid
+  # WD EDIT END
 
 #>88w88<
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 5158fae1814..954c6421cb4 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -2,7 +2,7 @@
   save: false
   parent:
   - BaseMob
-  - MobDamageable
+  - BaseMobWoundable # WD EDIT: MobDamageable -> BaseMobWoundable
   - MobPolymorphable
   - MobCombat
   - StripableInventoryBase
@@ -11,22 +11,29 @@
   components:
   - type: Sprite
     layers:
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    - map: [ "enum.BodyAppearanceLayer.Head" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
     - map: [ "enum.HumanoidVisualLayers.Face" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Underwear" ]
     - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
     - map: ["jumpsuit"]
-    - map: ["enum.HumanoidVisualLayers.LFoot"]
-    - map: ["enum.HumanoidVisualLayers.RFoot"]
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-    - map: ["enum.HumanoidVisualLayers.RHand"]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+    - map: ["enum.BodyAppearanceLayer.RightFoot"]
+    - map: ["enum.BodyAppearanceLayer.LeftHand"]
+    - map: ["enum.BodyAppearanceLayer.RightHand"]
+    # WD EDIT END
     - map: [ "gloves" ]
     - map: [ "shoes" ]
     - map: [ "ears" ]
@@ -42,8 +49,10 @@
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
-    - map: [ "enum.HumanoidVisualLayers.Wings" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Tail" ]
+    - map: [ "enum.BodyAppearanceLayer.Wings" ]
+    # WD EDIT END
     - map: [ "mask" ]
     - map: [ "head" ]
     - map: [ "pocket1" ]
@@ -60,12 +69,15 @@
   - type: DamageVisuals
     thresholds: [ 10, 20, 30, 50, 70, 100 ]
     targetLayers:
-    - "enum.HumanoidVisualLayers.Chest"
-    - "enum.HumanoidVisualLayers.Head"
-    - "enum.HumanoidVisualLayers.LArm"
-    - "enum.HumanoidVisualLayers.LLeg"
-    - "enum.HumanoidVisualLayers.RArm"
-    - "enum.HumanoidVisualLayers.RLeg"
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - "enum.BodyAppearanceLayer.Chest"
+    - "enum.BodyAppearanceLayer.Groin"
+    - "enum.BodyAppearanceLayer.Head"
+    - "enum.BodyAppearanceLayer.LeftArm"
+    - "enum.BodyAppearanceLayer.LeftLeg"
+    - "enum.BodyAppearanceLayer.RightArm"
+    - "enum.BodyAppearanceLayer.RightLeg"
+    # WD EDIT END
     damageOverlayGroups:
       Brute:
         sprite: Mobs/Effects/brute_damage.rsi
@@ -148,7 +160,6 @@
     - PsionicallyInsulated
   - type: Body
     prototype: Human
-    requiredLegs: 2
   - type: Identity
   - type: IdExaminable
   - type: Hands
@@ -175,7 +186,6 @@
         Blunt: 5
     heavyRateModifier: 1
     heavyDamageBaseModifier: 1
-    heavyPartDamageMultiplier: 1
     heavyStaminaCost: 0
     maxTargets: 1
   - type: SleepEmitSound
@@ -213,8 +223,6 @@
         type: TrackedRadialSelectorMenuBUI # WD EDIT: RadialSelectorMenuBUI -> TrackedRadialSelectorMenuBUI
       enum.ListViewSelectorUiKey.Key:
         type: ListViewSelectorBUI
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: Puller
   - type: Speech
     speechSounds: Alto
@@ -245,8 +253,6 @@
     - FootstepSound
     - DoorBumpOpener
     - AnomalyHost
-  - type: Targeting
-  - type: SurgeryTarget
   - type: MovedByPressure
     cutoffTime: 1.0
   # WD EDIT START
@@ -258,6 +264,7 @@
     allowMovementWhileCrit: true
     allowMovementWhileSoftCrit: true
   - type: MobThresholdSounds
+  - type: BodyAppearance
   # WD EDIT END
 
 - type: entity
@@ -327,8 +334,10 @@
         Asphyxiation: -1.0
   - type: FireVisuals
     alternateState: Standing
-  - type: BloodstreamAffectedByMass
-    power: 0.6 # A minimum size felinid will have 30% blood, a minimum size vulp will have 60%, a maximum size oni will have ~200%
+  # WD EDIT START
+  - type: Bloodstream
+    powerMassAdjust: 0.6
+  # WD EDIT END
 
 - type: entity
   save: false
@@ -347,22 +356,29 @@
     noRot: true
     # TODO BODY Turn these into individual body parts?
     layers:
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    - map: [ "enum.BodyAppearanceLayer.Head" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
     - map: [ "enum.HumanoidVisualLayers.Face" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Underwear" ]
     - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
     - map: ["jumpsuit"]
-    - map: ["enum.HumanoidVisualLayers.LFoot"]
-    - map: ["enum.HumanoidVisualLayers.RFoot"]
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-    - map: ["enum.HumanoidVisualLayers.RHand"]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+    - map: ["enum.BodyAppearanceLayer.RightFoot"]
+    - map: ["enum.BodyAppearanceLayer.LeftHand"]
+    - map: ["enum.BodyAppearanceLayer.RightHand"]
+    # WD EDIT END
     - map: ["enum.HumanoidVisualLayers.Handcuffs"]
       color: "#ffffff"
       sprite: Objects/Misc/handcuffs.rsi
@@ -383,7 +399,10 @@
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Tail" ]
+    - map: [ "enum.BodyAppearanceLayer.Wings" ]
+    # WD EDIT END
     - map: [ "mask" ]
     - map: [ "head" ]
     - map: [ "pocket1" ]
@@ -393,9 +412,9 @@
     species: Human
   - type: Body
     prototype: Human
-    requiredLegs: 2
   - type: Absorbable
   - type: UserInterface
     interfaces:
       enum.HumanoidMarkingModifierKey.Key: # sure, this can go here too
         type: HumanoidMarkingModifierBoundUserInterface
+  - type: BodyAppearance # WD EDIT
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index b9a5de9f949..822eaed19ce 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -17,7 +17,6 @@
     state: full
   - type: Body
     prototype: Diona
-    requiredLegs: 2
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Diona
@@ -152,3 +151,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Diona
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index 154b753cc0b..8b535f36133 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -23,7 +23,6 @@
     drawdepth: Mobs
   - type: Body
     prototype: Dwarf
-    requiredLegs: 2
   - type: Butcherable
     butcheringType: Spike
     spawned:
@@ -53,8 +52,10 @@
   - type: HumanoidAppearance
     species: Human
     hideLayersOnEquip:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: LanguageKnowledge
     speaks:
     - TauCetiBasic
@@ -123,7 +124,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
-      # WD EDIT START
+  # WD EDIT START
       jumpsuit-body-slim:
         sizeMaps:
           32:
@@ -154,5 +155,7 @@
           32:
             sprite: _White/Mobs/Species/Human/displacement.rsi
             state: suit
-      # WD EDIT END
+  - type: Body
+    prototype: Dwarf
+  # WD EDIT END
 
diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
index 003eeb8c50e..a54c12922e0 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
@@ -12,7 +12,6 @@
     state: full
   - type: Body
     prototype: Gingerbread
-    requiredLegs: 2
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Gingerbread
@@ -65,3 +64,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Gingerbread
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
index 64949249d55..62042f47607 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml
@@ -10,24 +10,31 @@
   - type: Sprite
     scale: 0.9, 0.9
     layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Chest" ]
+      - map: [ "enum.BodyAppearanceLayer.Groin" ]
+      - map: [ "enum.BodyAppearanceLayer.Head" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "enum.HumanoidVisualLayers.Face" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Underwear" ]
       - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
       - map: [ "underpants" ]
       - map: [ "undershirt" ]
       - map: [ "socks" ]
       - map: [ "jumpsuit" ]
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+      - map: ["enum.BodyAppearanceLayer.RightFoot"]
+      - map: ["enum.BodyAppearanceLayer.LeftHand"]
+      - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi
@@ -45,7 +52,10 @@
       - map: [ "back" ]
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Tail" ]
+      - map: [ "enum.BodyAppearanceLayer.Wings" ]
+      # WD EDIT END
       - map: [ "pocket1" ]
       - map: [ "pocket2" ]
       - map: [ "clownedon" ] # Dynamically generated
@@ -53,7 +63,7 @@
         state: "creampie_human"
         visible: false
 # Yes, RArm has to be down here
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightArm" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "enum.HumanoidVisualLayers.Hair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
       - map: [ "mask" ]
@@ -167,22 +177,29 @@
   - type: Sprite
     scale: 0.9, 0.9
     layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Chest" ]
+      - map: [ "enum.BodyAppearanceLayer.Groin" ]
+      - map: [ "enum.BodyAppearanceLayer.Head" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "enum.HumanoidVisualLayers.Face" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+      # WD EDIT END
       - map: [ "underpants" ]
       - map: [ "undershirt" ]
       - map: [ "socks" ]
       - map: [ "jumpsuit" ]
-      - map: ["enum.HumanoidVisualLayers.LFoot"]
-      - map: ["enum.HumanoidVisualLayers.RFoot"]
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-      - map: ["enum.HumanoidVisualLayers.RHand"]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+      - map: ["enum.BodyAppearanceLayer.RightFoot"]
+      - map: ["enum.BodyAppearanceLayer.LeftHand"]
+      - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
       - map: [ "id" ]
       - map: [ "gloves" ]
       - map: [ "ears" ]
@@ -196,7 +213,7 @@
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
       - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
       - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ]
+      - map: [ "enum.BodyAppearanceLayer.Tail" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "pocket1" ]
       - map: [ "pocket2" ]
       - map: [ "clownedon" ] # Dynamically generated
@@ -204,7 +221,7 @@
         state: "creampie_human"
         visible: false
 # Yes, RArm has to be down here
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightArm" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
       - map: [ "enum.HumanoidVisualLayers.Hair" ]
       - map: [ "mask" ]
       - map: [ "head" ]
@@ -225,14 +242,16 @@
               layerKey: dummy
               parameterTexture: displacementMap
               parameterUV: displacementUV
-    # WD EDIT START
+  # WD EDIT START
     femaleDisplacements:
       jumpsuit-body-slim:
         sizeMaps:
           32:
             sprite: _White/Mobs/Species/Harpy/displacement.rsi
             state: jumpsuit-slim
-    # WD EDIT END
+  - type: Body
+    prototype: Harpy
+  # WD EDIT END
 
 - type: entity
   id: ActionHarpyPlayMidi
diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
index dc4f2a84a0c..c217ed40394 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -19,8 +19,10 @@
   - type: HumanoidAppearance
     species: Human
     hideLayersOnEquip:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: LanguageKnowledge
     speaks:
     - TauCetiBasic
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index ce01bdf82c6..c283a30819c 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -8,7 +8,9 @@
   - type: HumanoidAppearance
     species: Moth
     hideLayersOnEquip:
-    - HeadTop
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.HeadTop
+    # WD EDIT END
   - type: Hunger
   - type: Thirst
   - type: Carriable # Carrying system from nyanotrasen.
@@ -17,7 +19,6 @@
     state: full
   - type: Body
     prototype: Moth
-    requiredLegs: 2
   - type: Damageable
     damageContainer: Biological
     damageModifierSet: Moth
@@ -86,22 +87,31 @@
     noRot: true
     drawdepth: Mobs
     layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Chest" ]
+      - map: [ "enum.BodyAppearanceLayer.Groin" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Snout" ]
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Head" ]
+      - map: [ "enum.BodyAppearanceLayer.Eyes" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Face" ]
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+      - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+      - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Underwear" ]
       - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
       - map: [ "jumpsuit" ]
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+      - map: ["enum.BodyAppearanceLayer.RightFoot"]
+      - map: ["enum.BodyAppearanceLayer.LeftHand"]
+      - map: ["enum.BodyAppearanceLayer.RightHand"]
+      # WD EDIT END
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi
@@ -116,7 +126,10 @@
       - map: [ "eyes" ]
       - map: [ "belt" ]
       - map: [ "id" ]
-      - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break
+      # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+      - map: [ "enum.BodyAppearanceLayer.Tail" ]
+      - map: [ "enum.BodyAppearanceLayer.Wings" ]
+      # WD EDIT END
       - map: [ "neck" ]
       - map: [ "back" ]
       - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
@@ -150,22 +163,31 @@
     species: Moth
   - type: Sprite
     layers:
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Head" ]
+    - map: [ "enum.BodyAppearanceLayer.Eyes" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Face" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Underwear" ]
     - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
     - map: [ "jumpsuit" ]
-    - map: [ "enum.HumanoidVisualLayers.LHand" ]
-    - map: [ "enum.HumanoidVisualLayers.RHand" ]
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+    - map: ["enum.BodyAppearanceLayer.RightFoot"]
+    - map: ["enum.BodyAppearanceLayer.LeftHand"]
+    - map: ["enum.BodyAppearanceLayer.RightHand"]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
       color: "#ffffff"
       sprite: Objects/Misc/handcuffs.rsi
@@ -180,7 +202,10 @@
     - map: [ "eyes" ]
     - map: [ "belt" ]
     - map: [ "id" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Wings" ]
+    - map: [ "enum.BodyAppearanceLayer.Tail" ]
+    # WD EDIT END
     - map: [ "neck" ]
     - map: [ "back" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
@@ -202,3 +227,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Moth
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml b/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml
index e4703a06e53..c32c38c45f3 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml
@@ -9,20 +9,27 @@
     state: full
   - type: Sprite
     layers:
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    - map: [ "enum.BodyAppearanceLayer.Head" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
     - map: [ "enum.HumanoidVisualLayers.Face" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-    - map: ["enum.HumanoidVisualLayers.LFoot"]
-    - map: ["enum.HumanoidVisualLayers.RFoot"]
+    # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+    - map: ["enum.BodyAppearanceLayer.RightFoot"]
+    # WD EDIT END
     - map: ["jumpsuit"] # jumpsuit after foot to show envirosuit shoes
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-    - map: ["enum.HumanoidVisualLayers.RHand"]
+    # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: ["enum.BodyAppearanceLayer.LeftHand"]
+    - map: ["enum.BodyAppearanceLayer.RightHand"]
+    # WD EDIT END
     - map: [ "gloves" ]
     - map: [ "shoes" ]
     - map: [ "ears" ]
@@ -38,7 +45,10 @@
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Tail" ]
+    - map: [ "enum.BodyAppearanceLayer.Wings" ]
+    # WD EDIT END
     - map: [ "mask" ]
     - map: [ "head" ]
     - map: [ "pocket1" ]
@@ -55,7 +65,6 @@
   - type: Carriable
   - type: Body
     prototype: Plasmaman
-    requiredLegs: 2
     gibSound: /Audio/Effects/bone_rattle.ogg
   - type: SpawnGasOnGib
     gasMixture:
@@ -141,7 +150,7 @@
     damage:
       types:
         Heat: 1
-    targetParts: [ RightHand, LeftHand ]
+    # targetParts: [ RightHand, LeftHand ]
   - type: Speech
     speechVerb: Skeleton
   - type: Vocal
@@ -174,8 +183,10 @@
   - type: HumanoidAppearance
     species: Plasmaman
     hideLayersOnEquip:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: TypingIndicator
     proto: plasmaman
   - type: LanguageKnowledge
@@ -210,3 +221,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Plasmaman
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index c38adf75cd6..cc5fd0fa440 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -8,9 +8,10 @@
   - type: HumanoidAppearance
     species: Reptilian
     hideLayersOnEquip:
-    - Snout
-    # - HeadTop - WD EDIT
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: Hunger
   - type: Puller
     needsHands: false
@@ -21,7 +22,6 @@
     state: full
   - type: Body
     prototype: Reptilian
-    requiredLegs: 2
   - type: Butcherable
     butcheringType: Spike
     spawned:
@@ -151,12 +151,13 @@
   - type: HumanoidAppearance
     species: Reptilian
     hideLayersOnEquip:
-    - Snout
-    # - HeadTop - WD EDIT
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: Inventory
     speciesId: reptilian
-    # WD EDIT START
+  # WD EDIT START
     femaleDisplacements:
       jumpsuit:
         sizeMaps:
@@ -209,6 +210,8 @@
           32:
             sprite: _White/Mobs/Species/Reptilian/displacement.rsi
             state: shoes-digi
-    # WD EDIT END
+  - type: Body
+    prototype: Reptilian
+  # WD EDIT END
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
index 296d97ac9e2..db94f292638 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml
@@ -78,8 +78,6 @@
       alternateState: Standing
     - type: OfferItem
     - type: LayingDown
-    - type: BloodstreamAffectedByMass
-      power: 0.6
     - type: Hunger
     - type: Thirst
     - type: Carriable
@@ -151,16 +149,21 @@
       drawdepth: Mobs
       scale: 0.85, 0.85
       layers:
-        - map: ["enum.HumanoidVisualLayers.Chest"]
-        - map: ["enum.HumanoidVisualLayers.Head"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.Chest" ]
+        - map: [ "enum.BodyAppearanceLayer.Groin" ]
+        - map: [ "enum.BodyAppearanceLayer.Head" ]
+        # WD EDIT END
         - map: ["enum.HumanoidVisualLayers.Snout"]
-        - map: ["enum.HumanoidVisualLayers.Eyes"]
+        - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
           shader: unshaded
         - map: ["enum.HumanoidVisualLayers.Face"]
-        - map: ["enum.HumanoidVisualLayers.RArm"]
-        - map: ["enum.HumanoidVisualLayers.LArm"]
-        - map: ["enum.HumanoidVisualLayers.RLeg"]
-        - map: ["enum.HumanoidVisualLayers.LLeg"]
+        # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+        - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+        - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+        - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+        # WD EDIT END
 #     - shader: StencilClear
 #      sprite: Mobs/Species/Human/parts.rsi
 #      state: l_leg
@@ -169,14 +172,18 @@
           sprite: Mobs/Customization/masking_helpers.rsi
           state: full
           visible: false
-        - map: ["enum.HumanoidVisualLayers.LFoot"]
-        - map: ["enum.HumanoidVisualLayers.RFoot"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+        - map: ["enum.BodyAppearanceLayer.RightFoot"]
+        # WD EDIT END
         - map: ["socks"]
         - map: ["underpants"]
         - map: ["undershirt"]
         - map: ["jumpsuit"]
-        - map: ["enum.HumanoidVisualLayers.LHand"]
-        - map: ["enum.HumanoidVisualLayers.RHand"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: ["enum.BodyAppearanceLayer.LeftHand"]
+        - map: ["enum.BodyAppearanceLayer.RightHand"]
+        # WD EDIT END
         - map: ["enum.HumanoidVisualLayers.Handcuffs"]
           color: "#ffffff"
           sprite: Objects/Misc/handcuffs.rsi
@@ -201,7 +208,10 @@
         - map: ["head"]
         - map: ["pocket1"]
         - map: ["pocket2"]
-        - map: ["enum.HumanoidVisualLayers.Tail"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.Tail" ]
+        - map: [ "enum.BodyAppearanceLayer.Wings" ]
+        # WD EDIT END
     - type: MeleeWeapon
       soundHit:
         collection: AlienClaw
@@ -260,16 +270,21 @@
       drawdepth: Mobs
       scale: 0.85, 0.85 # Small
       layers:
-        - map: ["enum.HumanoidVisualLayers.Chest"]
-        - map: ["enum.HumanoidVisualLayers.Head"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.Chest" ]
+        - map: [ "enum.BodyAppearanceLayer.Groin" ]
+        - map: [ "enum.BodyAppearanceLayer.Head" ]
+        # WD EDIT END
         - map: ["enum.HumanoidVisualLayers.Snout"]
-        - map: ["enum.HumanoidVisualLayers.Eyes"]
+        - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
           shader: unshaded
         - map: ["enum.HumanoidVisualLayers.Face"]
-        - map: ["enum.HumanoidVisualLayers.RArm"]
-        - map: ["enum.HumanoidVisualLayers.LArm"]
-        - map: ["enum.HumanoidVisualLayers.RLeg"]
-        - map: ["enum.HumanoidVisualLayers.LLeg"]
+        # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+        - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+        - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+        - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+        # WD EDIT END
 #     - shader: StencilClear
 #      sprite: Mobs/Species/Human/parts.rsi
 #      state: l_leg
@@ -278,14 +293,18 @@
           sprite: Mobs/Customization/masking_helpers.rsi
           state: full
           visible: false
-        - map: ["enum.HumanoidVisualLayers.LFoot"]
-        - map: ["enum.HumanoidVisualLayers.RFoot"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+        - map: ["enum.BodyAppearanceLayer.RightFoot"]
+        # WD EDIT END
         - map: ["socks"]
         - map: ["underpants"]
         - map: ["undershirt"]
         - map: ["jumpsuit"]
-        - map: ["enum.HumanoidVisualLayers.LHand"]
-        - map: ["enum.HumanoidVisualLayers.RHand"]
+        # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+        - map: ["enum.BodyAppearanceLayer.LeftHand"]
+        - map: ["enum.BodyAppearanceLayer.RightHand"]
+        # WD EDIT END
         - map: ["enum.HumanoidVisualLayers.Handcuffs"]
           color: "#ffffff"
           sprite: Objects/Misc/handcuffs.rsi
@@ -310,4 +329,8 @@
         - map: ["head"]
         - map: ["pocket1"]
         - map: ["pocket2"]
-        - map: ["enum.HumanoidVisualLayers.Tail"]
+        - map: [ "enum.BodyAppearanceLayer.Tail" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+    # WD EDIT START
+    - type: Body
+      prototype: Shadowkin
+    # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
index b0350bf17c8..6682bccd184 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
@@ -15,7 +15,6 @@
     state: full
   - type: Body
     prototype: Skeleton
-    requiredLegs: 2
     gibSound: /Audio/Effects/bone_rattle.ogg
   - type: Damageable
     damageContainer: Biological
@@ -40,8 +39,7 @@
         !type:DamageTrigger
         damage: 150
       behaviors:
-      - !type:GibBehavior
-        gibContents: Skip
+      - !type:GibBehavior { }
   - type: SlowOnDamage #modified speeds because they're so weak
     speedModifierThresholds:
       60: 0.9
@@ -137,3 +135,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Skeleton
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 2889578528c..5da3b9b9c86 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -12,7 +12,6 @@
     state: full
   - type: Body
     prototype: Slime
-    requiredLegs: 2
   # they like eat it idk lol
   - type: Storage
     clickInsert: false
@@ -35,8 +34,6 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   # to prevent bag open/honk spam
   - type: UseDelay
     delay: 0.5
@@ -148,3 +145,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Slime
+  # WD EDIT END
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index d27722cf28e..2637956bf24 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -10,7 +10,6 @@
     state: vox_m
   - type: Body
     prototype: Vox
-    requiredLegs: 2
   - type:  HumanoidAppearance
     species: Vox
     #- type: VoxAccent # Not yet coded
@@ -51,20 +50,27 @@
         Slash: 5 # Reduce?
   - type: Sprite # Need to redefine the whole order to draw the tail over their gas tank
     layers:
-    - map: [ "enum.HumanoidVisualLayers.Chest" ]
-    - map: [ "enum.HumanoidVisualLayers.Head" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Chest" ]
+    - map: [ "enum.BodyAppearanceLayer.Groin" ]
+    - map: [ "enum.BodyAppearanceLayer.Head" ]
+    # WD EDIT END
     - map: [ "enum.HumanoidVisualLayers.Snout" ]
-    - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+    - map: [ "enum.BodyAppearanceLayer.Eyes" ] # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
     - map: [ "enum.HumanoidVisualLayers.Face" ]
-    - map: [ "enum.HumanoidVisualLayers.RArm" ]
-    - map: [ "enum.HumanoidVisualLayers.LArm" ]
-    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    # WD EDIT: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.RightArm" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftArm" ]
+    - map: [ "enum.BodyAppearanceLayer.RightLeg" ]
+    - map: [ "enum.BodyAppearanceLayer.LeftLeg" ]
+    # WD EDIT END
     - map: [ "jumpsuit" ]
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.LHand" ]
-    - map: [ "enum.HumanoidVisualLayers.RHand" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: ["enum.BodyAppearanceLayer.LeftFoot"]
+    - map: ["enum.BodyAppearanceLayer.RightFoot"]
+    - map: ["enum.BodyAppearanceLayer.LeftHand"]
+    - map: ["enum.BodyAppearanceLayer.RightHand"]
+    # WD EDIT END
     - map: [ "gloves" ]
     - map: [ "shoes" ]
     - map: [ "ears" ]
@@ -81,7 +87,10 @@
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
     - map: [ "suitstorage" ] # This is not in the default order
-    - map: [ "enum.HumanoidVisualLayers.Tail" ]
+    # WD EDIT START: HumanoidVisualLayers -> BodyAppearanceLayer
+    - map: [ "enum.BodyAppearanceLayer.Tail" ]
+    - map: [ "enum.BodyAppearanceLayer.Wings" ]
+    # WD EDIT END
     - map: [ "mask" ]
     - map: [ "head" ]
     - map: [ "pocket1" ]
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index d4643a1aef9..bedd70894fa 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -137,6 +137,7 @@
     damage:
       groups:
         Brute: 5
+  - type: TargetDoll # WD EDIT
 
 # Used for mobs that are affected by atmospherics, pressure, and heat
 - type: entity
@@ -235,7 +236,7 @@
   components:
   - type: SolutionContainerManager
   - type: InjectableSolution
-    solution: chemicals
+    solution: bloodstream # WD EDIT: chemicals -> bloodstream
   - type: Bloodstream
     bloodlossDamage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 5d057dda6c6..5392d01c428 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -86,14 +86,6 @@
   - type: DeleteOnTrigger
   - type: StaticPrice
     price: 0
-  # Shitmed Change
-  - type: Scalpel
-    speed: 0.45
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel2.ogg
 
 - type: entity
   parent: ShardBase
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index 72436552d2f..68a8262d629 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -26,14 +26,6 @@
         maxDistance: 2
   - type: UseDelay
     delay: 1.5
-  # Shitmed Change
-  - type: Tending
-    speed: 0.55
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
   - type: EmbeddableProjectile
     offset: 0.3,0.0
     removalTime: 0.0
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index e07583830f6..33b4d80c259 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -8,14 +8,6 @@
   - type: Item # TODO add inhand sprites for all utensils
     sprite: Objects/Misc/utensils.rsi
   - type: SpaceGarbage
-  # Shitmed Change
-  - type: Tweezers # Any utensil can poorly remove organs
-    speed: 0.2
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
 
 - type: entity
   parent: UtensilBase
@@ -60,9 +52,6 @@
     damage:
       types:
         Piercing: 5
-  # Shitmed Change
-  - type: Tweezers # Forks are better than spoons
-    speed: 0.35
   - type: DamageOtherOnHit
     staminaCost: 2.5
   - type: EmbeddableProjectile
@@ -83,9 +72,6 @@
   - type: Utensil
     types:
     - Fork
-  # Shitmed Change
-  - type: Tweezers # Forks are better than spoons
-    speed: 0.35
 
 - type: entity
   parent: UtensilBase
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 23b362954ee..99da248b801 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -77,16 +77,6 @@
   - type: Item
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     storedRotation: -90
-  # Shitmed Change
-  - type: Retractor # Same as wirecutters
-    speed: 0.35
-  - type: Hemostat
-    speed: 0.6
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor2.ogg
   - type: EmitSoundOnPickup # White Dream
     sound:
       path: /Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg
@@ -193,12 +183,6 @@
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
   - type: Execution # WWDP
-  # Shitmed Change
-  - type: BoneSaw
-    speed: 0.35
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
   - type: EmitSoundOnPickup # White Dream
     sound: /Audio/Items/unsheath.ogg
   - type: EmitSoundOnDrop
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/boxes.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/boxes.yml
index 536736fc904..d05dfe55874 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/boxes.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mail/Items/boxes.yml
@@ -63,25 +63,25 @@
   components:
   - type: StorageFill
     contents:
-    - id: HeadHuman
+    - id: BodyPartHeadHuman # WD EDIT
       amount: 1
-    - id: TorsoHuman
+    - id: BodyPartGroinHuman # WD EDIT
       amount: 1
-    - id: LeftArmHuman
+    - id: BodyPartLeftArmHuman # WD EDIT
       amount: 1
-    - id: RightArmHuman
+    - id: BodyPartRightArmHuman # WD EDIT
       amount: 1
-    - id: LeftHandHuman
+    - id: BodyPartLeftHandHuman # WD EDIT
       amount: 1
-    - id: RightHandHuman
+    - id: BodyPartRightHandHuman # WD EDIT
       amount: 1
-    - id: LeftLegHuman
+    - id: BodyPartLeftLegHuman # WD EDIT
       amount: 1
-    - id: RightLegHuman
+    - id: BodyPartRightLegHuman # WD EDIT
       amount: 1
-    - id: LeftFootHuman
+    - id: BodyPartLeftFootHuman # WD EDIT
       amount: 1
-    - id: RightFootHuman
+    - id: BodyPartRightFootHuman # WD EDIT
       amount: 1
   - type: Storage
     grid:
@@ -130,25 +130,25 @@
   components:
   - type: StorageFill
     contents:
-    - id: HeadReptilian
+    - id: BodyPartHeadReptilian # WD EDIT
       amount: 1
-    - id: TorsoReptilian
+    - id: BodyPartGroinReptilian # WD EDIT
       amount: 1
-    - id: LeftArmReptilian
+    - id: BodyPartLeftArmReptilian # WD EDIT
       amount: 1
-    - id: RightArmReptilian
+    - id: BodyPartRightArmReptilian # WD EDIT
       amount: 1
-    - id: LeftHandReptilian
+    - id: BodyPartLeftHandReptilian # WD EDIT
       amount: 1
-    - id: RightHandReptilian
+    - id: BodyPartRightHandReptilian # WD EDIT
       amount: 1
-    - id: LeftLegReptilian
+    - id: BodyPartLeftLegReptilian # WD EDIT
       amount: 1
-    - id: RightLegReptilian
+    - id: BodyPartRightLegReptilian # WD EDIT
       amount: 1
-    - id: LeftFootReptilian
+    - id: BodyPartLeftFootReptilian # WD EDIT
       amount: 1
-    - id: RightFootReptilian
+    - id: BodyPartRightFootReptilian # WD EDIT
       amount: 1
 
 - type: entity
@@ -160,25 +160,25 @@
   components:
   - type: StorageFill
     contents:
-    - id: HeadSlime
+    - id: BodyPartHeadSlime # WD EDIT
       amount: 1
-    - id: TorsoSlime
+    - id: BodyPartGroinSlime # WD EDIT
       amount: 1
-    - id: LeftArmSlime
+    - id: BodyPartLeftArmSlime # WD EDIT
       amount: 1
-    - id: RightArmSlime
+    - id: BodyPartRightArmSlime # WD EDIT
       amount: 1
-    - id: LeftHandSlime
+    - id: BodyPartLeftHandSlime # WD EDIT
       amount: 1
-    - id: RightHandSlime
+    - id: BodyPartRightHandSlime # WD EDIT
       amount: 1
-    - id: LeftLegSlime
+    - id: BodyPartLeftLegSlime # WD EDIT
       amount: 1
-    - id: RightLegSlime
+    - id: BodyPartRightLegSlime # WD EDIT
       amount: 1
-    - id: LeftFootSlime
+    - id: BodyPartLeftFootSlime # WD EDIT
       amount: 1
-    - id: RightFootSlime
+    - id: BodyPartRightFootSlime # WD EDIT
       amount: 1
 
 - type: entity
@@ -190,23 +190,23 @@
   components:
   - type: StorageFill
     contents:
-    - id: HeadVulpkanin
+    - id: BodyPartHeadVulpkanin # WD EDIT
       amount: 1
-    - id: TorsoVulpkanin
+    - id: BodyPartGroinVulpkanin # WD EDIT
       amount: 1
-    - id: LeftArmVulpkanin
+    - id: BodyPartLeftArmVulpkanin # WD EDIT
       amount: 1
-    - id: RightArmVulpkanin
+    - id: BodyPartRightArmVulpkanin # WD EDIT
       amount: 1
-    - id: LeftHandVulpkanin
+    - id: BodyPartLeftHandVulpkanin # WD EDIT
       amount: 1
-    - id: RightHandVulpkanin
+    - id: BodyPartRightHandVulpkanin # WD EDIT
       amount: 1
-    - id: LeftLegVulpkanin
+    - id: BodyPartLeftLegVulpkanin # WD EDIT
       amount: 1
-    - id: RightLegVulpkanin
+    - id: BodyPartRightLegVulpkanin # WD EDIT
       amount: 1
-    - id: LeftFootVulpkanin
+    - id: BodyPartLeftFootVulpkanin # WD EDIT
       amount: 1
-    - id: RightFootVulpkanin
+    - id: BodyPartRightFootVulpkanin # WD EDIT
       amount: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 27f9cb5bf2d..50d45229cb1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -7,11 +7,10 @@
   components:
   - type: Sprite
   - type: StaticPrice
-    price: 60
+    price: 20
   - type: Tag
     tags:
     - SurgeryTool
-  - type: SurgeryTool
 
 # Cautery
 
@@ -22,10 +21,10 @@
   description: A surgical tool used to cauterize open wounds.
   components:
   - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
     state: cautery
   - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi
+    sprite: Objects/Specific/Medical/Surgery/cautery.rsi
     storedRotation: 90
   - type: MeleeWeapon
     damage:
@@ -33,16 +32,6 @@
         Heat: 5
     soundHit:
       path: /Audio/Effects/lightburn.ogg
-  # Shitmed Change
-  - type: DamageOtherOnHit
-  - type: ThrowingAngle
-    angle: 45
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/cautery1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/cautery2.ogg
-  - type: Cautery
 
 # Drill
 
@@ -53,43 +42,21 @@
   description: A surgical drill for making holes into hard material.
   components:
   - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/drill.rsi
+    sprite: Objects/Specific/Medical/Surgery/drill.rsi
     state: drill
   - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/drill.rsi
+    sprite: Objects/Specific/Medical/Surgery/drill.rsi
     shape:
     - 0,0,1,0
     - 1,1,1,1
   - type: MeleeWeapon
-    attackRate: 1.25
-    range: 1.4
     damage:
       types:
-        Piercing: 8
-    heavyRateModifier: 1.5
-    heavyRangeModifier: 1.2
-    heavyDamageBaseModifier: 1.5
-    heavyStaminaCost: 2.5
-    maxTargets: 1
-    angle: 20
+        Piercing: 10
     soundHit:
       path: /Audio/Items/drill_hit.ogg
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Piercing: 11
-    staminaCost: 8
-  - type: EmbeddableProjectile
-  - type: EmbedPassiveDamage
-  - type: ThrowingAngle
-    angle: 90
   - type: StaticPrice
     price: 40
-  # Shitmed Change
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
-  - type: Drill
 
 # Scalpel
 
@@ -101,52 +68,24 @@
   components:
   - type: Sharp
     butcherDelayModifier: 1.5 # Butchering with a scalpel, regardless of the type, will take 50% longer
-  - type: Tool
-    qualities:
-    - Slicing
-    #speedModifier: 0.66 # pretend the sixes go on forever :)
   - type: Utensil
     types:
     - Knife
   - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: scalpel
   - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi
+    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     storedRotation: 90
   - type: MeleeWeapon
     wideAnimationRotation: 90
     swingLeft: true
-    attackRate: .8
-    range: 1.4
+    attackRate: 1.5
     damage:
       types:
-        Slash: 7.5
-    heavyRateModifier: 1.25
-    heavyRangeModifier: 1.2
-    heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 2.5
-    maxTargets: 1
-    angle: 20
+        Slash: 8
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
-  - type: DamageOtherOnHit
-    staminaCost: 5
-  - type: EmbeddableProjectile
-  - type: EmbedPassiveDamage
-  - type: ThrowingAngle
-    angle: 90
-  - type: Execution # WWDP
-  # Shitmed Change
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel2.ogg
-  - type: Scalpel
-  - type: Tag
-    tags:
-    - Knife
 
 - type: entity
   name: shiv
@@ -155,11 +94,8 @@
   description: A pointy piece of glass, abraded to an edge and wrapped in tape for a handle. # Could become a decent tool or weapon with right tool mods.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: shiv
   - type: Item
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-    storedRotation: 90
     heldPrefix: shiv
 
 - type: entity
@@ -169,21 +105,13 @@
   description: Made of more expensive materials, sharper and generally more reliable.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: advanced
   - type: Item
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-    storedRotation: 90
     heldPrefix: advanced
   - type: MeleeWeapon
     damage:
       types:
-        Slash: 8
-  - type: Scalpel # Shitmed
-    speed: 1.25
-  - type: Tag
-    tags:
-    - Knife
+        Slash: 12
 
 - type: entity
   name: laser scalpel
@@ -192,26 +120,11 @@
   description: A scalpel which uses a directed laser to slice instead of a blade, for more precise surgery while also cauterizing as it cuts.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: laser
   - type: Item
-    sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
-    storedRotation: 90
     heldPrefix: laser
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 6.5
-        Heat: 1
-  - type: Scalpel
-    speed: 1.25 # These shouldnt be obtainable but yknow they are better.
-  - type: Cautery
-    speed: 1.25
-  - type: Tag
-    tags:
-    - Knife
 
-# Retractor
+# Scissors
 
 - type: entity
   name: retractor
@@ -220,114 +133,30 @@
   description: A surgical tool used to hold open incisions.
   components:
   - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     state: retractor
   - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi
+    sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     storedRotation: 90
-  # Shitmed Change
-  - type: MeleeWeapon
-    wideAnimationRotation: 90
-    attackRate: 1.1
-    range: 1.4
-    damage:
-      types:
-        Slash: 3.5
-        Blunt: 3.0
-    heavyRateModifier: 1.25
-    heavyDamageBaseModifier: 1.75
-    heavyStaminaCost: 2.5
-    maxTargets: 1
-    angle: 20
-    soundHit:
-      path: /Audio/Weapons/bladeslice.ogg
-  - type: DamageOtherOnHit
-    staminaCost: 5
-  - type: ThrowingAngle
-    angle: 315
-  - type: EmbeddableProjectile
-  - type: EmbedPassiveDamage
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor2.ogg
-  - type: Retractor
-
-# Hemostat
 
 - type: entity
   name: hemostat
   id: Hemostat
-  parent: BaseToolSurgery # Shitmed Change
+  parent: Retractor
   description: A surgical tool used to compress blood vessels to prevent bleeding.
   components:
   - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi # Shitmed Change
     state: hemostat
   - type: Item
     heldPrefix: hemostat
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi # Shitmed Change
     storedRotation: 90
-  - type: MeleeWeapon
-    wideAnimationRotation: 90
-    attackRate: 1.1
-    range: 1.4
-    damage:
-      types:
-        Slash: 6
-    heavyRateModifier: 1.25
-    heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 2.5
-    maxTargets: 2
-    angle: 40
-    soundHit:
-      path: /Audio/Weapons/bladeslice.ogg
-  - type: DamageOtherOnHit
-    staminaCost: 5
-  - type: EmbeddableProjectile
-  - type: EmbedPassiveDamage
-  - type: ThrowingAngle
-    angle: 35
-  # Shitmed Change
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
-  - type: Hemostat
-  - type: Tweezers # Shitmed
-  - type: Tending # Shitmed
-
-# Bone setter - Shitmed Change
-- type: entity
-  parent: BaseToolSurgery
-  id: Bonesetter
-  name: bone setter
-  description: Used for setting bones back into place.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi
-    state: bonesetter
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi
-  - type: BoneSetter
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/bone_setter.ogg
-
-# Bone Gel - Shitmed Change
-- 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: _Shitmed/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
@@ -350,31 +179,7 @@
   - type: Tool
     qualities:
     - Sawing
-  - type: MeleeWeapon
-    attackRate: 1.3
-    range: 1.35
-    damage:
-      types:
-        Blunt: 2.5
-        Slash: 6.5
-    heavyRateModifier: 3
-    heavyDamageBaseModifier: 2.0
-    heavyStaminaCost: 20
-    maxTargets: 8
-    angle: 20
-    soundHit:
-      path: /Audio/Weapons/bladeslice.ogg
-  - type: DamageOtherOnHit
-    staminaCost: 10
-  - type: EmbeddableProjectile
-  - type: EmbedPassiveDamage
-  - type: ThrowingAngle
-    angle: 0
-  # Shitmed Change
-  - type: BoneSaw
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
+# No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.
 
 - type: entity
   name: choppa
@@ -388,25 +193,13 @@
     size: Small
     heldPrefix: improv
   - type: MeleeWeapon
-    attackRate: 1.1
     damage:
-      types:
-        Blunt: 3
-        Slash: 7
-    bluntStaminaDamageFactor: 3
-    heavyRateModifier: 1.25
-    heavyDamageBaseModifier: 1.25
-    heavyStaminaCost: 20
-    maxTargets: 8
-    angle: 20
+      groups:
+        Brute: 10
     soundHit:
       path: /Audio/Weapons/bladeslice.ogg
-  - type: ThrowingAngle
-    angle: 90
   - type: Tool
     speedModifier: 0.5
-  - type: BoneSaw # Shitmed
-    speed: 0.5
 
 - type: entity
   name: circular saw
@@ -415,44 +208,17 @@
   description: For heavy duty cutting.
   components:
   - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-saw
+    state: electric
   - type: Item
-    size: Normal
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    storedRotation: 90
+    heldPrefix: electric
   - type: MeleeWeapon
-    attackRate: .8
-    range: 1.4
-    bluntStaminaDamageFactor: 3.0
     damage:
-      types:
-        Blunt: 4.5
-        Slash: 5.5
-    heavyRateModifier: 2
-    heavyRangeModifier: 1.2
-    heavyDamageBaseModifier: 1
-    heavyStaminaCost: 10
-    maxTargets: 8
-    angle: 360
+      groups:
+        Brute: 15
     soundHit:
       path: /Audio/Items/drill_hit.ogg
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Slash: 10
-    staminaCost: 14
-  - type: ThrowingAngle
-    angle: 90
   - type: Tool
-    qualities:
-    - Sawing
     speedModifier: 1.5
-  - type: BoneSaw # Shitmed
-    speed: 1.5
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
 
 - type: entity
   name: advanced circular saw
@@ -461,308 +227,10 @@
   description: You think you can cut anything with it.
   components:
   - type: Sprite
-    sprite: Objects/Specific/Medical/Surgery/saw.rsi
     state: advanced
   - type: Item
-    size: Normal
-    sprite: Objects/Specific/Medical/Surgery/saw.rsi
     heldPrefix: advanced
   - type: MeleeWeapon
-    attackRate: .8
-    range: 1.4
-    bluntStaminaDamageFactor: 5.0
-    damage:
-      types:
-        Blunt: 4.5
-        Slash: 7.5
-    heavyRateModifier: 2
-    heavyRangeModifier: 1.2
-    heavyDamageBaseModifier: 1
-    heavyStaminaCost: 10
-    maxTargets: 8
-    angle: 360
-    soundHit:
-      path: /Audio/Items/drill_hit.ogg
-  - type: DamageOtherOnHit
-    damage:
-      types:
-        Slash: 12
-    staminaCost: 14
-  - type: ThrowingAngle
-    angle: 90
+    attackRate: 1.5
   - type: Tool
     speedModifier: 2.0
-  - type: BoneSaw # Shitmed
-    speed: 2
-
-# Shitmed Tools
-
-- type: entity
-  name: searing tool
-  id: EnergyCautery
-  parent: Cautery
-  description: A cautery with an energy tip, also serves as a drill in its powered state.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi
-    state: e-cautery-on
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi
-    inhandVisuals:
-      left:
-      - state: on-inhand-left
-      right:
-      - state: on-inhand-right
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/cautery1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/cautery2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Piercing: 10
-        Heat: 1
-  - type: PhysicalComposition #Goobstation - Recycle update
-    materialComposition:
-      Steel: 150
-      Glass: 37
-      Plasma: 37
-  - type: ItemSwitch
-    showLabel: true
-    state: cautery
-    states:
-      cautery: !type:ItemSwitchState
-        verb: cautery
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi
-          state: e-cautery
-        components:
-        - type: Cautery
-          speed: 1.5
-        soundStateActivate:
-          collection: WelderOn
-          params:
-            variation: 0.125
-            volume: -5
-
-      drill: !type:ItemSwitchState
-        verb: drill
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi
-          state: e-cautery-on
-        components:
-        - type: Drill
-          speed: 1.5
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.125
-            volume: -5
-
-- type: entity
-  name: energy scalpel
-  id: EnergyScalpel
-  parent: Scalpel
-  description: A scalpel which uses an energy blade, also serves as a saw in its powered state.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-    state: e-scalpel-on
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-    inhandVisuals:
-      left:
-      - state: on-inhand-left
-      right:
-      - state: on-inhand-right
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 10
-        Heat: 1
-  - type: PhysicalComposition #Goobstation - Recycle update
-    materialComposition:
-      Steel: 150
-      Glass: 37
-      Gold: 37
-  - type: ItemSwitch
-    showLabel: true
-    state: scalpel
-    states:
-      scalpel: !type:ItemSwitchState
-        verb: scalpel
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-          state: e-scalpel
-        components:
-        - type: Scalpel
-          speed: 1.5
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.125
-            volume: -5
-
-      saw: !type:ItemSwitchState
-        verb: saw
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-          state: e-scalpel-on
-        components:
-        - type: BoneSaw
-          speed: 1.5
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.125
-            volume: -5
-
-- type: entity
-  name: mechanical pinches
-  id: AdvancedRetractor
-  parent: Retractor
-  description: A retractor with mechanical pinches, also serves as a hemostat in its powered state.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi
-    state: adv-retractor-on
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi
-    inhandVisuals:
-      left:
-      - state: on-inhand-left
-      right:
-      - state: on-inhand-right
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 6.5
-        Heat: 1
-  - type: PhysicalComposition #Goobstation - Recycle update
-    materialComposition:
-      Steel: 150
-      Glass: 37
-      Silver: 37
-  - type: ItemSwitch
-    showLabel: true
-    state: retractor
-    states:
-      retractor: !type:ItemSwitchState
-        verb: retractor
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi
-          state: adv-retractor
-        components:
-        - type: Retractor
-          speed: 1.5
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.125
-            volume: -5
-
-      hemostat: !type:ItemSwitchState
-        verb: hemostat
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi
-          state: adv-retractor-on
-        components:
-        - type: Hemostat
-          speed: 1.5
-        - type: Tweezers
-          speed: 1.5
-        - type: Tending
-          speed: 1.5
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.125
-            volume: -5
-
-- type: entity
-  name: medical multitool
-  description: "A complex, refined medical multitool, designed by Nanotrasen to speed up operation times, as well as conserve space."
-  id: OmnimedTool
-  parent: BaseToolSurgery
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi
-    state: omnimed
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
-  - type: Hemostat
-    speed: 2
-  - type: Scalpel
-    speed: 2
-  - type: Drill
-    speed: 2
-  - type: BoneSetter
-    speed: 2
-  - type: Retractor
-    speed: 2
-  - type: Cautery
-    speed: 2
-  - type: BoneGel
-    speed: 2
-  - type: BoneSaw
-    speed: 2
-  - type: Tweezers
-    speed: 2
-  - type: Tending
-    speed: 2
-
-- type: entity
-  parent: OmnimedTool
-  id: OmnimedToolSyndie
-  components:
-  - type: Sprite
-    state: evil
-  - type: Item
-    size: Small
-    heldPrefix: evil
-
-- type: entity
-  name: CMO's proto multitool
-  description: "A prototypical medical multitool designed by Nanotrasen to save valuable space in the backpacks of high ranking medical officers."
-  id: OmnimedToolLite
-  parent: OmnimedTool
-  components:
-  - type: Sprite
-    state: cmotool
-  - type: Item
-    heldPrefix: cmotool
-  - type: SurgeryTool
-  - type: Hemostat
-    speed: 1.25
-  - type: Scalpel
-    speed: 1.25
-  - type: Drill
-    speed: 1.25
-  - type: BoneSetter
-    speed: 1.25
-  - type: Retractor
-    speed: 1.25
-  - type: Cautery
-    speed: 1.25
-  - type: BoneGel
-    speed: 1.25
-  - type: BoneSaw
-    speed: 1.25
-  - type: Tweezers
-    speed: 1.25
-  - type: Tending
-    speed: 1.25
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 2c05e18e4cc..744c2b7d6f9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -700,64 +700,3 @@
     - SelfDestructSeq
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }
-
-# Shitmed Modules
-
-- type: entity
-  id: BorgModuleSurgery
-  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: surgery cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: medical
-    - state: icon-surgery
-  - type: ItemBorgModule
-    items:
-    - Scalpel
-    - Drill
-    - Hemostat
-    - Retractor
-    - Cautery
-    - SawElectric
-    - BoneGel
-    # Frontier: droppable borg items
-    droppableItems:
-    - id: OrganHumanHeart
-      whitelist:
-        components:
-        - BodyPart
-        - Organ
-        tags:
-        - Organ
-    # End Frontier: droppable borg items
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: surgery-module }
-
-- type: entity
-  id: BorgModuleAdvancedSurgery
-  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: advanced surgery cyborg module
-  components:
-  - type: Sprite
-    layers:
-    - state: medical
-    - state: icon-advanced-surgery
-  - type: ItemBorgModule
-    items:
-    - EnergyScalpel
-    - EnergyCautery
-    - AdvancedRetractor
-    - BoneGel
-    # Frontier: droppable borg items
-    droppableItems:
-    - id: OrganHumanHeart
-      whitelist:
-        components:
-        - BodyPart
-        - Organ
-        tags:
-        - Organ
-    # End Frontier: droppable borg items
-  - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-surgery-module }
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
index 381f95f1def..5af35b06593 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
@@ -54,9 +54,8 @@
     speaks: [TauCetiBasic, RobotTalk]
     understands: [TauCetiBasic, RobotTalk]
   - type: Brain # IPCMMI
-    active: false
+    # active: false
   - type: Organ
-    slotId: posibrain
 
 - type: entity
   parent: MMI
@@ -67,7 +66,7 @@
     slots:
       brain_slot:
         name: "Brain"
-        startingItem: OrganHumanBrain
+        startingItem: OrganBrainHuman # WD EDIT: OrganHumanBrain -> OrganBrainHuman
         whitelist:
           tags: # IPCMMI - changed component requirement to a tag bc you'd be able to infinitely stack regular + reverse MMIs otherwise
           - Brain
@@ -103,7 +102,7 @@
   - type: BlockMovement
   - type: Examiner
   - type: Brain # hopefully this doesn't break everything
-    active: false
+    # active: false
   - type: BorgBrain
   - type: IntrinsicRadioReceiver
   - type: IntrinsicRadioTransmitter
@@ -141,7 +140,6 @@
     - Cyborgs
     - Robotics
   - type: Organ # Estacao Pirata - IPCs
-    slotId: posibrain
   - type: LanguageSpeaker
   - type: LanguageKnowledge
     speaks: [RobotTalk]
diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
index 50f573f7bfb..038aa1bcbd5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
@@ -55,11 +55,6 @@
     size: Normal
     shape:
     - 0,0,0,1
-  # Shitmed Change
-  - type: Tweezers
-    speed: 0.55
-  - type: SurgeryTool
-    startSound: /Audio/Items/crowbar.ogg
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 6bb918bce13..97a2c8b5612 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -102,14 +102,6 @@
     radius: 1.1 #smallest possible
     color: orange
   - type: ItemTogglePointLight
-  # Shitmed Change
-  - type: Cautery
-    speed: 0.45
-  - type: SurgeryTool
-    startSound:
-      collection: lighterOnSounds
-    endSound:
-      collection: lighterOffSounds
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index 07f548c81c6..777ab304309 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -41,14 +41,6 @@
     unlitIcon: match_unlit
     litIcon: match_lit
     burntIcon: match_burnt
-  # Shitmed Change
-  - type: Cautery
-    speed: 0.2
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
-    endSound:
-      path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
   # WWDP quick crafts
   - type: Construction
     graph: MaterialGunpowderGraph
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 4b96931f7d2..5b878fe8186 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -66,20 +66,6 @@
       Steel: 100
   - type: StaticPrice
     price: 30
-  # Shitmed Change
-  - type: Retractor
-    speed: 0.35
-  - type: Hemostat
-    speed: 0.6
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Items/wirecutter.ogg
-      params:
-        variation: 0.125
-    endSound:
-      path: /Audio/Items/wirecutter.ogg
-      params:
-        variation: 0.125
   - type: Fixtures
     fixtures:
       fix1:
@@ -160,16 +146,6 @@
       Steel: 100
   - type: StaticPrice
     price: 30
-  # Shitmed Change
-  - type: Retractor
-    speed: 0.45
-  - type: Tending
-    speed: 0.65
-  - type: SurgeryTool
-    startSound:
-      collection: Screwdriver
-    endSound:
-      path: /Audio/Medical/Surgery/retractor2.ogg
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index aa5226e14a0..122ddb7eee5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -128,14 +128,6 @@
         Blunt: -15
         Piercing: -15
         Slash: -15
-  # Shitmed Change
-  - type: Cautery
-    speed: 0.7
-  - type: SurgeryTool
-    startSound:
-      collection: Welder
-    endSound:
-      collection: WelderOff
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 520ffadaaae..44af1c65d16 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -51,12 +51,6 @@
         Blunt: 2.5
   - type: DamageOtherOnHit
     staminaCost: 7
-  # Shitmed Change
-  - type: Cautery
-    speed: 0.9
-  - type: SurgeryTool
-    endSound:
-      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
   # WD EDIT START
   - type: DisarmMalus
     malus: 0.3
@@ -125,12 +119,6 @@
         Blunt: 2.5
   - type: DamageOtherOnHit
     staminaCost: 7
-  # Shitmed Change
-  - type: Cautery
-    speed: 0.9
-  - type: SurgeryTool
-    endSound:
-      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
 
 - type: entity
   id: BaseWeaponBatterySmall
@@ -1150,4 +1138,4 @@
     autoRecharge: true
     autoRechargeRate: 24
     autoRechargePause: true
-    autoRechargePauseTime: 10
\ No newline at end of file
+    autoRechargePauseTime: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index ca525c25f42..ba62fa6ee1b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -22,11 +22,3 @@
   - type: Utensil
     types:
     - Knife
-  # Shitmed Change
-  - type: Scalpel
-    speed: 0.3
-  - type: BoneSaw
-    speed: 0.75
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/saw.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
index 149fb0278a8..17e81f90f6d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -22,8 +22,6 @@
         Slash: 2
         Blunt: 2
         Structural: 4
-    clickPartDamageMultiplier: 3
-    heavyPartDamageMultiplier: 2.5
     heavyRateModifier: 3
     heavyDamageBaseModifier: 3.0
     heavyStaminaCost: 2.5
@@ -58,11 +56,3 @@
         maxVol: 300
   - type: UseDelay
     delay: 1
-  # Shitmed Change
-  - type: BoneSaw
-    speed: 6.5 # TODO: arm-mounted version becomes 0.65 - We dont have that though???
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Weapons/chainsawwield.ogg
-    endSound:
-      path: /Audio/Weapons/chainsaw.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index e6b2f9f0f65..b1dedf1c562 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -50,7 +50,6 @@
     damage:
       types:
         Blunt: 2.5
-    clickPartDamageMultiplier: 1.75 # WD EDIT: 3 -> 1.75
   - type: ItemToggleDamageOtherOnHit
     activatedStaminaCost: 6
   - type: DamageOtherOnHit
@@ -80,17 +79,6 @@
   - type: Reflect
   - type: IgnitionSource
     temperature: 700
-  - type: Scalpel
-    speed: 0.75
-  - type: Cautery
-    speed: 0.2
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Weapons/ebladehum.ogg
-    endSound:
-      path: /Audio/Weapons/eblade1.ogg
-      params:
-        variation: 0.250
   - type: Tag
     tags:
     - NoPaint
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index d120f126197..67425b9b708 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -63,14 +63,6 @@
     stealGroup: FireAxe
   - type: IgniteOnMeleeHit
     fireStacks: -4
-  # Shitmed Change
-  - type: Scalpel
-    speed: 0.3
-  - type: BoneSaw
-    speed: 0.5
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/saw.ogg
 
 - type: entity
   id: FireAxeFlaming
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 064cf5dcd59..71cca767728 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -39,14 +39,6 @@
     - Slicing
     useSound:
       path: /Audio/Items/Culinary/chop.ogg
-  # Shitmed Change
-  - type: Scalpel
-    speed: 0.65
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/Medical/Surgery/scalpel2.ogg
   - type: EmitSoundOnPickup # White Dream
     sound: /Audio/Items/unsheath.ogg
 
@@ -103,11 +95,6 @@
     guides:
     - Chef
     - FoodRecipes
-  # Shitmed Change
-  - type: Scalpel
-    speed: 0.3
-  - type: BoneSaw
-    speed: 0.5
 
 - type: entity
   name: combat knife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index cf80758141b..1f26f06b086 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -45,8 +45,6 @@
     damage:
       types:
         Slash: 15
-    clickPartDamageMultiplier: 3
-    heavyPartDamageMultiplier: 2.5
     heavyRateModifier: 1.25
     lightRangeModifier: 1.25
     heavyDamageBaseModifier: 1
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index a7fe1dc7d60..627a262b3c5 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -1,5 +1,4 @@
 - type: entity
-  name: "item"
   id: BaseItem
   abstract: true
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
index 3a9ebfde62f..828eb4283d1 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
@@ -2,7 +2,7 @@
   id: OperatingTable
   parent: Bed
   name: operating table
-  description: Used for advanced medical procedures. # Shitmed
+  description: Special medical table for surgery. This one just seems to be a useless prop, though.
   components:
   - type: Sprite
     sprite: Structures/Furniture/Tables/optable.rsi
@@ -11,7 +11,6 @@
   - type: Icon
     sprite: Structures/Furniture/Tables/optable.rsi
     state: operating_table
-  - type: OperatingTable
   - type: Fixtures # WWDP
     fixtures:
       fix1:
@@ -24,27 +23,3 @@
         layer:
         - MidImpassable # can move through when climbing/prone
         - BulletImpassable
-  # Begin Shitmed Changes
-  # - type: Construction
-  #   graph: Machine
-  #   node: machine
-  #   containers:
-  #    - machine_board
-  #    - machine_parts
-  # - type: Machine
-  #   board: OperatingTableCircuitboard
-  # - type: ContainerContainer
-  #   containers:
-  #     machine_board: !type:Container
-  #     machine_parts: !type:Container
-  - type: Construction
-    graph: bed
-    node: operatingtable
-  - type: DeviceList
-  - type: DeviceNetwork
-    deviceNetId: Wired
-  - type: DeviceLinkSource
-    range: 2
-    ports:
-    - OperatingTable
-  # End Shitmed Changes
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index 155d0426059..56a228349b9 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -516,9 +516,9 @@
       - id: ClothingOuterDogi
         prob: 0.00001
         orGroup: dressersecondloot
-      - id: HeadHuman
+      - id: BodyPartHeadHuman # WD EDIT
         prob: 0.00001
         orGroup: dressersecondloot
-      - id: OrganHumanKidneys
+      - id: OrganKidneysHuman # WD EDIT
         prob: 0.00001
         orGroup: dressersecondloot
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d55cc342d6c..c88a5d73d82 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -344,7 +344,6 @@
     - MechEquipment
     # EE EDIT START
     - Modsuit
-    - Cybernetics
     # EE EDIT END
   - type: EmagLatheRecipes
     emagDynamicPacks:
@@ -448,7 +447,6 @@
     - SecurityWeapons
     # EE EDIT START
     - SecurityClothing
-    - SecurityCybernetics
     - MechEquipmentSecurity
     # EE EDIT END
   - type: MaterialStorage
@@ -534,7 +532,6 @@
     - Chemistry
     - BodyBag # WD EDIT
   # EE EDIT START
-    - Surgery
     - MedicalClothing
   - type: EmagLatheRecipes
     emagStaticPacks:
diff --git a/Resources/Prototypes/EntityLists/Tools/surgery.yml b/Resources/Prototypes/EntityLists/Tools/surgery.yml
index ee10d148ea7..7d0c09bfc3f 100644
--- a/Resources/Prototypes/EntityLists/Tools/surgery.yml
+++ b/Resources/Prototypes/EntityLists/Tools/surgery.yml
@@ -6,11 +6,5 @@
   - ScalpelLaser
   - Retractor
   - Hemostat
-  - SawAdvanced
-  # Shitmed Change
-  - Scalpel
-  - SawElectric
-  - Bonesetter
-  - BoneGel
   - Saw
-# - Drapes
\ No newline at end of file
+# - Drapes
diff --git a/Resources/Prototypes/GameRules/dynamic_rules.yml b/Resources/Prototypes/GameRules/dynamic_rules.yml
index a9fc8412cc3..81fc115739e 100644
--- a/Resources/Prototypes/GameRules/dynamic_rules.yml
+++ b/Resources/Prototypes/GameRules/dynamic_rules.yml
@@ -155,22 +155,6 @@
           - !type:RoundDurationCondition
             min: 2100 # 35 minutes
         # WD edit start
-        - id: LoneAbductorSpawn
-          weight: 7.5
-          conditions:
-          - !type:HasBudgetCondition
-          - !type:PlayerCountCondition
-            min: 10
-          - !type:RoundDurationCondition
-            min: 900 # 15 minutes
-        - id: DuoAbductorSpawn
-          weight: 7.5
-          conditions:
-          - !type:HasBudgetCondition
-          - !type:PlayerCountCondition
-            min: 20
-          - !type:RoundDurationCondition
-            min: 900 # 15 minutes
         - id: XenomorphsInfestation
           weight: 5
           conditions:
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 99250ea8fe1..b1f4e3ebcb1 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -142,8 +142,8 @@
       - type: NpcFactionMember
         factions:
         - Syndicate
-      - type: SurgerySpeedModifier # WWDP
-        speedModifier: 5
+      # - type: SurgerySpeedModifier # WWDP
+      #   speedModifier: 5
       mindRoles:
       - MindRoleNukeopsMedic
     - prefRoles: [ Nukeops ]
diff --git a/Resources/Prototypes/Guidebook/antagonist.yml b/Resources/Prototypes/Guidebook/antagonist.yml
index f7fb54bc3ae..bef3e33460d 100644
--- a/Resources/Prototypes/Guidebook/antagonist.yml
+++ b/Resources/Prototypes/Guidebook/antagonist.yml
@@ -13,7 +13,6 @@
   - MinorAntagonists
   - Changelings # Goobstation - changelings
   - Blob # Goobstation - Blob
-  - Abductors # Shitmed - Abductors
   - Devil # Goob content
   - Shadowlings
   # WD EDIT START
diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml
index 7259f8cd279..81d1d0af588 100644
--- a/Resources/Prototypes/Guidebook/medical.yml
+++ b/Resources/Prototypes/Guidebook/medical.yml
@@ -7,7 +7,6 @@
   - Chemist
   - Cloning
   - Cryogenics
-  - Surgery
   - Medical Patches # Fix for Medicine Patches
 
 - type: guideEntry
diff --git a/Resources/Prototypes/Mapping/mapping_templates.yml b/Resources/Prototypes/Mapping/mapping_templates.yml
index 377295976b2..21076f1d879 100644
--- a/Resources/Prototypes/Mapping/mapping_templates.yml
+++ b/Resources/Prototypes/Mapping/mapping_templates.yml
@@ -1765,8 +1765,6 @@
           id: ClothingMaskBreathMedical # WWDP edit
         - !type:MappingTemplatePrototype
           id: SinkWide # WWDP edit
-        - !type:MappingTemplatePrototype
-          id: MedicalBiofabricator # WWDP edit
     - !type:MappingTemplatePrototype
       id: Virology
       children:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml
deleted file mode 100644
index 23934b3ebcc..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-- type: entity
-  id: OrganVampiricHumanoidStomach
-  parent: OrganHumanStomach
-  components:
-  - type: Metabolizer
-    # mm yummy
-    maxReagents: 3
-    metabolizerTypes: [Vampiric]
-    groups:
-    - id: Food
-    - id: Drink
-
-- type: entity
-  id: OrganVampiricStomach
-  parent: OrganAnimalStomach
-  components:
-  - type: Metabolizer
-    maxReagents: 3
-    metabolizerTypes: [Vampiric]
-    groups:
-    - id: Food
-    - id: Drink
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
deleted file mode 100644
index b52a91c1182..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-- type: entity
-  id: PartSpider
-  parent: BaseItem
-  name: "spider body part"
-  abstract: true
-  components:
-  - type: Damageable
-    damageContainer: OrganicPart
-  - type: BodyPart
-  - type: ContainerContainer
-    containers:
-      bodypart: !type:Container
-        ents: []
-  - type: StaticPrice
-    price: 100
-  - type: Tag
-    tags:
-      - Trash
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: DemonsBlood
-        Quantity: 10
-
-- type: entity
-  id: ThoraxSpider
-  name: "spider thorax" #for arachne, actual spiders should get a cephalothorax that combines with head.
-  parent: PartSpider
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Moth/parts.rsi # placeholder sprite
-    state: "torso_m"
-  - type: Icon
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: "torso_m"
-  - type: BodyPart #"Other" type
-    slotId: thorax
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: DemonsBlood
-        Quantity: 20
-
-- type: entity
-  id: RightLegSpider
-  name: "right spider leg"
-  parent: PartSpider
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Food/meat.rsi # placeholder sprite
-    state: spiderleg
-  - type: Icon
-    sprite: Objects/Consumable/Food/meat.rsi
-    state: spiderleg
-  - type: BodyPart
-    partType: Leg
-    symmetry: Right
-  - type: MovementBodyPart #should actual spiders get a seperate part from arachne?
-    walkSpeed : 2.7
-    sprintSpeed : 5
-
-- type: entity
-  id: LeftLegSpider
-  name: "left spider leg"
-  parent: PartSpider
-  components:
-  - type: Sprite
-    sprite: Objects/Consumable/Food/meat.rsi # placeholder sprite
-    state: spiderleg
-  - type: Icon
-    sprite: Objects/Consumable/Food/meat.rsi
-    state: spiderleg
-  - type: BodyPart
-    partType: Leg
-    symmetry: Left
-  - type: MovementBodyPart #should actual spiders get a seperate part from arachne?
-    walkSpeed : 2.7
-    sprintSpeed : 5
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
deleted file mode 100644
index ea399ea341f..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-- type: body
-  id: Arachne
-  name: "arachne"
-  root: torso
-  slots:
-    head:
-      part: HeadHuman
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoHuman
-      connections:
-      - left arm
-      - right arm
-      - thorax
-      - head
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganVampiricHumanoidStomach
-        liver:  OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmHuman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHuman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHuman
-    left hand:
-      part: LeftHandHuman
-    thorax:
-      part: ThoraxSpider
-      connections:
-        # The slots needs to start with (symmetry) (part) or they're not gonna be registered
-        - left leg (fore)
-        - left leg (second)
-        - left leg (third)
-        - left leg (hind)
-        - right leg (fore)
-        - right leg (second)
-        - right leg (third)
-        - right leg (hind)
-    left leg (fore):
-      part: LeftLegSpider
-    left leg (second):
-      part: LeftLegSpider
-    left leg (third):
-      part: LeftLegSpider
-    left leg (hind):
-      part: LeftLegSpider
-    right leg (fore):
-      part: RightLegSpider
-    right leg (second):
-      part: RightLegSpider
-    right leg (third):
-      part: RightLegSpider
-    right leg (hind):
-      part: RightLegSpider
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
deleted file mode 100644
index 2ea5a761af0..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/felinid.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Felinid
-  name: "felinid"
-  root: torso
-  slots:
-    head:
-      part: HeadHuman
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoHuman
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed Change
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganHumanLungs
-        stomach: OrganVulpkaninStomach
-        liver:  OrganAnimalLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmHuman
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmHuman
-      connections:
-      - left hand
-    right hand:
-      part: RightHandHuman
-    left hand:
-      part: LeftHandHuman
-    right leg:
-      part: RightLegHuman
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegHuman
-      connections:
-      - left foot
-    right foot:
-      part: RightFootHuman
-    left foot:
-      part: LeftFootHuman
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/vampiricanimal.yml b/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/vampiricanimal.yml
deleted file mode 100644
index 3f4cdb06de1..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/vampiricanimal.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-- type: body
-  id: VampiricAnimal
-  name: "vampiric animal"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganVampiricStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
-
-- type: body
-  id: VampiricAnimalLarge
-  name: "large vampiric animal"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganVampiricHumanoidStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
index 8dc10626653..abef1379797 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -32,9 +32,11 @@
         shader: unshaded
   - type: HideLayerClothing
     slots:
-    - Snout
-    - Hair
-    
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
+
 
 - type: entity
   parent: ClothingHeadHelmetHardsuitCybersun
@@ -54,9 +56,11 @@
         shader: unshaded
   - type: HideLayerClothing
     slots:
-    - Snout
-    - Hair
-    - Head
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.BodyAppearanceLayer.Head
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadHelmetHardsuitERTLeader
@@ -76,4 +80,4 @@
       - state: on-equipped-HELMET
       - state: on-equipped-HELMET-unshaded
         shader: unshaded
-  
+
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml
index 39dca5ef9ab..b66fbda3115 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml
@@ -1,69 +1,90 @@
 - type: marking
   id: OniHornSingleCurved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: single_curved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornSingleLeftCurved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: single_left_curved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornSingleRightCurved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: single_right_curved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleCurvedOutwards
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: double_curved_outwards
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleCurved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: double_curved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleLeftBrokeCurved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: double_left_broke_curved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: OniHornDoubleRightBrokeCurved
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: false
   speciesRestriction: [Oni]
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi
     state: double_right_broke_curved
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml
index 33e45980da9..2c0830db43a 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml
@@ -2,152 +2,276 @@
 
 - type: marking
   id: FelinidEarsBasic
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: basic_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: basic_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FelinidEarsCurled
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: curled_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: curled_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FelinidEarsDroopy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: droopy_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: droopy_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FelinidEarsFuzzy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: basic_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: fuzzy_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FelinidEarsStubby
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: stubby_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: stubby_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FelinidEarsTall
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: tall_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: tall_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: tall_fuzz
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FelinidEarsTorn
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: torn_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: torn_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FelinidEarsWide
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Humans get felinid markings, Tajaran directly use felinid tails
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: wide_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
     state: wide_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 # Felinid Tails
 
 - type: marking
   id: FelinidTailBasic
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Humans get felinid markings
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_even
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_odd
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: FelinidTailBasicWithBow
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Humans get felinid markings, Tajaran directly use felinid tails
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_even
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_odd
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_bow
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: FelinidTailBasicWithBell
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Humans get felinid markings, Tajaran directly use felinid tails
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_even
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_odd
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_bell
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: FelinidTailBasicWithBowAndBell
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Felinid, Human, Tajaran] # Einstein Engines - Humans get felinid markings, Tajaran directly use felinid tails
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_tip
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_even
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_tail_stripes_odd
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_bow
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
     state: basic_bell
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml
index 9b9cc6562af..9ad789d0f87 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/moth.yml
@@ -1,7 +1,6 @@
 # Antennas
 - type: marking
   id: MothAntennasClassicAspen
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -13,10 +12,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: aspen
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicBrown
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -28,10 +30,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: brown
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicDeathshead
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -43,10 +48,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: deathshead
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicFeathery
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -58,10 +66,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: feathery
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicFirewatch
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -73,10 +84,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: firewatch
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicGothic
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -88,10 +102,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: gothic
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicJungle
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -103,10 +120,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: jungle
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicLovers
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -118,10 +138,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: lovers
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicMint
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -133,10 +156,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: mint
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicMoffra
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -148,10 +174,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: moffra
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicMoonfly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -163,10 +192,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: moonfly
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicOakworm
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -178,10 +210,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: oakworm
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicPlain
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -193,10 +228,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: plain
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicPlasmafire
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -208,10 +246,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: plasmafire
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicPoison
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -223,10 +264,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: poison
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicReddish
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -238,10 +282,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: reddish
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicRegal
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -253,10 +300,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: regal
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicRosy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -268,10 +318,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: rosy
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicRoyal
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -283,10 +336,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: royal
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicSnow
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -298,10 +354,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: snow
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicWhitefly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -313,10 +372,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: whitefly
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothAntennasClassicWitchking
-  bodyPart: HeadTop
   markingCategory: HeadTop
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -328,12 +390,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_antennas.rsi
     state: witchking
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 # Wings
 - type: marking
   id: MothWingsClassicAspen
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -344,11 +409,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: aspen
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicAtlas
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -359,11 +428,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: atlas
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicBrown
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -374,11 +447,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: brown
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicDeathshead
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -389,11 +466,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: deathshead
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicFeathery
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -404,11 +485,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: feathery
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicFirewatch
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -419,11 +504,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: firewatch
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicGothic
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -434,11 +523,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: gothic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicJungle
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -449,11 +542,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: jungle
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicLovers
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -464,11 +561,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: lovers
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicLuna
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -479,11 +580,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: luna
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicMint
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -494,11 +599,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: mint
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicMoffra
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -509,11 +618,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: moffra
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicMonarch
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -524,11 +637,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: monarch
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicMoonfly
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -539,11 +656,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: moonfly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicOakworm
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -554,11 +675,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: oakworm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicPlain
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -569,11 +694,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: plain
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicPlasmafire
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -584,11 +713,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: plasmafire
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicPoison
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -599,11 +732,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: poison
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicRagged
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -614,11 +751,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: ragged
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicReddish
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -629,11 +770,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: reddish
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicRosy
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -644,11 +789,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: rosy
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicRoyal
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -659,11 +808,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: royal
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicSnow
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -674,11 +827,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: snow
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicWhitefly
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -689,11 +846,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: whitefly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothWingsClassicWitchking
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   forcedColoring: true
   speciesRestriction: [Moth]
   coloring:
@@ -704,12 +865,16 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_wings.rsi
     state: witchking
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 # Body Markings
 # Deathshead
 - type: marking
   id: MothHeadClassicDeathshead
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -721,10 +886,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: deathshead-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicDeathshead
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -736,10 +904,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: deathshead-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicDeathshead
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: deathshead-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicDeathshead
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -751,10 +938,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: deathshead-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicDeathshead
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -766,10 +956,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: deathshead-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicDeathshead
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -781,10 +974,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: deathshead-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicDeathshead
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -796,12 +992,15 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: deathshead-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 
 # Firewatch
 - type: marking
   id: MothHeadClassicFirewatch
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -813,10 +1012,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: firewatch-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicFirewatch
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -828,10 +1030,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: firewatch-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicFirewatch
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: firewatch-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicFirewatch
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -843,10 +1064,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: firewatch-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicFirewatch
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -858,10 +1082,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: firewatch-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicFirewatch
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -873,10 +1100,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: firewatch-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicFirewatch
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -888,11 +1118,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: firewatch-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Gothic
 - type: marking
   id: MothHeadClassicGothic
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -904,10 +1137,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: gothic-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicGothic
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -919,10 +1155,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: gothic-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicGothic
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: gothic-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicGothic
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -934,10 +1189,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: gothic-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicGothic
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -949,10 +1207,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: gothic-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicGothic
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -964,10 +1225,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: gothic-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicGothic
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -979,11 +1243,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: gothic-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Jungle
 - type: marking
   id: MothHeadClassicJungle
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -995,10 +1262,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: jungle-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicJungle
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1010,10 +1280,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: jungle-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicJungle
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: jungle-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicJungle
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1025,10 +1314,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: jungle-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicJungle
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1040,10 +1332,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: jungle-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicJungle
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1055,10 +1350,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: jungle-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicJungle
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1070,11 +1368,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: jungle-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Lovers
 - type: marking
   id: MothHeadClassicLovers
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1086,10 +1387,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: lovers-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicLovers
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1101,10 +1405,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: lovers-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicLovers
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: lovers-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicLovers
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1116,10 +1439,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: lovers-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicLovers
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1131,10 +1457,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: lovers-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicLovers
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1146,10 +1475,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: lovers-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicLovers
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1161,11 +1493,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: lovers-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Moonfly
 - type: marking
   id: MothHeadClassicMoonfly
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1177,10 +1512,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: moonfly-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicMoonfly
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1192,10 +1530,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: moonfly-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicMoonfly
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: moonfly-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicMoonfly
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1207,10 +1564,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: moonfly-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicMoonfly
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1222,10 +1582,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: moonfly-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicMoonfly
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1237,10 +1600,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: moonfly-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicMoonfly
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1252,11 +1618,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: moonfly-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Oakworm
 - type: marking
   id: MothHeadClassicOakworm
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1268,10 +1637,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: oakworm-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicOakworm
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1283,10 +1655,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: oakworm-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicOakworm
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: oakworm-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicOakworm
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1298,10 +1689,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: oakworm-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicOakworm
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1313,10 +1707,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: oakworm-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicOakworm
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1328,10 +1725,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: oakworm-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicOakworm
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1343,11 +1743,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: oakworm-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Poison
 - type: marking
   id: MothHeadClassicPoison
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1359,10 +1762,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: poison-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicPoison
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1374,10 +1780,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: poison-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicPoison
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: poison-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicPoison
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1389,10 +1814,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: poison-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicPoison
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1404,10 +1832,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: poison-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicPoison
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1419,10 +1850,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: poison-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicPoison
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1434,11 +1868,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: poison-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Ragged
 - type: marking
   id: MothHeadClassicRagged
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1450,10 +1887,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: ragged-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicRagged
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1465,10 +1905,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: ragged-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicRagged
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: ragged-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicRagged
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1480,10 +1939,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: ragged-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicRagged
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1495,10 +1957,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: ragged-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicRagged
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1510,10 +1975,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: ragged-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicRagged
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1525,11 +1993,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: ragged-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Reddish
 - type: marking
   id: MothHeadClassicReddish
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1541,10 +2012,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: reddish-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicReddish
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1556,10 +2030,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: reddish-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicReddish
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: reddish-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicReddish
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1571,10 +2064,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: reddish-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicReddish
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1586,10 +2082,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: reddish-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicReddish
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1601,10 +2100,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: reddish-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicReddish
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1616,11 +2118,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: reddish-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Royal
 - type: marking
   id: MothHeadClassicRoyal
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1632,10 +2137,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: royal-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicRoyal
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1647,10 +2155,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: royal-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicRoyal
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: royal-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicRoyal
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1662,10 +2189,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: royal-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicRoyal
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1677,10 +2207,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: royal-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicRoyal
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1692,10 +2225,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: royal-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicRoyal
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1707,11 +2243,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: royal-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Whitefly
 - type: marking
   id: MothHeadClassicWhitefly
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1723,10 +2262,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: whitefly-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicWhitefly
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1738,10 +2280,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: whitefly-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicWhitefly
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: whitefly-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicWhitefly
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1753,10 +2314,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: whitefly-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicWhitefly
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1768,10 +2332,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: whitefly-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicWhitefly
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1783,10 +2350,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: whitefly-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicWhitefly
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1798,11 +2368,14 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: whitefly-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 # Witchking
 - type: marking
   id: MothHeadClassicWitchking
-  bodyPart: Head
   markingCategory: Head
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1814,10 +2387,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: witchking-head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChestClassicWitchking
-  bodyPart: Chest
   markingCategory: Chest
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1829,10 +2405,29 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: witchking-chest
+# WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+
+- type: marking
+  id: MothGroinClassicWitchking
+  markingCategory: Groin
+  forcedColoring: true
+  speciesRestriction: [Moth]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+        color: "#FFFFFF"
+  sprites:
+  - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
+    state: witchking-groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+# WD EDIT END
 
 - type: marking
   id: MothLArmClassicWitchking
-  bodyPart: LArm
   markingCategory: LeftArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1844,10 +2439,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: witchking-leftarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothRArmClassicWitchking
-  bodyPart: RArm
   markingCategory: RightArm
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1859,10 +2457,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: witchking-rightarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: MothLLegClassicWitchking
-  bodyPart: LLeg
   markingCategory: LeftLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1874,10 +2475,13 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: witchking-leftleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothRLegClassicWitchking
-  bodyPart: RLeg
   markingCategory: RightLeg
   forcedColoring: true
   speciesRestriction: [Moth]
@@ -1889,3 +2493,7 @@
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi
     state: witchking-rightleg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
index 5490b2f2c97..a271a855ccc 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
@@ -63,7 +63,7 @@
   - type: Bloodstream
     bloodReagent: DemonsBlood
   - type: Body
-    prototype: VampiricAnimalLarge
+    prototype: Vampiric # WD EDIT: VampiricAnimalLarge -> Vampiric
   - type: Psionic
     removable: false
   - type: InnatePsionicPowers
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
index 10263fd01d5..54560e37beb 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -149,7 +149,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
-      # WD EDIT START
+  # WD EDIT START
       jumpsuit-body-slim:
         sizeMaps:
           32:
@@ -180,4 +180,6 @@
           32:
             sprite: _White/Mobs/Species/Human/displacement.rsi
             state: suit
-      # WD EDIT END
+  - type: Body
+    prototype: Felinid
+  # WD EDIT END
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
index 78b8e8610c7..a9945d5d1db 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
@@ -17,7 +17,7 @@
       tagRequirements:
         BorgArm:
           amount: 3
-          defaultPrototype: LeftArmBorg
+          defaultPrototype: BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
     - type: ReverseEngineering
       difficulty: 3
       recipes:
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index 3eaf107827a..11021906f47 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -5,10 +5,6 @@
   prototype: MobOni
   dollPrototype: MobOniDummy
   markingLimits: MobOniMarkingLimits
-  # WD EDIT START
-  bodyTypes:
-  - HumanNormal
-  # WD EDIT END
   defaultSkinTone: "#ab5150"
   skinColoration: Hues
   maleFirstNames: names_oni_male
@@ -21,6 +17,11 @@
   minWidth: 0.85
   defaultWidth: 1.2
   maxWidth: 1.35
+  # WD EDIT START
+  bodyTypes:
+  - Normal
+  - Slim
+  # WD EDIT END
 
 - type: markingPoints
   id: MobOniMarkingLimits
@@ -45,6 +46,12 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
+    Underwear:
     RightLeg:
       points: 6
       required: false
diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
index 13806d0f71c..0b8bff6ebe1 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml
@@ -3,10 +3,6 @@
   name: species-name-felinid
   roundStart: true
   prototype: MobFelinid
-  # WD EDIT START
-  bodyTypes:
-  - HumanNormal
-  # WD EDIT END
   defaultSkinTone: "#c0967f"
   markingLimits: MobFelinidMarkingLimits
   dollPrototype: MobFelinidDummy
@@ -17,6 +13,11 @@
   minWidth: 0.8
   defaultWidth: 0.8
   maxWidth: 1 # White Dream: End of changes
+  # WD EDIT START
+  bodyTypes:
+  - Normal
+  - Slim
+  # WD EDIT END
 
 - type: markingPoints
   id: MobFelinidMarkingLimits
@@ -38,6 +39,11 @@
     Chest:
       points: 1
       required: false
+    # WD EDIT START
+    Groin:
+      points: 1
+      required: false
+    # WD EDIT END
     RightLeg:
       points: 6
       required: false
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index c5a3fbbb56f..40ea723557c 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -16,13 +16,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.7
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.7
 
 - type: reagent
   id: Ale
@@ -73,13 +74,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.25
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.25
 
 - type: reagent
   id: BlueHawaiian
@@ -93,13 +95,14 @@
     sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
     state: icon
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.154
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.154
 
 - type: reagent
   id: Cognac
@@ -117,13 +120,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.4
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.4
 
 - type: reagent
   id: DeadRum
@@ -140,13 +144,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.6
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.6
 
 - type: reagent
   id: Ethanol
@@ -160,7 +165,7 @@
   boilingPoint: 78.2
   meltingPoint: -114.1
   metabolisms:
-    Alcohol:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -176,13 +181,13 @@
           reagent: Ethanol
           min: 12
         # dwarves immune to vomiting from alcohol
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Dwarf
           shouldHave: false
       # Drunken Resilience
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: LiquorLifeline
         - !type:ReagentThreshold
           reagent: Ethanol
@@ -197,7 +202,7 @@
             Cold: -0.13
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: LiquorLifeline
         - !type:ReagentThreshold
           reagent: Ethanol
@@ -212,7 +217,7 @@
             Cold: -0.26
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: LiquorLifeline
         - !type:ReagentThreshold
           reagent: Ethanol
@@ -227,7 +232,7 @@
             Cold: -0.53
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: LiquorLifeline
         - !type:ReagentThreshold
           reagent: Ethanol
@@ -242,7 +247,7 @@
             Cold: -1.06
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: LiquorLifeline
         - !type:ReagentThreshold
           reagent: Ethanol
@@ -280,13 +285,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.45
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.45
 
 - type: reagent
   id: CoffeeLiqueur
@@ -303,16 +309,12 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
-      effects:
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.20
-        # WD edit start
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.02
-        # WD edit end
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.2
+        Theobromine: 0.02
+    # WD EDIT END
 
 - type: reagent
   id: MelonLiquor
@@ -329,11 +331,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
-      effects:
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.20
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.2
+    # WD EDIT END
 
 - type: reagent
   id: NTCahors
@@ -350,11 +352,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
-      effects:
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.17
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.17
+    # WD EDIT END
 
 - type: reagent
   id: PoisonWine
@@ -371,14 +373,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.11
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.11
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -401,13 +404,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.4
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.40
 
 ##Commented out in favor of Nyano sake/soju
 #- type: reagent
@@ -434,13 +438,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.4
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.40
 
 - type: reagent
   id: Vermouth
@@ -457,11 +462,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
-      effects:
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.16
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.16
+    # WD EDIT END
 
 - type: reagent
   id: Vodka
@@ -479,13 +484,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.4
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.40
 
 - type: reagent
   id: Whiskey
@@ -503,13 +509,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.4
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.40
 
 - type: reagent
   id: Wine
@@ -527,13 +534,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.11
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.11
 
 - type: reagent
   id: Champagne
@@ -551,13 +559,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.12
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 3
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.12
   fizziness: 0.8
 
 # Mixed Alcohol
@@ -577,13 +586,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.073
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.073
 
 - type: reagent
   id: AlliesCocktail
@@ -600,13 +610,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.37
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.37
 
 - type: reagent
   id: Aloe
@@ -638,13 +649,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.204
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.204
 
 - type: reagent
   id: Andalusia
@@ -661,13 +673,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.27
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.27
 
 - type: reagent
   id: Antifreeze
@@ -684,13 +697,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.2
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
 
 - type: reagent
   id: AtomicBomb
@@ -707,16 +721,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.254
+        Uranium: 0.05
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.254
-      - !type:AdjustReagent
-        reagent: Uranium
-        amount: 0.05
 
 - type: reagent
   id: B52
@@ -733,13 +746,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.2
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.28
 
 - type: reagent
   id: BahamaMama
@@ -756,13 +770,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.11
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.11
 
 - type: reagent
   id: BananaHonk
@@ -794,13 +809,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.05
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.05
 
 - type: reagent
   id: BeepskySmash
@@ -817,13 +833,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
   fizziness: 0.3
 
 - type: reagent
@@ -841,18 +858,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.33
+        Theobromine: 0.02
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.33
-        # WD edit start
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.02
-        # WD edit end
 
 - type: reagent
   id: BloodyMary
@@ -869,13 +883,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
 
 - type: reagent
   id:  Booger
@@ -892,13 +907,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.08
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.08
 
 - type: reagent
   id: BraveBull
@@ -915,13 +931,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.33
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.33
 
 - type: reagent
   id: CoconutRum
@@ -935,13 +952,14 @@
     sprite: Objects/Consumable/Drinks/coconutrum.rsi
     state: icon
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.26
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.26
 
 - type: reagent
   id: Cosmopolitan
@@ -955,13 +973,14 @@
     sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
     state: icon
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
 
 - type: reagent
   id: CubaLibre
@@ -978,13 +997,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
   fizziness: 0.2
 
 - type: reagent
@@ -1002,13 +1022,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.10
   fizziness: 0.3
 
 - type: reagent
@@ -1026,13 +1047,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.2
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.20
 
 - type: reagent
   id: DoctorsDelight
@@ -1049,7 +1071,7 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -1078,13 +1100,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.225
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.225
 
 - type: reagent
   id: ErikaSurprise
@@ -1101,13 +1124,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.02
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.02
   fizziness: 0.15
 
 - type: reagent
@@ -1125,13 +1149,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.32
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.32
 
 - type: reagent
   id: GinFizz
@@ -1148,13 +1173,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.15
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
   fizziness: 0.4
 
 - type: reagent
@@ -1172,13 +1198,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.15
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
   fizziness: 0.4
 
 - type: reagent
@@ -1196,13 +1223,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.363
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.363
 
 - type: reagent
   id: Grog
@@ -1219,13 +1247,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.10
 
 - type: reagent
   id: HippiesDelight
@@ -1242,13 +1271,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.16
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.16
 
 - type: reagent
   id: Hooch
@@ -1259,13 +1289,14 @@
   flavor: hooch
   color: "#664e00"
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.5
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.50
 
 - type: reagent
   id: IcedBeer
@@ -1298,13 +1329,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.16
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.16
 
 - type: reagent
   id: IrishCream
@@ -1321,13 +1353,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.266
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.266
 
 - type: reagent
   id: IrishCoffee
@@ -1344,18 +1377,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.133
+        Theobromine: 0.02
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.133
-        # WD edit start
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.02
-        # WD edit end
 
 - type: reagent
   id: LongIslandIcedTea
@@ -1372,13 +1402,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.273
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.273
 
 - type: reagent
   id: Manhattan
@@ -1395,13 +1426,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.32
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.32
 
 - type: reagent
   id: ManhattanProject
@@ -1418,13 +1450,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.363
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.363
 
 - type: reagent
   id: ManlyDorf
@@ -1472,13 +1505,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.353
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.353
 
 - type: reagent
   id: Mead
@@ -1511,13 +1545,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.10
   fizziness: 0.3
 
 - type: reagent
@@ -1535,7 +1570,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.4
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -1558,14 +1597,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.16
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.16
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -1584,13 +1624,14 @@
     sprite: Objects/Consumable/Drinks/painkiller.rsi
     state: icon
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.04
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.04
 
 - type: reagent
   id: Patron
@@ -1607,13 +1648,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.5
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.50
 
 - type: reagent
   id: RedMead
@@ -1643,13 +1685,14 @@
     sprite: Objects/Consumable/Drinks/pinacolada.rsi
     state: icon
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.06
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.06
 
 - type: reagent
   id: Sbiten
@@ -1666,13 +1709,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.2
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
 
 - type: reagent
   id: ScrewdriverCocktail
@@ -1689,13 +1733,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
 
 - type: reagent
   id: CogChamp
@@ -1712,16 +1757,17 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.176
+    # WD EDIT END
       effects:
       - !type:GenericStatusEffect
         key: RatvarianLanguage
         component: RatvarianLanguage
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.176
 
 - type: reagent
   id: Silencer
@@ -1738,7 +1784,7 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: Muted
@@ -1761,13 +1807,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.23
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.23
 
 - type: reagent
   id: SnowWhite
@@ -1784,13 +1831,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.03
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.03
   fizziness: 0.3
 
 - type: reagent
@@ -1808,13 +1856,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
   fizziness: 0.2
 
 - type: reagent
@@ -1832,13 +1881,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.095
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.095
   fizziness: 0.6
 
 - type: reagent
@@ -1856,13 +1906,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.26
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.26
 
 - type: reagent
   id: TheMartinez
@@ -1879,13 +1930,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
   fizziness: 0.2
 
 - type: reagent
@@ -1903,16 +1955,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.273
+        Uranium: 0.05
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.273
-      - !type:AdjustReagent
-        reagent: Uranium
-        amount: 0.05
 
 - type: reagent
   id: ToxinsSpecial
@@ -1929,13 +1980,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.112
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.112
 
 - type: reagent
   id: VodkaMartini
@@ -1952,13 +2004,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.32
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.32
 
 - type: reagent
   id: VodkaTonic
@@ -1975,13 +2028,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
   fizziness: 0.4
 
 - type: reagent
@@ -1999,13 +2053,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.013
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.013
   fizziness: 0.3
 
 - type: reagent
@@ -2023,13 +2078,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.13
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.13
   fizziness: 0.4
 
 - type: reagent
@@ -2041,13 +2097,14 @@
   flavor: white-gilgamesh
   color: "#e5d27e"
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.04
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.04
   fizziness: 0.5
 
 - type: reagent
@@ -2065,13 +2122,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.33
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.33
 
 - type: reagent
   id: VodkaRedBool
@@ -2088,18 +2146,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.10
-        #WD edit start
-      #- !type:AdjustReagent
-        #reagent: Theobromine
-        #amount: 0.05
-        #WD edit end
       - !type:GenericStatusEffect
         key: Drowsiness
         time: 1.0
@@ -2121,18 +2175,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.15
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
-        #WD edit start
-      #- !type:AdjustReagent
-        #reagent: Theobromine
-        #amount: 0.05
-        #WD edit end
       - !type:GenericStatusEffect
         key: Drowsiness
         time: 1.0
@@ -2154,18 +2204,17 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
       - !type:AdjustReagent
         reagent: Ethanol
         amount: 0.10
-        #WD edit start
-      #- !type:AdjustReagent
-        #reagent: Theobromine
-        #amount: 0.05
-        #WD edit end
       - !type:GenericStatusEffect
         key: Drowsiness
         time: 1.0
@@ -2187,18 +2236,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.15
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
-        #WD edit start
-      #- !type:AdjustReagent
-        #reagent: Theobromine
-        #amount: 0.05
-        #WD edit end
       - !type:GenericStatusEffect
         key: Drowsiness
         time: 1.0
@@ -2220,16 +2265,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.07
+        Theobromine: 0.02
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.07
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.02 # WD EDIT: 0.05 -> 0.02
       - !type:GenericStatusEffect
         key: Drowsiness
         time: 1.0
@@ -2251,18 +2295,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.15
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.15
-        #WD edit start
-      #- !type:AdjustReagent
-        #reagent: Theobromine
-        #amount: 0.05
-        #WD edit end
       - !type:GenericStatusEffect
         key: Drowsiness
         time: 1.0
@@ -2284,10 +2324,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.25
+    # WD EDIT END
       effects:
         - !type:SatiateThirst
           factor: 1
-        - !type:AdjustReagent
-          reagent: Ethanol
-          amount: 0.25
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
index 19a5e1bf8f1..fadbed160b5 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
@@ -4,7 +4,7 @@
   abstract: true
   slippery: true
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 3
@@ -25,7 +25,7 @@
   parent: BaseDrink
   abstract: true
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -47,13 +47,14 @@
   group: Drinks
   abstract: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Ethanol: 0.06
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.06
   reactiveEffects:
     Flammable:
       methods: [ Touch ]
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index b96b7251975..b14e6abf19a 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -8,7 +8,11 @@
   color: "#664300"
   recognizable: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.02
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -16,9 +20,6 @@
         key: Drowsiness
         time: 2.0
         type: Remove
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.02 # WD EDIT: 0.05 -> 0.02
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/coffeeglass.rsi
     state: icon_empty
@@ -36,13 +37,14 @@
   color: "#664300"
   recognizable: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.2
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.2 # WD EDIT: 0.05 -> 0.2
 
 - type: reagent
   id: Cream
@@ -53,7 +55,7 @@
   flavor: creamy
   color: "#DFD7AF"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 1
@@ -67,7 +69,7 @@
   flavor: nutty
   color: "#f4eadb"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 4 # Coconut water is 94% water
@@ -81,7 +83,7 @@
   flavor: creamy
   color: "#FFEABF"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -101,7 +103,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.01
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -109,11 +115,6 @@
         key: Drowsiness
         time: 2.0
         type: Remove
-        #WD edit start
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.01
-        #WD edit end
 
 - type: reagent
   id: GreenTea
@@ -129,16 +130,15 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
-  #WD edit start
+  # WD EDIT START
   metabolisms:
-    Drink:
+    Digestion:
+      metabolites:
+        Theobromine: 0.02
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.02
-        #WD edit end
+  # WD EDIT END
 
 - type: reagent
   id: Grenadine
@@ -174,7 +174,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.01
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -182,11 +186,6 @@
         key: Drowsiness
         time: 2.0
         type: Remove
-        #WD edit start
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.01
-        #WD edit end
 
 - type: reagent
   id: IcedGreenTea
@@ -218,13 +217,14 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.01
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.01 # WD EDIT: 0.05 -> 0.01
 
 - type: reagent
   id: JuiceBerryPoison
@@ -236,10 +236,10 @@
   flavor: bitter
   color: "#6600CC"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -262,7 +262,7 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -282,13 +282,13 @@
     - !type:PlantAdjustWater
       amount: 0.9
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 4
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
         damage:
           groups:
@@ -299,7 +299,7 @@
             Caustic: -0.30
       - !type:ChemAddMoodlet
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
         - !type:ReagentThreshold
           reagent: Milk
@@ -322,7 +322,7 @@
   color: "#DEDACD"
   recognizable: true
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 4
@@ -345,7 +345,7 @@
   flavor: terrible
   color: "#faffba"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: -2
@@ -357,7 +357,7 @@
   group: Drinks
   physicalDesc: reagent-physical-desc-nothing
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -379,7 +379,7 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 6
@@ -387,7 +387,7 @@
         key: Drowsiness
         time: 3.0
         type: Remove
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -420,7 +420,11 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.01
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -428,11 +432,6 @@
         key: Drowsiness
         time: 2.0
         type: Remove
-        #WD edit start
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.01
-        #WD edit end
 
 - type: reagent
   id: Tea
@@ -444,13 +443,14 @@
   color: "#8a5a3a"
   recognizable: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.02
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.02 # WD EDIT: 0.05 -> 0.02
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/teaglass.rsi
     state: icon_empty
@@ -487,7 +487,7 @@
   boilingPoint: 100.0
   meltingPoint: 0.0
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 4
@@ -521,7 +521,7 @@
   flavor: cheapnoodles
   color: "#664300"
   metabolisms:
-    Food:
+    Digestion: # WD EDIT:
       effects:
       - !type:SatiateHunger
         factor: 1
@@ -535,7 +535,7 @@
   flavor: cheapnoodles
   color: "#664300"
   metabolisms:
-    Food:
+    Digestion: # WD EDIT:
       effects:
       - !type:SatiateHunger
         factor: 4
@@ -552,15 +552,10 @@
     sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
     state: icon
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 4
-        #WD edit start
-      #- !type:AdjustReagent
-        #reagent: Theobromine
-        #amount: 0.05
-        #WD edit end
 
 - type: reagent
   id: Pilk
@@ -571,7 +566,7 @@
   flavor: pilk
   color: "#e7c69f"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
         - !type:SatiateThirst
           factor: 1
@@ -617,16 +612,15 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
   fizziness: 0.3
-  #WD edit start
+  # WD EDIT START
   metabolisms:
-    Drink:
+    Digestion:
+      metabolites:
+        Theobromine: 0.01
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.01
-        #WD edit end
+  # WD EDIT END
 
 - type: reagent
   id: Mopwata
@@ -637,7 +631,7 @@
   flavor: mopwata
   color: "#59502b"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 0.6
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
index ff07c341d89..4292e4207e3 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml
@@ -53,16 +53,15 @@
   flavor: carrot
   color: "#FF8820"
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Oculine: 0.5
+        Nutriment: 0.5
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Oculine
-        amount: 0.5
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.5
 
 - type: reagent
   id: JuiceGrape
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index 44eb16e3e08..cf9a14b7480 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -14,7 +14,7 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 2
@@ -35,7 +35,7 @@
     sprite: Objects/Consumable/Drinks/royrogers.rsi
     state: icon
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 4
@@ -73,15 +73,10 @@
   flavor: energydrink
   color: "#ffffbf"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 2
-        #WD edit start
-      #- !type:AdjustReagent
-        #reagent: Theobromine
-        #amount: 0.1
-        #WD edit end
       - !type:GenericStatusEffect
         key: Drowsiness
         time: 2.0
@@ -197,7 +192,7 @@
     sprite: Objects/Consumable/Drinks/shirleytemple.rsi
     state: icon
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 4
@@ -250,18 +245,19 @@
   flavor: fourteenlokosoda
   color: "#deb928"
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.16
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:AdjustReagent
-        reagent: Theobromine
-        amount: 0.16 # WD EDIT: 0.1 -> 0.16
     Poison:
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
           shouldHave: false
         damage:
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index 504bfe4d4f2..64ce5e0d384 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -8,7 +8,7 @@
   color: aquamarine
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -23,7 +23,7 @@
   color: darkred
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -52,7 +52,7 @@
   flavor: cold
   color: skyblue
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: MintyEffect
@@ -67,7 +67,7 @@
   color: gray
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SpicyEffect
@@ -82,7 +82,7 @@
   color: red
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SpicyEffect
@@ -97,7 +97,7 @@
   color: red
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -112,7 +112,7 @@
   color: "#fba399"
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -127,7 +127,7 @@
   color: "#803280"
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -142,7 +142,7 @@
   color: "#f9f5e5"
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -157,7 +157,7 @@
   color: "#ffdb58"
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -172,7 +172,7 @@
   color: "#efdaae"
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: SweetenerEffect
@@ -187,7 +187,7 @@
   color: saddlebrown
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateHunger
         factor: 0.5
@@ -221,7 +221,7 @@
   - !type:PlantAdjustHealth
     amount: -2
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       # eating salt on its own kinda sucks, kids
       - !type:SatiateThirst
@@ -243,7 +243,7 @@
   tileReactions:
     - !type:SpillTileReaction
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       # 12 diona blood for 1 unit of syrup, this stuff better be worthwhile.
       effects:
       - !type:SatiateHunger
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
index eb9bb96bfaf..4a2a4eec450 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml
@@ -8,7 +8,7 @@
   flavor: nutriment
   color: "#24591F"
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateHunger
   plantMetabolism:
@@ -27,7 +27,11 @@
   flavor: vitamin
   color: "#D3D3D3"
   metabolisms:
-    Food: #This makes it not compete with medicines, a large bonus for something that can heal
+    # WD EDIT START
+    Digestion:
+      effects:
+      - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food
+    Absorption:
       effects:
       - !type:HealthChange
         probability: 0.5
@@ -38,7 +42,7 @@
       # Helps you stop bleeding to an extent.
       - !type:ModifyBleedAmount
         amount: -0.25
-      - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food
+    # WD EDIT END
   # Lets plants benefit too
   plantMetabolism:
   - !type:PlantAdjustNutrition
@@ -56,7 +60,11 @@
   flavor: protein
   color: "#FFFFE5"
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      effects:
+      - !type:SatiateHunger
+    Absorption:
       effects:
       - !type:HealthChange
         probability: 0.5
@@ -65,7 +73,7 @@
             Brute: -0.4
       - !type:ModifyBloodLevel
         amount: 1 # weaker than iron but pretty good all things considered
-      - !type:SatiateHunger
+    # WD EDIT END
   pricePerUnit: 3
 
 - type: reagent
@@ -78,7 +86,7 @@
   color: white
   meltingPoint: 146.0
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateHunger
         conditions:
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
index 8b5193e953b..73ef134f1b3 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -8,16 +8,15 @@
   color: white
   recognizable: true
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Sugar: 0.4
+        Nutriment: 0.1
+    # WD EDIT END
       effects:
-      - !type:AdjustReagent
-        reagent: Sugar
-        amount: 0.4
       - !type:SatiateThirst
         factor: -0.2 #its flour
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.1
 
 - type: reagent
   id: Cornmeal
@@ -28,13 +27,14 @@
   flavor: corn #so corn doesnt taste chalky
   color: tan
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Nutriment: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: -0.2 #its cornflour
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.1
 
 - type: reagent
   id: Oats
@@ -45,14 +45,12 @@
   flavor: oats
   color: tan
   metabolisms:
-    Food:
-      effects:
-      - !type:AdjustReagent
-        reagent: Sugar
-        amount: 0.2
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.3
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Sugar: 0.2
+        Nutriment: 0.3
+    # WD EDIT END
 
 - type: reagent
   id: Enzyme
@@ -73,11 +71,11 @@
   color: white
   recognizable: true
   metabolisms:
-    Food:
-      effects:
-      - !type:AdjustReagent
-        reagent: UncookedAnimalProteins
-        amount: 0.5
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        UncookedAnimalProteins: 0.5
+    # WD EDIT END
 
 - type: reagent
   id: EggCooked
@@ -89,11 +87,11 @@
   color: white
   recognizable: true
   metabolisms:
-    Food:
-      effects:
-      - !type:AdjustReagent
-        reagent: Protein
-        amount: 1
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Protein: 1
+    # WD EDIT END
 
 - type: reagent
   id: Blackpepper
@@ -105,7 +103,7 @@
   color: black
   recognizable: true
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:ChemAddMoodlet
         moodPrototype: PepperEffect
@@ -120,14 +118,13 @@
   color: tan
   recognizable: true
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Water: 0.4
+        Vitamin: 0.1
+    # WD EDIT END
       effects:
-      - !type:AdjustReagent
-        reagent: Water
-        amount: 0.4
-      - !type:AdjustReagent
-        reagent: Vitamin
-        amount: 0.1
       - !type:ChemVomit
         probability: 0.1
         conditions:
@@ -144,14 +141,12 @@
   color: white
   recognizable: true
   metabolisms:
-    Food:
-      effects:
-      - !type:AdjustReagent
-        reagent: Sugar
-        amount: 0.4
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.1
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Sugar: 0.4
+        Nutriment: 0.1
+    # WD EDIT END
 
 - type: reagent
   id: OilOlive
@@ -166,11 +161,12 @@
   boilingPoint: 299.0
   recognizable: true
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Nutriment: 0.75
+    # WD EDIT END
       effects:
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.75
       - !type:ChemAddMoodlet
         moodPrototype: OilyEffect
 
@@ -202,14 +198,15 @@
   meltingPoint: 146
   boilingPoint: 410 # Really high boiling point compared to its melting
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Nutriment: 0.75
+    # WD EDIT END
       effects:
-      - !type:AdjustReagent
-        reagent: Nutriment #Oils enhance nutrition
-        amount: 0.75
       - !type:ChemAddMoodlet
         moodPrototype: SpicyEffect
-    Poison:
+    Absorption: # WD EDIT
       effects:
         - !type:AdjustTemperature
           amount: 250 # thermal energy, not temp
@@ -235,7 +232,11 @@
   color: "#800000"
   meltingPoint: 146.0
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Theobromine: 0.02
+    # WD EDIT END
       effects:
       - !type:SatiateHunger
         conditions:
@@ -243,11 +244,6 @@
           reagent: Nutriment
           min: 0.1
         factor: 1
-        #WD edit start
-      - !type:AdjustReagent
-         reagent: Theobromine
-         amount: 0.02
-         #WD edit end
       - !type:ChemAddMoodlet
         moodPrototype: ChocolateEffect
   plantMetabolism:
@@ -270,11 +266,12 @@
   boilingPoint: 100.0
   recognizable: true
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Nutriment: 0.75
+    # WD EDIT END
       effects:
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.75
       - !type:ChemAddMoodlet
         moodPrototype: ButterEffect
 
@@ -287,10 +284,11 @@
   color: "#7F8400"
   group: Foods
   metabolisms:
-    Food:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Nutriment: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: -0.2
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.1
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index 9071ed625a0..448bb8b18a5 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -15,61 +15,59 @@
   physicalDesc: reagent-physical-desc-ferrous
   slippery: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 0.5
         conditions:
-          - !type:OrganType
+          - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
             type: Human
             shouldHave: false
       - !type:SatiateHunger
         factor: 0.5
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vampiric
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vampiric
         reagent: Water
         amount: 0.3
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vampiric
         reagent: Protein
         amount: 0.25 # See below
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vampiric
         reagent: Omnizine
         amount: 0.3
       - !type:ChemAddMoodlet
         moodPrototype: DrankBlood
         conditions:
-          - !type:OrganType
+          - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
             type: Human
       - !type:ChemAddMoodlet
         moodPrototype: DrankBloodVampiric
         conditions:
-          - !type:OrganType
+          - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
             type: Vampiric
-    Food:
-      effects:
-        - !type:AdjustReagent
-          reagent: UncookedAnimalProteins
-          amount: 0.125 # 0.25 proteins for 1u of blood - restores 0.75 hunger, adds 0.25 blood per unit
-          conditions:
-          - !type:OrganType
-            type: Vampiric
-            shouldHave: false
-    Medicine:
+      - !type:AdjustReagent
+        reagent: UncookedAnimalProteins
+        amount: 0.125 # 0.25 proteins for 1u of blood - restores 0.75 hunger, adds 0.25 blood per unit
+        conditions:
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
+          type: Vampiric
+          shouldHave: false
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Bloodsucker
         damage:
           groups:
@@ -95,7 +93,7 @@
   physicalDesc: reagent-physical-desc-slimy
   slippery: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: DrankInsectBlood
@@ -114,7 +112,7 @@
   tileReactions:
     - !type:SpillTileReaction
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       # Delicious!
       effects:
       - !type:SatiateHunger
@@ -138,7 +136,7 @@
   tileReactions:
     - !type:SpillTileReaction
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       # Sweet!
       effects:
       - !type:SatiateHunger
@@ -162,12 +160,12 @@
   physicalDesc: reagent-physical-desc-metallic
   slippery: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: DrankBlood
           conditions:
-            - !type:OrganType
+            - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
               type: Human
 
 - type: reagent
@@ -182,12 +180,12 @@
   physicalDesc: reagent-physical-desc-pungent
   slippery: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
         - !type:ChemAddMoodlet
           moodPrototype: DrankBlood
           conditions:
-            - !type:OrganType
+            - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
               type: Human
 
 - type: reagent
@@ -200,12 +198,12 @@
   color: "#2b0700"
   slippery: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       # Disgusting!
       effects:
       - !type:SatiateThirst
         factor: -0.5
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -227,12 +225,12 @@
   color: "#f4692e"
   recognizable: true
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 1.5
     # Dragon doesn't require airloss healing, so omnizine is still best for humans.
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:ModifyBloodLevel
         amount: 3
@@ -277,13 +275,14 @@
   physicalDesc: reagent-physical-desc-pungent
   slippery: true
   metabolisms:
-    Drink:
+    # WD EDIT START
+    Digestion:
+      metabolites:
+        Nutriment: 0.1
+    # WD EDIT END
       effects:
       - !type:SatiateThirst
         factor: 0.5
-      - !type:AdjustReagent
-        reagent: Nutriment
-        amount: 0.1
       - !type:ChemAddMoodlet
         moodPrototype: DrankVomit
   footstepSound:
@@ -301,11 +300,11 @@
   color: "#C584B8"
   slippery: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateHunger
         factor: 1.5
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index 23d80f0e79b..1e330f73222 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -10,11 +10,11 @@
     - !type:PlantAdjustNutrition
       amount: 2
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
 
 - type: reagent
@@ -34,18 +34,18 @@
       probability: 0.3
       amount: 0.4
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
       - !type:HealthChange
         damage:
           types:
             Poison: 1
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
 
 - type: reagent
@@ -62,14 +62,14 @@
     - !type:PlantAdjustPests
       amount: -6
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
           types:
             Poison: 3
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
 
 - type: reagent
@@ -90,7 +90,7 @@
     - !type:PlantAdjustMutationMod
       amount: 0.1
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -100,7 +100,7 @@
             Slash: 1
             Piercing: 1
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
 
 - type: reagent
@@ -122,7 +122,7 @@
       amount: 1
     - !type:RobustHarvest {}
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -132,11 +132,11 @@
             Slash: -3
             Piercing: -3
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
         - !type:ReagentThreshold
           min: 30
@@ -145,12 +145,10 @@
             Asphyxiation: 1
             Heat: 2
             Poison: 1
-    Medicine:
-      effects:
       - !type:Polymorph
         prototype: TreeMorph
         conditions:
-          - !type:OrganType
+          - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
             type: Plant
           - !type:ReagentThreshold
             min: 80
@@ -185,14 +183,14 @@
     - !type:PlantAdjustWeeds
       amount: -6
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
           types:
             Poison: 4
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
 
 - type: reagent
@@ -211,17 +209,11 @@
   - !type:PlantAdjustHealth
     amount: 0.5
   metabolisms:
-    Poison:
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Caustic: 1
-    Gas:
+    Respiration: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Rat
           shouldHave: false
         - !type:ReagentThreshold
@@ -234,10 +226,10 @@
       - !type:ChemVomit
         probability: 0.12
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Rat
           shouldHave: false
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
            type: Vox
            shouldHave: false
         - !type:ReagentThreshold
@@ -254,7 +246,7 @@
           min: 0.25
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Rat
         - !type:ReagentThreshold
           reagent: Ammonia
@@ -269,9 +261,15 @@
             Bloodloss: -5
       - !type:Oxygenate # ammonia displaces nitrogen in vox blood
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vox
         factor: -4
+      # WD EDIT START
+      - !type:HealthChange
+        damage:
+          types:
+            Caustic: 1
+      # WD EDIT END
 
 
 - type: reagent
@@ -297,7 +295,7 @@
     amount: 1
   - !type:PlantDiethylamine {}
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml
index 769b7748f30..af583370683 100644
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -18,7 +18,7 @@
   boilingPoint: 55.5
   meltingPoint: -50.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -35,7 +35,7 @@
   boilingPoint: 4200.0
   meltingPoint: 3550.0
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -66,7 +66,7 @@
   physicalDesc: reagent-physical-desc-crystalline
   color: "#776291"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -90,7 +90,7 @@
   boilingPoint: 353.2
   meltingPoint: 278.7
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -115,14 +115,12 @@
   boilingPoint: 1661.0
   meltingPoint: 596.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
           types:
             Heat: 1.5
-    Medicine:
-      effects:
       - !type:ChemVomit
         conditions:
         - !type:ReagentThreshold
@@ -147,7 +145,7 @@
   physicalDesc: reagent-physical-desc-grainy
   color: "#F0F0F0"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: -5 # This is basically industrial dessicant
@@ -176,7 +174,7 @@
   physicalDesc: reagent-physical-desc-refreshing
   color: "#bf1365"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml
index da02fc666d8..c9818b253d3 100644
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -8,7 +8,7 @@
   boilingPoint: 111.0
   meltingPoint: -5.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -49,14 +49,7 @@
   boilingPoint: 100.0
   meltingPoint: 60.0
   metabolisms:
-    Food:
-      effects:
-      - !type:ChemVomit
-        conditions:
-        - !type:ReagentThreshold
-          min: 6
-        probability: 0.20
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:ChemVomit
         conditions:
@@ -102,7 +95,7 @@
       - !type:ModifyBleedAmount
         amount: -1.5
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: SeeingRainbows
@@ -110,7 +103,7 @@
         type: Add
         time: 5
         refresh: false
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: Muted
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 1a6377184f9..7939e34f95b 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -40,7 +40,7 @@
     - !type:PlantAdjustHealth
       amount: -1
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -58,22 +58,20 @@
   boilingPoint: 2595.0
   meltingPoint: 1083.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.1
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Arachnid
           shouldHave: false
         damage:
           types:
             Poison: 0.1
-    Medicine:
-      effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Arachnid
           shouldHave: true
         amount: 0.4
@@ -98,7 +96,7 @@
     - !type:PlantAdjustHealth
       amount: -2
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -138,22 +136,20 @@
   boilingPoint: 2862.0
   meltingPoint: 1538.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.1
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Arachnid
           shouldHave: true
         damage:
           types:
             Poison: 0.1
-    Medicine:
-      effects:
       - !type:ModifyBloodLevel
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Arachnid
           shouldHave: false
         amount: 0.4
@@ -169,7 +165,7 @@
   meltingPoint: 180.5
   boilingPoint: 1330.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.1
       effects:
       - !type:HealthChange
@@ -196,7 +192,7 @@
   meltingPoint: -38.83
   boilingPoint: 356.73
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -258,7 +254,7 @@
   boilingPoint: 3265.0
   meltingPoint: 1414.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -287,7 +283,7 @@
   boilingPoint: 445.0
   meltingPoint: 120.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -326,7 +322,7 @@
     probability: 0.2
     amount: 0.1
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index e9d83b3d3d0..8936126717a 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -12,7 +12,7 @@
     maxOnTileWhitelist:
       tags: [ Carpet ]
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:PopupMessage
         type: Local
@@ -35,11 +35,11 @@
   flavor: fiber
   color: "#808080"
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateHunger
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Moth
 
 - type: reagent
@@ -61,7 +61,7 @@
   - !type:CleanTileReaction # Bees are extremely obsessive about cleanliness within what they consider their hive.
     cleanCost: 0 # Consume absolutely zero bees. Buzz buzz.
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:PopupMessage
         type: Local
@@ -163,7 +163,7 @@
   flavor: shocking
   color: "#FDD023"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:Electrocute
         probability: 0.35
@@ -191,7 +191,7 @@
         emote: Scream
         probability: 0.7
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate : 3.00
       effects:
       - !type:HealthChange
@@ -246,7 +246,7 @@
       effects:
       - !type:ExtinguishReaction # cold
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate : 0.45
       effects:
       - !type:HealthChange
@@ -311,7 +311,7 @@
   color: "#FF4DD2"
   slippery: true #clown juice gotta slip
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:Emote
         emote: Laugh
@@ -331,7 +331,7 @@
   flavor: weh
   color: "#59b23a"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.25
       effects:
       - !type:Emote
@@ -342,7 +342,7 @@
       - !type:Polymorph
         prototype: ArtifactLizard # Does the same thing as the original YML I made for this reagent.
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
           shouldHave: false
         - !type:ReagentThreshold
@@ -363,7 +363,7 @@
   flavor: hew
   color: "#a64dc5"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.25
       effects:
       - !type:Emote
@@ -374,7 +374,7 @@
       - !type:Polymorph
         prototype: ArtifactLizard
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
           shouldHave: false
         - !type:ReagentThreshold
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index b81b639b8bd..8b1b0705119 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -8,31 +8,31 @@
   boilingPoint: -183.0
   meltingPoint: -218.4
   metabolisms:
-    Gas:
+    Respiration: # WD EDIT
       effects:
       - !type:Oxygenate
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Human
       - !type:Oxygenate
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
       - !type:Oxygenate
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Rat
       - !type:Oxygenate
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
       # Convert Oxygen into CO2.
       - !type:ModifyLungGas
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vox
           shouldHave: false
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
           shouldHave: false
         ratios:
@@ -40,7 +40,7 @@
           Oxygen: -1.0
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vox
         scaleByQuantity: true
         ignoreResistances: true
@@ -53,13 +53,13 @@
         conditions:
           - !type:ReagentThreshold
             min: 0.5
-          - !type:OrganType
+          - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
             type: Vox
         clear: true
         time: 5
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
         scaleByQuantity: true
         ignoreResistances: true
@@ -72,7 +72,7 @@
         conditions:
           - !type:ReagentThreshold
             min: 0.5
-          - !type:OrganType
+          - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
             type: Plasmaman
         clear: true
         time: 5
@@ -91,28 +91,11 @@
   - !type:FlammableTileReaction
     temperatureMultiplier: 1.5
   metabolisms:
-    Poison:
+    Respiration: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
-          type: Plasmaman
-          shouldHave: false
-        damage:
-          types:
-            Poison: 3
-      - !type:AdjustReagent
-        conditions:
-        - !type:OrganType
-          type: Plasmaman
-          shouldHave: false
-        reagent: Inaprovaline
-        amount: -2.0
-    Gas:
-      effects:
-      - !type:HealthChange
-        conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
           shouldHave: false
         scaleByQuantity: true
@@ -125,7 +108,7 @@
       - !type:AdjustAlert
         alertType: Toxins
         conditions:
-          - !type:OrganType
+          - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
             type: Plasmaman
             shouldHave: false
           - !type:ReagentThreshold
@@ -135,20 +118,20 @@
       - !type:Oxygenate
         factor: 4
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
       - !type:ModifyLungGas
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
         ratios:
           Nitrogen: 1.0 # Interesting exhale for plasmamen
           Plasma: -1.0
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
         damage:
           groups:
@@ -161,12 +144,29 @@
             Poison: -0.66
       - !type:ChemAddMoodlet
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plasmaman
         - !type:ReagentThreshold
           reagent: Plasma
           min: 4
         moodPrototype: PlasmamanIngestPlasma
+      # WD EDIT START
+      - !type:HealthChange
+        conditions:
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
+          type: Plasmaman
+          shouldHave: false
+        damage:
+          types:
+            Poison: 3
+      - !type:AdjustReagent
+        conditions:
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
+          type: Plasmaman
+          shouldHave: false
+        reagent: Inaprovaline
+        amount: -2.0
+      # WD EDIT END
   reactiveEffects:
     Flammable:
       methods: [ Touch ]
@@ -190,13 +190,13 @@
       - !type:FlammableReaction
         multiplier: 0.8
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
           types:
             Radiation: 3
-    Gas:
+    Respiration: # WD EDIT
       effects:
       - !type:HealthChange
         scaleByQuantity: true
@@ -222,18 +222,18 @@
   flavor: bitter
   color: "#66ff33"
   metabolisms:
-    Gas:
+    Respiration: # WD EDIT
       effects:
       - !type:Oxygenate
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
           shouldHave: false
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vox
           shouldHave: false
         # Don't want people to get toxin damage from the gas they just
@@ -248,7 +248,7 @@
               0.8
       - !type:Oxygenate # carbon dioxide displaces oxygen from the bloodstream, causing asphyxiation
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Plant
           shouldHave: false
         factor: -4
@@ -266,33 +266,33 @@
   boilingPoint: -195.8
   meltingPoint: -210.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
           types:
             Cold: 1 # liquid nitrogen is cold
-    Gas:
+    Respiration: # WD EDIT
       effects:
       - !type:Oxygenate
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vox
       - !type:Oxygenate
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
       # Converts Nitrogen into CO2
       - !type:ModifyLungGas
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Vox
         ratios:
           Ammonia: 1.0
           Nitrogen: -1.0
       - !type:ModifyLungGas
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
         ratios:
           NitrousOxide: 1.0
@@ -308,7 +308,7 @@
   boilingPoint: -88
   meltingPoint: -90
   metabolisms:
-    Gas:
+    Respiration: # WD EDIT
       effects:
       - !type:Emote
         conditions:
@@ -316,7 +316,7 @@
           reagent: NitrousOxide
           min: 0.2
           max: 0.5
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
           shouldHave: false
         emote: Laugh
@@ -327,7 +327,7 @@
         - !type:ReagentThreshold
           reagent: NitrousOxide
           min: 0.5
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
           shouldHave: false
         type: Local
@@ -339,7 +339,7 @@
         - !type:ReagentThreshold
           reagent: NitrousOxide
           min: 1
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
           shouldHave: false
         walkSpeedModifier: 0.65
@@ -349,7 +349,7 @@
         - !type:ReagentThreshold
           reagent: NitrousOxide
           min: 1
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
           shouldHave: false
         key: ForcedSleep
@@ -361,7 +361,7 @@
         - !type:ReagentThreshold
           reagent: NitrousOxide
           min: 3.5
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Slime
           shouldHave: false
         ignoreResistances: true
@@ -379,7 +379,7 @@
   boilingPoint: -195.8
   meltingPoint: -210.0
   metabolisms:
-    Gas:
+    Respiration: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 3beb29fc3df..a0b6e5cb13d 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -7,7 +7,7 @@
   flavor: medicine
   color: "#081a80"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.1
       effects:
       - !type:GenericStatusEffect
@@ -38,7 +38,7 @@
   flavor: medicine
   color: "#3a1d8a"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -87,7 +87,7 @@
   flavor: medicine
   color: "#64ffe6"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:AdjustReagent
         reagent: Histamine
@@ -110,7 +110,7 @@
   flavor: medicine
   color: "#2d5708"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: Drunk
@@ -130,7 +130,7 @@
   flavor: medicine
   color: "#bd5902"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -150,7 +150,7 @@
   flavor: medicine
   color: "#ffaa00"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -193,7 +193,7 @@
     amount: 5
   - !type:PlantCryoxadone {}
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -217,7 +217,7 @@
   color: "#32cd32"
   worksOnTheDead: true
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -239,7 +239,7 @@
   flavor: medicine
   color: "#215263"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -271,7 +271,7 @@
   flavor: medicine
   color: "#0041a8"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -296,7 +296,7 @@
   flavor: medicine
   color: "#4da0bd"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -329,7 +329,7 @@
   flavor: medicine
   color: "#d2fffa"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -399,7 +399,7 @@
   flavor: medicine
   color: "#4cb580"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -428,7 +428,7 @@
   flavor: medicine
   color: "#422912"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:ChemVomit
         conditions:
@@ -445,7 +445,7 @@
   flavor: medicine
   color: "#731024"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -469,7 +469,7 @@
   flavor: medicine
   color: "#bf3d19"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -504,7 +504,7 @@
   flavor: medicine
   color: "#ff7db5"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -538,7 +538,7 @@
   flavor: medicine
   color: "#ff867d"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         probability: 0.3
@@ -589,7 +589,7 @@
     - !type:ReagentThreshold
       min: 4
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -608,7 +608,7 @@
   flavor: violets
   color: "#9423FF"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -635,7 +635,7 @@
   flavor: medicine
   color: "#86caf7"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:CureZombieInfection
         conditions:
@@ -656,7 +656,7 @@
   flavor: medicine
   color: "#1274b5"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:CureZombieInfection
         innoculate: true
@@ -678,7 +678,7 @@
   flavor: medicine
   color: "#FFE774"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:ModifyBleedAmount
         amount: -0.5
@@ -692,7 +692,7 @@
   flavor: salty
   color: "#0064C8"
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 6
@@ -708,7 +708,7 @@
   flavor: medicine
   color: "#f4dab8"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -724,7 +724,7 @@
   flavor: medicine
   color: "#2b2f77"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -747,7 +747,7 @@
   flavor: medicine
   color: "#d49a2f"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -780,7 +780,7 @@
   flavor: medicine
   color: "#ba7d7d"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       # Medium-large quantities can hurt you instead,
       # but still technically stop your bleeding.
@@ -803,7 +803,7 @@
   flavor: medicine
   color: "#00e5ff"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -830,7 +830,7 @@
   flavor: medicine
   color: "#2690b5"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       # what the hell, this isn't satiating at all!!
       - !type:SatiateHunger
@@ -846,7 +846,7 @@
   flavor: medicine
   color: "#fcf7f9"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -865,7 +865,7 @@
   flavor: medicine
   color: "#520e30"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -908,7 +908,7 @@
   flavor: medicine
   color: "#404040"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:ChemHealEyeDamage
 
@@ -921,7 +921,7 @@
   flavor: magical
   color: "#b50ee8"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:MakeSentient
         conditions:
@@ -937,7 +937,7 @@
   flavor: medicine
   color: "#d5d5e4"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:Jitter
       - !type:GenericStatusEffect
@@ -966,7 +966,7 @@
   flavor: medicine
   color: "#b0abaa"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: Drowsiness
@@ -991,7 +991,7 @@
   flavor: sweet
   color: "#e0a5b9"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -1031,7 +1031,7 @@
   flavor: syrupy
   color: "#283332"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -1056,7 +1056,7 @@
   flavor: fizzy
   color: "#b9bf93"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -1082,7 +1082,7 @@
   flavor: sour
   color: "#ff3636"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -1109,11 +1109,11 @@
   boilingPoint: 100.0
   meltingPoint: 0.0
   metabolisms: #Could nullify debuffs of feeding.
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: 3
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:ModifyBloodLevel
         amount: 0.1
@@ -1163,7 +1163,7 @@
   flavor: syrupy
   color: "#aa4308"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.1 # slow metabolism to not be a godly combat med, its for treating burn victims efficiently
       effects:
       - !type:HealthChange
@@ -1200,7 +1200,7 @@
   flavor: metallic
   color: "#8147ff"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       # heals shocks and removes shock chems
       - !type:HealthChange
@@ -1244,7 +1244,7 @@
   color: "#b5e36d"
   worksOnTheDead: true
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:ReduceRotting
         seconds: 20
@@ -1273,7 +1273,7 @@
     amount: 5
   - !type:PlantCryoxadone {}
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -1293,7 +1293,7 @@
   color: "#89f77f"
   worksOnTheDead: true
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -1316,7 +1316,7 @@
   flavor: sweet
   color: "#A0A0A0"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:PopupMessage
         conditions:
@@ -1336,7 +1336,7 @@
   flavor: bitter
   color: "#07E79E"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -1374,7 +1374,7 @@
   flavor: medicine
   color: "#baa15d"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: RadiationProtection
@@ -1399,7 +1399,7 @@
   flavor: medicine
   color: "#27870a"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:Emote
         emote: Yawn
@@ -1453,7 +1453,7 @@
   flavor: medicine
   color: "#382766"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:ModifyBleedAmount
         conditions:
diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
index 58a09661a26..09725b5169f 100644
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -9,7 +9,7 @@
   boilingPoint: 212.0  # Dexosyephedrine vape when?
   meltingPoint: 170.0
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -23,8 +23,6 @@
           types:
             Poison: 2 # this is added to the base damage of the meth.
             Asphyxiation: 2
-    Narcotic:
-      effects:
       - !type:MovespeedModifier
         walkSpeedModifier: 1.35
         sprintSpeedModifier: 1.35
@@ -54,8 +52,6 @@
         time: 5
       - !type:ChemAddMoodlet
         moodPrototype: StrongStimulant
-    Medicine:
-      effects:
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -72,7 +68,7 @@
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:MovespeedModifier
         walkSpeedModifier: 1.25
@@ -114,11 +110,11 @@
       - !type:ChemAddMoodlet
         moodPrototype: StrongStimulant
       # WD EDIT START
-      - !type:GenericStatusEffect # WWDP
+      - !type:GenericStatusEffect
         key: NoScream
         component: NoScream
         time: 5
-      - !type:PopupMessage # WWDP
+      - !type:PopupMessage
         visualType: Medium
         messages: [ "morphine-wear-off" ]
         type: Local
@@ -129,8 +125,6 @@
           max: 1.1
           min: 1
       # WD EDIT END
-    Medicine:
-      effects:
       - !type:ResetNarcolepsy
         conditions:
         - !type:ReagentThreshold
@@ -147,7 +141,7 @@
   boilingPoint: 212.0
   meltingPoint: 170.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       metabolismRate: 0.2 # WD EDIT - unnerf stims
       effects:
       - !type:MovespeedModifier
@@ -198,9 +192,6 @@
         time: 5
       - !type:ChemAddMoodlet
         moodPrototype: StrongStimulant
-    Medicine:
-      metabolismRate: 1.0
-      effects:
       - !type:ResetNarcolepsy
       - !type:SatiateHunger
         factor: 1
@@ -231,7 +222,7 @@
   - !type:PlantAdjustHealth
     amount: -1
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: SeeingRainbows
@@ -252,7 +243,7 @@
   - !type:PlantAdjustHealth
     amount: -5
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:ChemAddMoodlet
         moodPrototype: NicotineBenefit
@@ -267,7 +258,7 @@
   flavor: bitter
   color: "#215263"
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:MovespeedModifier
         walkSpeedModifier: 0.65
@@ -296,7 +287,7 @@
   flavor: bitter
   color: "#63806e"
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: SeeingRainbows
@@ -321,7 +312,7 @@
   flavor: bitter
   color: "#ffff00"
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: SeeingRainbows
@@ -341,7 +332,7 @@
   boilingPoint: 444.0
   meltingPoint: 128.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         conditions:
@@ -363,7 +354,7 @@
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: Muted
@@ -380,7 +371,7 @@
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:PopupMessage
         type: Local
@@ -424,7 +415,7 @@
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:PopupMessage
         type: Local
@@ -470,7 +461,7 @@
   flavor: paintthinner
   color: "#EE35FF"
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:Emote
         emote: Laugh
@@ -511,7 +502,7 @@
   color: "#46a6f5"
   physicalDesc: reagent-physical-desc-sugary
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:StaminaChange
         amount: -3
@@ -534,7 +525,7 @@
   color: "#f73715"
   physicalDesc: reagent-physical-desc-unhealthy
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:StaminaChange
         amount: -6
diff --git a/Resources/Prototypes/Reagents/psionic.yml b/Resources/Prototypes/Reagents/psionic.yml
index 75047bddea0..0835345f393 100644
--- a/Resources/Prototypes/Reagents/psionic.yml
+++ b/Resources/Prototypes/Reagents/psionic.yml
@@ -7,7 +7,7 @@
   color: "#700055"
   physicalDesc: reagent-physical-desc-viscous
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       # These messages would be more appropriate if there was a LoS-based Filter type. TODO
       # - !type:PopupMessage
@@ -49,7 +49,7 @@
   - !type:PlantAdjustToxins
     amount: 40
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         probability: 0.4
@@ -71,7 +71,7 @@
   color: "#FFBF00"
   physicalDesc: reagent-physical-desc-overpowering
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       metabolismRate: 0.2
       effects:
       - !type:GenericStatusEffect
@@ -108,7 +108,7 @@
   color: "#10366e"
   physicalDesc: reagent-physical-desc-diametric
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       metabolismRate: 5
       effects:
         - !type:ChemRestorePsionicReroll
@@ -181,7 +181,7 @@
   color: "#61a79d"
   physicalDesc: reagent-physical-desc-ethereal
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         probability: 0.4
diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml
index 39aea03cac4..90de4f8cad5 100644
--- a/Resources/Prototypes/Reagents/pyrotechnic.yml
+++ b/Resources/Prototypes/Reagents/pyrotechnic.yml
@@ -27,7 +27,7 @@
   - !type:FlammableTileReaction
     temperatureMultiplier: 2
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -53,7 +53,7 @@
       - !type:FlammableReaction
         multiplier: 0.4
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -73,7 +73,7 @@
   flavor: bitter
   color: "#D4872A"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -103,7 +103,7 @@
   tileReactions:
   - !type:PryTileReaction
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -158,7 +158,7 @@
   tileReactions:
   - !type:FlammableTileReaction {}
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -176,4 +176,4 @@
   flavor: bitter
   color: "#9e6b38"
   boilingPoint: 190.0 # Perfluorooctanoic Acid.
-  meltingPoint: 45.0
\ No newline at end of file
+  meltingPoint: 45.0
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 11580e3f558..9bb2a663517 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -12,7 +12,7 @@
   - !type:PlantAdjustHealth
     amount: -5
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -33,7 +33,7 @@
   - !type:PlantAdjustHealth
     amount: -5
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -54,7 +54,7 @@
   color: "#000067"
   physicalDesc: reagent-physical-desc-nondescript
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:Emote
         emote: Yawn
@@ -87,7 +87,7 @@
   color: "#acc91a"
   physicalDesc: reagent-physical-desc-putrid
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -109,7 +109,7 @@
   recognizable: true
   physicalDesc: reagent-physical-desc-fuzzy
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -147,7 +147,7 @@
         emote: Scream
         probability: 0.3
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate : 3.00 # High damage, high metabolism rate. You need a lot of units to crit. Simulates acid burning through you fast.
       effects:
       - !type:HealthChange
@@ -173,7 +173,7 @@
   physicalDesc: reagent-physical-desc-ferrous
   slippery: false
   metabolisms:
-    Drink:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateThirst
         factor: -1.5
@@ -209,7 +209,7 @@
         emote: Scream
         probability: 0.2
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 3.00 # High damage, high metabolism rate. You need a lot of units to crit. Simulates acid burning through you fast.
       effects:
       - !type:HealthChange
@@ -257,7 +257,7 @@
         emote: Scream
         probability: 0.1
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 3.00 # Okay damage, high metabolism rate. You need a lot of units to crit. Simulates acid burning through you fast.
       effects:
       - !type:HealthChange
@@ -287,7 +287,7 @@
   - !type:PlantAdjustMutationLevel
     amount: 1
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -302,7 +302,7 @@
   physicalDesc: reagent-physical-desc-strong-smelling
   color: "#5f959c"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -320,7 +320,7 @@
   physicalDesc: reagent-physical-desc-pungent
   color: "#6b0007"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -339,7 +339,7 @@
   - !type:PlantAdjustToxins
     amount: 10
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: SeeingRainbows
@@ -362,7 +362,7 @@
   physicalDesc: reagent-physical-desc-abrasive
   color: "#FA6464"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         probability: 0.1
@@ -402,12 +402,12 @@
   meltingPoint: 351
   boilingPoint: 554 # I'm not a chemist, but it boils at 295, lower than melting point, idk how it works so I gave it higher value
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.1 # WD EDIT: 0.05 -> 0.1 - Made bigger to be able to get lower amount of toxins per food/drink
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal # Applying damage to the mobs with lower metabolism capabilities
         damage:
           types:
@@ -415,7 +415,7 @@
       - !type:ChemVomit
         probability: 0.02 # WD EDIT: 0.04 -> 0.02 - Scaled for time, not metabolismrate.
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
 
 - type: reagent
@@ -426,7 +426,7 @@
   physicalDesc: reagent-physical-desc-nondescript
   color: "#D6CE7B"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.2
       effects:
       - !type:HealthChange
@@ -443,7 +443,7 @@
   flavor: bitter
   color: "#000000"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -460,7 +460,7 @@
   color: "#7e916e"
   worksOnTheDead: true
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:CauseZombieInfection
         conditions:
@@ -481,11 +481,11 @@
   flavor: bitter
   color: "#FFFFE5"
   metabolisms:
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:PopupMessage
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
           shouldHave: false
         type: Local
@@ -495,12 +495,12 @@
       - !type:ChemVomit
         probability: 0.1
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
           shouldHave: false
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
           shouldHave: false
         damage:
@@ -508,14 +508,14 @@
             Poison: 1
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
           shouldHave: true
         reagent: Protein
         amount: 0.5
       - !type:AdjustReagent
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Shadowkin
         reagent: Protein
         amount: 0.5
@@ -529,14 +529,14 @@
   flavor: bitter
   color: "#F2E9D2"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.05
       effects:
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 1
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
         damage:
           types:
@@ -550,7 +550,7 @@
   physicalDesc: reagent-physical-desc-soothing
   color: "#AAAAAA"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: Pacified
@@ -569,7 +569,7 @@
   flavor: bitter
   color: "#F2E9D2"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.05
       effects:
       - !type:Emote
@@ -581,7 +581,7 @@
         conditions:
         - !type:ReagentThreshold
           min: 1
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Animal
         damage:
           types:
@@ -596,7 +596,7 @@
   physicalDesc: reagent-physical-desc-metallic
   color: "#5C6274"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.03 # Effectively once every 30 seconds.
       effects:
       - !type:HealthChange
@@ -612,7 +612,7 @@
   physicalDesc: reagent-physical-desc-nondescript
   color: "#EBFF8E"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.2
       effects:
       - !type:HealthChange
@@ -629,7 +629,7 @@
   flavor: medicine
   color: "#435166"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:Jitter
         conditions:
@@ -652,7 +652,7 @@
   flavor: shocking
   color: "#FDD023"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:Electrocute
         probability: 0.8
@@ -666,7 +666,7 @@
   flavor: mothballs #why does weightloss juice taste like mothballs
   color: "#F0FFF0"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -689,12 +689,12 @@
   color: "#00b408"
   physicalDesc: reagent-physical-desc-nondescript
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.2 # Slower metabolism so it can build up over time for slowdown
       effects:
       - !type:HealthChange
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Arachnid
           shouldHave: false
         damage:
@@ -705,7 +705,7 @@
         - !type:ReagentThreshold
           reagent: Mechanotoxin
           min: 2
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Arachnid
           shouldHave: false
         walkSpeedModifier: 0.8
@@ -715,7 +715,7 @@
         - !type:ReagentThreshold
           reagent: Mechanotoxin
           min: 4
-        - !type:OrganType
+        - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
           type: Arachnid
           shouldHave: false
         walkSpeedModifier: 0.4
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
index 47e11d0f200..c71982370be 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/ritualseat.yml
@@ -32,7 +32,7 @@
           - tag: Head
             icon:
               sprite: Mobs/Species/Human/parts.rsi
-              state: "head_m"
+              state: "head" # WD EDIT: head_m -> head
             name: human head
             doAfter: 1
 
@@ -42,7 +42,7 @@
         - to: chairRitual
           completed:
             - !type:SpawnPrototype
-              prototype: HeadHuman
+              prototype: BodyPartHeadHuman # WD EDIT: HeadHuman -> BodyPartHeadHuman
               amount: 1
           steps:
             - tool: Prying
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index acb5beb712b..6cb897269eb 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -46,7 +46,7 @@
   group: Savory
   solids:
     FoodBreadBun: 1
-    OrganHumanAppendix: 1
+    OrganAppendixHuman: 1 # WD EDIT: OrganHumanAppendix -> OrganAppendixHuman
 
 - type: microwaveMealRecipe
   id: RecipeBaconBurger
@@ -100,7 +100,7 @@
   group: Savory
   solids:
     FoodBreadBun: 1
-    OrganHumanBrain: 1
+    OrganBrainHuman: 1 # WD EDIT: OrganHumanBrain -> OrganBrainHuman
 
 - type: microwaveMealRecipe
   id: RecipeCatBurger
@@ -905,7 +905,7 @@
     Water: 10
   solids:
     FoodBowlBig: 1
-    OrganHumanEyes: 1
+    OrganEyesHuman: 1 # WD EDIT: OrganHumanEyes -> OrganEyesHuman
     FoodCarrot: 1
     FoodPotato: 1
 
@@ -1653,7 +1653,7 @@
   group: Cake
   solids:
     FoodCakePlain: 1
-    OrganHumanBrain: 1
+    OrganBrainHuman: 1 # WD EDIT: OrganHumanBrain -> OrganBrainHuman
 
 - type: microwaveMealRecipe
   id: RecipeSlimeCake
@@ -1678,7 +1678,7 @@
   solids:
     FoodCakePlain: 1
     FoodSnackRaisins: 1
-    OrganAnimalHeart: 1
+    OrganHeartAnimal: 1 # WD EDIT: OrganAnimalHeart -> OrganHeartAnimal
 
 - type: microwaveMealRecipe
   id: RecipeBreadDog
@@ -1690,7 +1690,7 @@
     Cognizine: 5
   solids:
     FoodBreadSausage: 1
-    OrganAnimalHeart: 1
+    OrganHeartAnimal: 1 # WD EDIT: OrganAnimalHeart -> OrganHeartAnimal
     FoodSpaceshroomCooked: 1
 
 - type: microwaveMealRecipe
@@ -1725,9 +1725,9 @@
   result: FoodHarpyWings
   time: 15
   solids:
-    LeftLegHarpy: 1
-    RightLegHarpy: 1
- 
+    BodyPartLeftLegHarpy: 1 # WD EDIT: LeftLegHarpy -> BodyPartLeftLegHarpy
+    BodyPartRightLegHarpy: 1 # WD EDIT: RightLegHarpy -> BodyPartRightLegHarpy
+
 #Donks i guess
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocket
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 35fddf9fd5d..511e88870f0 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -42,9 +42,6 @@
   - Drill
   - Saw
   - Hemostat
-  # EE EDIT START
-  - BoneGel
-  # EE EDIT END
 
 - type: latheRecipePack
   id: MedicalStatic
@@ -119,7 +116,6 @@
   - CryoPodMachineCircuitboard
   - BiomassReclaimerMachineCircuitboard
   # EE EDIT START
-  - AutodocCircuitboard
   - CloningConsoleComputerCircuitboard
   - MedicalScannerMachineCircuitboard
   # EE EDIT END
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index 49bca5b5131..03de1cd81dd 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -19,19 +19,16 @@
   - BorgModuleFireExtinguisher
   - BorgModuleRadiationDetection
   - BorgModuleTool
-  # EE EDIT START
-  - BorgModuleSurgery
-  # EE EDIT END
 
 - type: latheRecipePack
   id: BorgLimbsStatic
   recipes:
-  - LeftArmBorg
-  - RightArmBorg
-  - LeftLegBorg
-  - RightLegBorg
-  - LightHeadBorg
-  - TorsoBorg
+  - BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
+  - BodyPartRightArmBorg # WD EDIT: RightArmBorg -> BodyPartRightArmBorg
+  - BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
+  - BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
+  - BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
+  - BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
 
 ## Dynamic
 
@@ -60,7 +57,6 @@
   - BorgModuleAdvancedTreatment
   # EE EDIT START
   - BorgModulePka
-  - BorgModuleAdvancedSurgery
   - BorgModuleJetpack
   # EE EDIT END
 
diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index b600429a5f2..5e795c17025 100644
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -65,33 +65,33 @@
 
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
-  id: LeftArmBorg
-  result: LeftArmBorg
+  id: BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
+  result: BodyPartLeftArmBorg # WD EDIT: LeftArmBorg -> BodyPartLeftArmBorg
 
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
-  id: RightArmBorg
-  result: RightArmBorg
+  id: BodyPartRightArmBorg # WD EDIT: RightArmBorg -> BodyPartRightArmBorg
+  result: BodyPartRightArmBorg # WD EDIT: RightArmBorg -> BodyPartRightArmBorg
 
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
-  id: LeftLegBorg
-  result: LeftLegBorg
+  id: BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
+  result: BodyPartLeftLegBorg # WD EDIT: LeftLegBorg -> BodyPartLeftLegBorg
 
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
-  id: RightLegBorg
-  result: RightLegBorg
+  id: BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
+  result: BodyPartRightLegBorg # WD EDIT: RightLegBorg -> BodyPartRightLegBorg
 
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
-  id: LightHeadBorg
-  result: LightHeadBorg
+  id: BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
+  result: BodyPartHeadBorg # WD EDIT: LightHeadBorg -> BodyPartHeadBorg
 
 - type: latheRecipe
   parent: BaseBorgLimbRecipe
-  id: TorsoBorg
-  result: TorsoBorg
+  id: BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
+  result: BodyPartTorsoBorg # WD EDIT: TorsoBorg -> BodyPartTorsoBorg
 
 # Parts
 
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 29f68924e98..58e20c025e3 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -26,6 +26,10 @@
   - BorgModuleArtifact
   - BorgModuleAnomaly
   - DroneElectronics
+  # WD EDIT START
+  - BorgModuleAdvancedTreatment
+  - BorgModuleDefibrillator
+  # WD EDIT END
 
 - type: technology
   id: BasicElectronics
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 405734ca49d..f979b8eeaf9 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -90,7 +90,6 @@
     - HandheldHealthAnalyzer
     - CombatMedipen
     - DeathAcidifierImplanter
-    - OmnimedToolSyndie
 
 #Lone Operative Gear
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index 53cd2a07554..722a4ce4c21 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -25,8 +25,8 @@
   - !type:AddComponentSpecial
     components:
     - type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 1.75
+    # - type: SurgerySpeedModifier
+    #   speedModifier: 1.75
 
 - 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 4010caafcc8..05a88dea480 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -46,8 +46,8 @@
   - !type:AddComponentSpecial
     components:
     - type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 3 # WWDP
+    # - type: SurgerySpeedModifier
+    #   speedModifier: 3 # WWDP
   afterLoadoutSpecial:
   - !type:ModifyEnvirosuitSpecial
     charges: 8
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index e5d1c8d6a5d..64bf6c0ab64 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -27,8 +27,8 @@
   - !type:AddComponentSpecial
     components:
     - type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 3 # WWDP
+    # - type: SurgerySpeedModifier
+    #   speedModifier: 3 # WWDP
 
 - 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 352f4da8ff0..c185f3f3101 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -19,8 +19,8 @@
   - !type:AddComponentSpecial
     components:
     - type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 2 # WWDP
+    # - type: SurgerySpeedModifier
+    #   speedModifier: 2 # WWDP
 
 - type: startingGear
   id: MedicalInternGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 426c5575bc8..3c6439369c3 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -28,8 +28,8 @@
   - !type:AddComponentSpecial
     components:
     - type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 2 # WD EDIT
+    # - type: SurgerySpeedModifier
+    #   speedModifier: 2 # WD EDIT
 
 - type: startingGear
   id: ParamedicGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
index d3feb6017aa..e2cc8109375 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
@@ -32,8 +32,8 @@
   - !type:AddComponentSpecial
     components:
     - type: CPRTraining
-    - type: SurgerySpeedModifier
-      speedModifier: 3 # WWDP
+    # - type: SurgerySpeedModifier
+    #   speedModifier: 3 # WWDP
 
 - type: startingGear
   id: SeniorPhysicianGear
diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml
index 13f18e32964..cd506dbec20 100644
--- a/Resources/Prototypes/Species/arachne.yml
+++ b/Resources/Prototypes/Species/arachne.yml
@@ -3,10 +3,6 @@
   name: species-name-arachne
   roundStart: false # White Dream - disable arachne for missing textures.
   prototype: MobArachne
-  # WD EDIT START
-  bodyTypes:
-  - ArachneNormal
-  # WD EDIT END
   defaultSkinTone: "#c0967f"
   markingLimits: MobArachneMarkingLimits
   dollPrototype: MobArachneDummy
@@ -34,6 +30,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     RightArm:
       points: 6
       required: false
@@ -46,29 +47,3 @@
     LeftHand:
       points: 6
       required: false
-
-# WD EDIT START
-- type: bodyType
-  id: ArachneNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobHumanHead
-    Face: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobHumanTorso
-    Eyes: MobArachneEyes
-    LArm: MobHumanLArm
-    RArm: MobHumanRArm
-    LHand: MobHumanLHand
-    RHand: MobHumanRHand
-    Undershirt: MobHumanoidAnyMarking
-
-- type: humanoidBaseSprite
-  id: MobArachneEyes
-  baseSprite:
-    sprite: Mobs/Species/eyes.rsi
-    state: eyes
diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml
index 07d4e7747c6..1d2f825e1a2 100644
--- a/Resources/Prototypes/Species/arachnid.yml
+++ b/Resources/Prototypes/Species/arachnid.yml
@@ -3,10 +3,6 @@
   name: species-name-arachnid
   roundStart: true
   prototype: MobArachnid
-  # WD EDIT START
-  bodyTypes:
-    - ArachnidNormal
-  # WD EDIT END
   defaultSkinTone: "#385878"
   markingLimits: MobArachnidMarkingLimits
   dollPrototype: MobArachnidDummy
@@ -17,36 +13,6 @@
   sexes:
   - Unsexed
 
-# WD EDIT START
-- type: bodyType
-  id: ArachnidNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobArachnidHead
-    Snout: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobArachnidTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobArachnidEyes
-    LArm: MobArachnidLArm
-    RArm: MobArachnidRArm
-    LHand: MobArachnidLHand
-    RHand: MobArachnidRHand
-    LLeg: MobArachnidLLeg
-    RLeg: MobArachnidRLeg
-    LFoot: MobArachnidLFoot
-    RFoot: MobArachnidRFoot
-
-- type: humanoidBaseSprite
-  id: MobArachnidEyes
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: eyes
-
 - type: markingPoints
   id: MobArachnidMarkingLimits
   onlyWhitelisted: true
@@ -59,8 +25,7 @@
       required: false
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [ ArachnidAppendagesDefault ]
+      required: false # WD EDIT
     HeadTop:
       points: 1
       required: false
@@ -71,6 +36,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -101,87 +71,3 @@
     LeftHand:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobArachnidHead
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobArachnidTorso
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobArachnidTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobArachnidLLeg
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobArachnidLHand
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobArachnidLArm
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobArachnidLFoot
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobArachnidRLeg
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobArachnidRHand
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobArachnidRArm
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobArachnidRFoot
-  baseSprite:
-    sprite: Mobs/Species/Arachnid/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml
index 949e19c6c68..04116588ac1 100644
--- a/Resources/Prototypes/Species/diona.yml
+++ b/Resources/Prototypes/Species/diona.yml
@@ -3,10 +3,6 @@
   name: species-name-diona
   roundStart: true
   prototype: MobDiona
-  # WD EDIT START
-  bodyTypes:
-    - DionaNormal
-  # WD EDIT END
   defaultSkinTone: "#cdb369"
   markingLimits: MobDionaMarkingLimits
   dollPrototype: MobDionaDummy
@@ -16,28 +12,6 @@
   lastNames: DionaLast
   naming: TheFirstofLast
 
-# WD EDIT START
-- type: bodyType
-  id: DionaNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobDionaHead
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobDionaTorso
-    Eyes: MobDionaEyes
-    LArm: MobDionaLArm
-    RArm: MobDionaRArm
-    LHand: MobDionaLHand
-    RHand: MobDionaRHand
-    LLeg: MobDionaLLeg
-    RLeg: MobDionaRLeg
-    LFoot: MobDionaLFoot
-    RFoot: MobDionaRFoot
-
 - type: markingPoints
   id: MobDionaMarkingLimits
   onlyWhitelisted: true
@@ -54,6 +28,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -88,93 +67,3 @@
       points: 1
       required: true
       defaultMarkings: [ DionaVineOverlay ]
-
-- type: humanoidBaseSprite
-  id: MobDionaEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: diona
-
-- type: humanoidBaseSprite
-  id: MobDionaHead
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobDionaHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobDionaHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobDionaTorso
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobDionaTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobDionaTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobDionaLLeg
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobDionaLHand
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobDionaLArm
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobDionaLFoot
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobDionaRLeg
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobDionaRHand
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobDionaRArm
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobDionaRFoot
-  baseSprite:
-    sprite: Mobs/Species/Diona/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index 76b57b02d8b..8a26b6cfe75 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -3,10 +3,6 @@
   name: species-name-dwarf
   roundStart: true
   prototype: MobDwarf
-  # WD EDIT START
-  bodyTypes:
-  - HumanNormal
-  # WD EDIT END
   defaultSkinTone: "#c0967f"
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobDwarfDummy
@@ -17,3 +13,8 @@
   minWidth: 0.7
   defaultWidth: 0.8
   maxWidth: 0.9 # White Dream: End of changes
+  # WD EDIT START
+  bodyTypes:
+  - Normal
+  - Slim
+  # WD EDIT END
diff --git a/Resources/Prototypes/Species/gingerbread.yml b/Resources/Prototypes/Species/gingerbread.yml
index e7baba63ff3..2f9155aecaa 100644
--- a/Resources/Prototypes/Species/gingerbread.yml
+++ b/Resources/Prototypes/Species/gingerbread.yml
@@ -3,123 +3,7 @@
   name: species-name-gingerbread
   roundStart: false
   prototype: MobGingerbread
-  # WD EDIT START
-  bodyTypes:
-    - GingerbreadNormal
-  # WD EDIT END
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobGingerbreadDummy
   skinColoration: HumanToned
   defaultSkinTone: "#9a7c5a"
-
-# WD EDIT START
-- type: bodyType
-  id: GingerbreadNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobGingerbreadHead
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobGingerbreadTorso
-    Eyes: MobGingerbreadEyes
-    LArm: MobGingerbreadLArm
-    RArm: MobGingerbreadRArm
-    LHand: MobGingerbreadLHand
-    RHand: MobGingerbreadRHand
-    LLeg: MobGingerbreadLLeg
-    RLeg: MobGingerbreadRLeg
-    LFoot: MobGingerbreadLFoot
-    RFoot: MobGingerbreadRFoot
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: no_eyes
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadHead
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadTorso
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLLeg
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLHand
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLArm
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadLFoot
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRLeg
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRHand
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRArm
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobGingerbreadRFoot
-  baseSprite:
-    sprite: Mobs/Species/Gingerbread/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml
index f7f84d900c6..33ac7f18421 100644
--- a/Resources/Prototypes/Species/harpy.yml
+++ b/Resources/Prototypes/Species/harpy.yml
@@ -3,11 +3,6 @@
   name: species-name-harpy
   roundStart: true
   prototype: MobHarpy
-  # WD EDIT START
-  bodyTypes:
-  - HarpyNormal
-  - HarpySlim
-  # WD EDIT END
   defaultSkinTone: "#c0967f"
   markingLimits: MobHarpyMarkingLimits
   dollPrototype: MobHarpyDummy
@@ -18,34 +13,11 @@
   minWidth: 0.8
   defaultWidth: 0.8
   maxWidth: 1 # White Dream: End of changes
-
-# WD EDIT START
-- type: bodyType
-  id: HarpyNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobHarpyHead
-    Face: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobHarpyTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobHarpyLArm
-    RArm: MobHarpyRArm
-    LHand: MobHarpyLHand
-    RHand: MobHarpyRHand
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    LLeg: MobHarpyLLeg
-    RLeg: MobHarpyRLeg
-    LFoot: MobHarpyLFoot
-    RFoot: MobHarpyRFoot
-
+  # WD EDIT START
+  bodyTypes:
+  - Normal
+  - Slim
+  # WD EDIT END
 
 - type: markingPoints
   id: MobHarpyMarkingLimits
@@ -58,8 +30,7 @@
       required: false
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [ HarpyTailPhoenix ]
+      required: false # WD EDIT
     HeadTop:
       points: 2
       required: true
@@ -71,6 +42,11 @@
       points: 6
       required: true
       defaultMarkings: [ HarpyChestDefault ]
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -102,87 +78,3 @@
     LeftHand:
       points: 2
       required: false
-
-- type: humanoidBaseSprite
-  id: MobHarpyHead
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorso
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyLLeg
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobHarpyLHand
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobHarpyLArm
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobHarpyLFoot
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobHarpyRLeg
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobHarpyRHand
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobHarpyRArm
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobHarpyRFoot
-  baseSprite:
-    sprite: Mobs/Species/Harpy/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml
index 970917dba39..ac8b3b22780 100644
--- a/Resources/Prototypes/Species/human.yml
+++ b/Resources/Prototypes/Species/human.yml
@@ -3,49 +3,16 @@
   name: species-name-human
   roundStart: true
   prototype: MobHuman
-  # WD EDIT START
-  bodyTypes:
-  - HumanNormal
-  - HumanSlim
-  # WD EDIT END
   defaultSkinTone: "#c0967f"
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobHumanDummy
   skinColoration: HumanToned
   bonusTraitPoints: 2
-
-# The lack of a layer means that
-# this person cannot have round-start anything
-# applied to that layer. It has to instead
-# be defined as a 'custom base layer'
-# in either the mob's starting marking prototype,
-# or it has to be added in C#.
-# WD EDIT START
-- type: bodyType
-  id: HumanNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobHumanHead
-    Face: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobHumanTorso
-    Eyes: MobHumanoidEyes
-    LArm: MobHumanLArm
-    RArm: MobHumanRArm
-    LHand: MobHumanLHand
-    RHand: MobHumanRHand
-    LLeg: MobHumanLLeg
-    RLeg: MobHumanRLeg
-    LFoot: MobHumanLFoot
-    RFoot: MobHumanRFoot
-    Tail: MobHumanoidAnyMarking # Nyanotrasen - Felinid
-    HeadTop: MobHumanoidAnyMarking # Nyanotrasen - Felinid & Oni
-    HeadSide: MobHumanoidAnyMarking
+  # WD EDIT START
+  bodyTypes:
+  - Normal
+  - Slim
+  # WD EDIT END
 
 - type: markingPoints
   id: MobHumanMarkingLimits
@@ -74,6 +41,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -104,100 +76,3 @@
     LeftHand:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobHumanoidEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobHumanoidAnyMarking
-
-- type: humanoidBaseSprite
-  id: MobHumanoidMarkingMatchSkin
-  markingsMatchSkin: true
-
-- type: humanoidBaseSprite
-  id: MobHumanHead
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobHumanHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobHumanHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobHumanTorso
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobHumanTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobHumanTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobHumanLLeg
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobHumanLArm
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobHumanLHand
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobHumanLFoot
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobHumanRLeg
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobHumanRArm
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobHumanRHand
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobHumanRFoot
-  baseSprite:
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/ipc.yml b/Resources/Prototypes/Species/ipc.yml
index dd58a62e174..19b88c16e9e 100644
--- a/Resources/Prototypes/Species/ipc.yml
+++ b/Resources/Prototypes/Species/ipc.yml
@@ -3,10 +3,6 @@
   name: species-name-ipc
   roundStart: true
   prototype: MobIPC
-  # WD EDIT START
-  bodyTypes:
-  - IPCNormal
-  # WD EDIT END
   defaultSkinTone: "#aaa9ad"
   markingLimits: MobIPCMarkingLimits
   dollPrototype: MobIPCDummy
@@ -22,260 +18,53 @@
   sexes:
   - Unsexed
 
-# The lack of a layer means that
-# this person cannot have round-start anything
-# applied to that layer. It has to instead
-# be defined as a 'custom base layer'
-# in either the mob's starting marking prototype,
-# or it has to be added in C#.
-# WD EDIT START
-- type: bodyType
-  id: IPCNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobIPCHead
-    Face: MobHumanoidAnyMarking
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Hair: MobHumanoidMarkingMatchSkin
-    FacialHair: MobHumanoidMarkingMatchSkin
-    Eyes: MobHumanoidAnyMarking
-    Chest: MobIPCTorso
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    LArm: MobIPCLArm
-    RArm: MobIPCRArm
-    LHand: MobIPCLHand
-    RHand: MobIPCRHand
-    LLeg: MobIPCLLeg
-    RLeg: MobIPCRLeg
-    LFoot: MobIPCLFoot
-    RFoot: MobIPCRFoot
-    Wings: MobHumanoidAnyMarking
-
 - type: markingPoints
   id: MobIPCMarkingLimits
   points:
     Head:
       points: 6
       required: true
-      defaultMarkings: [ MobIPCHeadDefault ]
     Face:
       points: 6
       required: false
     Chest:
       points: 6
       required: true
-      defaultMarkings: [ MobIPCTorsoDefault ]
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: true
+    # WD EDIT END
     HeadSide:
       points: 6
       required: false
     RightLeg:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCRLegDefault ]
     RightFoot:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCRFootDefault ]
     LeftLeg:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCLLegDefault ]
     LeftFoot:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCLFootDefault ]
     RightArm:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCRArmDefault ]
     RightHand:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCRHandDefault ]
     LeftArm:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCLArmDefault ]
     LeftHand:
       points: 6
       required: false
-      defaultMarkings: [ MobIPCLHandDefault ]
     Wings:
       points: 1
       required: false
 
-- type: humanoidBaseSprite
-  id: MobIPCMarkingFollowSkin
-  markingsMatchSkin: true
-  layerAlpha: 0.5
-
-- type: humanoidBaseSprite
-  id: MobIPCScreen
-
-# Head
-
-- type: humanoidBaseSprite
-  id: MobIPCHead
-
-- type: humanoidBaseSprite
-  id: MobIPCHeadMale
-
-- type: humanoidBaseSprite
-  id: MobIPCHeadFemale
-
-- type: marking
-  id: MobIPCHeadDefault
-  bodyPart: Head
-  markingCategory: Head
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: head_m
-
-# Torso
-
-- type: humanoidBaseSprite
-  id: MobIPCTorso
-
-- type: humanoidBaseSprite
-  id: MobIPCTorsoMale
-
-- type: humanoidBaseSprite
-  id: MobIPCTorsoFemale
-
-- type: marking
-  id: MobIPCTorsoDefault
-  bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: torso_m
-
-- type: marking
-  id: MobIPCTorsoFemaleDefault
-  bodyPart: Chest
-  markingCategory: Chest
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: torso_f
-
-# Left Leg
-
-- type: humanoidBaseSprite
-  id: MobIPCLLeg
-
-- type: marking
-  id: MobIPCLLegDefault
-  bodyPart: LLeg
-  markingCategory: LeftLeg
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: l_leg
-
-# Left Arm
-
-- type: humanoidBaseSprite
-  id: MobIPCLArm
-
-- type: marking
-  id: MobIPCLArmDefault
-  bodyPart: LArm
-  markingCategory: LeftArm
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: l_arm
-
-#LHand
-
-- type: humanoidBaseSprite
-  id: MobIPCLHand
-
-- type: marking
-  id: MobIPCLHandDefault
-  bodyPart: LHand
-  markingCategory: LeftHand
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: l_hand
-
-#LFoot
-
-- type: humanoidBaseSprite
-  id: MobIPCLFoot
-
-- type: marking
-  id: MobIPCLFootDefault
-  bodyPart: LFoot
-  markingCategory: LeftFoot
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: l_foot
-
-#RLeg
-
-- type: humanoidBaseSprite
-  id: MobIPCRLeg
-
-- type: marking
-  id: MobIPCRLegDefault
-  bodyPart: RLeg
-  markingCategory: RightLeg
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: r_leg
-
-#RArm
-
-- type: humanoidBaseSprite
-  id: MobIPCRArm
-
-- type: marking
-  id: MobIPCRArmDefault
-  bodyPart: RArm
-  markingCategory: RightArm
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: r_arm
-
-#RHand
-
-- type: humanoidBaseSprite
-  id: MobIPCRHand
-
-- type: marking
-  id: MobIPCRHandDefault
-  bodyPart: RHand
-  markingCategory: RightHand
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: r_hand
-
-#RFoot
-
-- type: humanoidBaseSprite
-  id: MobIPCRFoot
-
-- type: marking
-  id: MobIPCRFootDefault
-  bodyPart: RFoot
-  markingCategory: RightFoot
-  speciesRestriction: [ IPC ]
-  sprites:
-  - sprite: Mobs/Species/IPC/parts.rsi
-    state: r_foot
-
 - type: Tag
   id: IPCMaskWearable
diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml
index 2411e947d28..f03cab97984 100644
--- a/Resources/Prototypes/Species/moth.yml
+++ b/Resources/Prototypes/Species/moth.yml
@@ -3,10 +3,6 @@
   name: species-name-moth
   roundStart: true
   prototype: MobMoth
-  # WD EDIT START
-  bodyTypes:
-    - MothNormal
-  # WD EDIT END
   defaultSkinTone: "#ffda93"
   markingLimits: MobMothMarkingLimits
   dollPrototype: MobMothDummy
@@ -15,37 +11,6 @@
   femaleFirstNames: names_moth_first_female
   lastNames: names_moth_last
 
-# WD EDIT START
-- type: bodyType
-  id: MothNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobMothHead
-    Face: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobMothTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobMothEyes
-    LArm: MobMothLArm
-    RArm: MobMothRArm
-    LHand: MobMothLHand
-    RHand: MobMothRHand
-    LLeg: MobMothLLeg
-    RLeg: MobMothRLeg
-    LFoot: MobMothLFoot
-    RFoot: MobMothRFoot
-
-- type: humanoidBaseSprite
-  id: MobMothEyes
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: eyes
-
 - type: markingPoints
   id: MobMothMarkingLimits
   onlyWhitelisted: true
@@ -56,10 +21,11 @@
     FacialHair:
       points: 0
       required: false
-    Tail:
+    # WD EDIT START
+    Wings:
       points: 1
-      required: true
-      defaultMarkings: [ MothWingsDefault ]
+      required: false
+    # WD EDIT END
     Snout:
       points: 1
       required: true
@@ -77,6 +43,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -107,87 +78,3 @@
     LeftHand:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobMothHead
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMothHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMothHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobMothTorso
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMothTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMothTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobMothLLeg
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobMothLHand
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobMothLArm
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobMothLFoot
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobMothRLeg
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobMothRHand
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobMothRArm
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobMothRFoot
-  baseSprite:
-    sprite: Mobs/Species/Moth/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/plasmaman.yml b/Resources/Prototypes/Species/plasmaman.yml
index b13c23651ad..b2bdac84871 100644
--- a/Resources/Prototypes/Species/plasmaman.yml
+++ b/Resources/Prototypes/Species/plasmaman.yml
@@ -3,10 +3,6 @@
   name: species-name-plasmaman
   roundStart: true
   prototype: MobPlasmaman
-  # WD EDIT START
-  bodyTypes:
-  - PlasmamanNormal
-  # WD EDIT END
   defaultSkinTone: "#a349a4"
   markingLimits: MobPlasmamanMarkingLimits
   dollPrototype: MobPlasmamanDummy
@@ -20,26 +16,6 @@
   sexes:
   - Unsexed
 
-# WD EDIT START
-- type: bodyType
-  id: PlasmamanNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobPlasmamanHead
-    Face: MobHumanoidAnyMarking
-    Chest: MobPlasmamanTorso
-    Eyes: MobPlasmamanEyes
-    LArm: MobPlasmamanLArm
-    RArm: MobPlasmamanRArm
-    LHand: MobPlasmamanLHand
-    RHand: MobPlasmamanRHand
-    LLeg: MobPlasmamanLLeg
-    RLeg: MobPlasmamanRLeg
-    LFoot: MobPlasmamanLFoot
-    RFoot: MobPlasmamanRFoot
-    Wings: MobHumanoidAnyMarking
-
 - type: markingPoints
   id: MobPlasmamanMarkingLimits
   onlyWhitelisted: true # Hides the hair and facial hair options
@@ -62,6 +38,11 @@
     Chest:
       points: 1
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     RightLeg:
       points: 2
       required: false
@@ -86,93 +67,3 @@
     LeftHand:
       points: 2
       required: false
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanHead
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanEyes
-  baseSprite:
-    sprite: Mobs/Customization/plasmaman.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanTorso
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanLLeg
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanLArm
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanLHand
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanLFoot
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanRLeg
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanRArm
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanRHand
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobPlasmamanRFoot
-  baseSprite:
-    sprite: Mobs/Species/Plasmaman/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml
index 2a90803f8df..8e84a3a38d4 100644
--- a/Resources/Prototypes/Species/reptilian.yml
+++ b/Resources/Prototypes/Species/reptilian.yml
@@ -3,11 +3,6 @@
   name: species-name-reptilian
   roundStart: true
   prototype: MobReptilian
-  # WD EDIT START
-  bodyTypes:
-    - ReptilianNormal
-    - ReptilianSlim
-  # WD EDIT END
   defaultSkinTone: "#34a223"
   markingLimits: MobReptilianMarkingLimits
   dollPrototype: MobReptilianDummy
@@ -21,33 +16,11 @@
   minWidth: 0.9
   defaultWidth: 1.1
   maxWidth: 1.2 # White Dream: End of changes.
-
-# WD EDIT START
-- type: bodyType
-  id: ReptilianNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobReptilianHead
-    Face: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobReptilianTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobReptilianLArm
-    RArm: MobReptilianRArm
-    LHand: MobReptilianLHand
-    RHand: MobReptilianRHand
-    # WD EDIT START
-    LLeg: MobReptilianDigiLLeg
-    RLeg: MobReptilianDigiRLeg
-    LFoot: MobReptilianDigiLFoot
-    RFoot: MobReptilianDigiRFoot
-    # WD EDIT END
+  # WD EDIT START
+  bodyTypes:
+  - Normal
+  - Slim
+  # WD EDIT END
 
 - type: markingPoints
   id: MobReptilianMarkingLimits
@@ -61,8 +34,7 @@
       required: false
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [ LizardTailSmooth ]
+      required: false # WD EDIT
     Snout:
       points: 1
       required: true
@@ -76,6 +48,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -106,87 +83,3 @@
     LeftHand:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobReptilianHead
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobReptilianHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobReptilianHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobReptilianTorso
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobReptilianTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobReptilianTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobReptilianLLeg
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobReptilianLHand
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobReptilianLArm
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobReptilianLFoot
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobReptilianRLeg
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobReptilianRHand
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobReptilianRArm
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobReptilianRFoot
-  baseSprite:
-    sprite: Mobs/Species/Reptilian/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml
index 5cadf47a2a7..c227186d965 100644
--- a/Resources/Prototypes/Species/shadowkin.yml
+++ b/Resources/Prototypes/Species/shadowkin.yml
@@ -3,10 +3,6 @@
   name: species-name-shadowkin
   roundStart: false # WD EDIT
   prototype: MobShadowkin
-  # WD EDIT START
-  bodyTypes:
-    - ShadowkinNormal
-  # WD EDIT END
   defaultSkinTone: "#FFFFFF"
   markingLimits: MobShadowkinMarkingLimits
   dollPrototype: MobShadowkinDummy
@@ -28,37 +24,12 @@
   defaultWidth: 0.85
   maxWidth: 1.2
 
-# WD EDIT START
-- type: bodyType
-  id: ShadowkinNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobShadowkinHead
-    Snout: MobShadowkinAnyMarkingFollowSkin
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    HeadTop: MobShadowkinAnyMarking
-    HeadSide: MobShadowkinAnyMarkingFollowSkin
-    Tail: MobShadowkinAnyMarkingFollowSkin
-    Chest: MobShadowkinTorso
-    Eyes: MobShadowkinEyes
-    LArm: MobShadowkinLArm
-    RArm: MobShadowkinRArm
-    LHand: MobShadowkinLHand
-    RHand: MobShadowkinRHand
-    LLeg: MobShadowkinLLeg
-    RLeg: MobShadowkinRLeg
-    LFoot: MobShadowkinLFoot
-    RFoot: MobShadowkinRFoot
-
 - type: markingPoints
   id: MobShadowkinMarkingLimits
   points:
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [TailShadowkin]
+      required: false # WD EDIT
     HeadTop:
       points: 1
       required: true
@@ -90,100 +61,3 @@
     LeftHand:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobShadowkinAnyMarkingFollowSkin
-  markingsMatchSkin: true
-
-- type: humanoidBaseSprite
-  id: MobShadowkinAnyMarking
-
-- type: humanoidBaseSprite
-  id: MobShadowkinHead
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobShadowkinHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobShadowkinHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobShadowkinTorso
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobShadowkinTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobShadowkinTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobShadowkinLLeg
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobShadowkinLHand
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobShadowkinEyes
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobShadowkinLArm
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobShadowkinLFoot
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobShadowkinRLeg
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobShadowkinRHand
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobShadowkinRArm
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobShadowkinRFoot
-  baseSprite:
-    sprite: Mobs/Species/Shadowkin/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/skeleton.yml b/Resources/Prototypes/Species/skeleton.yml
index 9da22da8e2a..8e54c4a7771 100644
--- a/Resources/Prototypes/Species/skeleton.yml
+++ b/Resources/Prototypes/Species/skeleton.yml
@@ -3,114 +3,9 @@
   name: species-name-skeleton
   roundStart: false
   prototype: MobSkeletonPerson
-  # WD EDIT START
-  bodyTypes:
-    - SkeletonNormal
-  # WD EDIT END
   defaultSkinTone: "#fff9e2"
   markingLimits: MobHumanMarkingLimits
   maleFirstNames: skeletonNamesFirst
   femaleFirstNames: skeletonNamesFirst
   dollPrototype: MobSkeletonPersonDummy
   skinColoration: TintedHues
-
-# WD EDIT START
-- type: bodyType
-  id: SkeletonNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobSkeletonHead
-    Chest: MobSkeletonTorso
-    LArm: MobSkeletonLArm
-    RArm: MobSkeletonRArm
-    LHand: MobSkeletonLHand
-    RHand: MobSkeletonRHand
-    LLeg: MobSkeletonLLeg
-    RLeg: MobSkeletonRLeg
-    LFoot: MobSkeletonLFoot
-    RFoot: MobSkeletonRFoot
-
-- type: humanoidBaseSprite
-  id: MobSkeletonHead
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobSkeletonHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobSkeletonHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobSkeletonTorso
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobSkeletonTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobSkeletonTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobSkeletonLLeg
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobSkeletonLArm
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobSkeletonLHand
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobSkeletonLFoot
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobSkeletonRLeg
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobSkeletonRArm
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobSkeletonRHand
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobSkeletonRFoot
-  baseSprite:
-    sprite: Mobs/Species/Skeleton/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
index 5b7975d284c..07f23610e3f 100644
--- a/Resources/Prototypes/Species/slime.yml
+++ b/Resources/Prototypes/Species/slime.yml
@@ -3,54 +3,39 @@
   name: species-name-slime
   roundStart: true
   prototype: MobSlimePerson
-  # WD EDIT START
-  bodyTypes:
-    - SlimeNormal
-  # WD EDIT END
   defaultSkinTone: "#b8b8b8"
   markingLimits: MobSlimeMarkingLimits
   dollPrototype: MobSlimePersonDummy
   skinColoration: Hues
 
-# WD EDIT START
-- type: bodyType
-  id: SlimeNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Face: MobHumanoidAnyMarking
-    Head: MobSlimeHead
-    HeadSide: MobHumanoidAnyMarking
-    Hair: MobSlimeMarkingFollowSkin
-    FacialHair: MobSlimeMarkingFollowSkin
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobSlimeTorso
-    Eyes: MobHumanoidEyes
-    LArm: MobSlimeLArm
-    RArm: MobSlimeRArm
-    LHand: MobSlimeLHand
-    RHand: MobSlimeRHand
-    LLeg: MobSlimeLLeg
-    RLeg: MobSlimeRLeg
-    LFoot: MobSlimeLFoot
-    RFoot: MobSlimeRFoot
-
 - type: markingPoints
   id: MobSlimeMarkingLimits
   points:
     Hair:
       points: 1
       required: false
+      # WD EDIT START
+      matchSkin: true
+      layerAlpha: 0.75
+      # WD EDIT END
     HeadSide:
       points: 6
       required: false
     FacialHair:
       points: 1
       required: false
+      # WD EDIT START
+      matchSkin: true
+      layerAlpha: 0.75
+      # WD EDIT END
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -81,92 +66,3 @@
     LeftHand:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobSlimeMarkingFollowSkin
-  markingsMatchSkin: true
-  layerAlpha: 0.75
-
-- type: humanoidBaseSprite
-  id: MobSlimeHead
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobSlimeTorso
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobSlimeTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobSlimeLLeg
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobSlimeLArm
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobSlimeLHand
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobSlimeLFoot
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobSlimeRLeg
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobSlimeRArm
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobSlimeRHand
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobSlimeRFoot
-  baseSprite:
-    sprite: Mobs/Species/Slime/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
index e63aa087f6a..0b4505fc3ef 100644
--- a/Resources/Prototypes/Species/vox.yml
+++ b/Resources/Prototypes/Species/vox.yml
@@ -3,10 +3,6 @@
   name: species-name-vox
   roundStart: false # sad...
   prototype: MobVox
-  # WD EDIT START
-  bodyTypes:
-    - VoxNormal
-  # WD EDIT END
   markingLimits: MobVoxMarkingLimits
   dollPrototype: MobVoxDummy
   skinColoration: VoxFeathers
@@ -17,28 +13,6 @@
   sexes:
   - Unsexed
 
-# WD EDIT START
-- type: bodyType
-  id: VoxNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobVoxHead
-    Snout: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Chest: MobVoxTorso
-    Eyes: MobVoxEyes
-    LArm: MobVoxLArm
-    RArm: MobVoxRArm
-    LHand: MobVoxLHand
-    RHand: MobVoxRHand
-    LLeg: MobVoxLLeg
-    RLeg: MobVoxRLeg
-    LFoot: MobVoxLFoot
-    RFoot: MobVoxRFoot
-    Tail: MobHumanoidAnyMarking
-
 - type: markingPoints
   id: MobVoxMarkingLimits
   onlyWhitelisted: true
@@ -91,97 +65,11 @@
     Chest:
       points: 1
       required: false
+    # WD EDIT START
+    Groin:
+      points: 1
+      required: false
+    # WD EDIT END
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [ VoxTail ]
-
-- type: humanoidBaseSprite
-  id: MobVoxEyes
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobVoxHead
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobVoxHeadMale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobVoxHeadFemale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobVoxTorso
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: torso
-
-- type: humanoidBaseSprite
-  id: MobVoxTorsoMale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: torso
-
-- type: humanoidBaseSprite
-  id: MobVoxTorsoFemale
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: torso
-
-- type: humanoidBaseSprite
-  id: MobVoxLLeg
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobVoxLArm
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobVoxLHand
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobVoxLFoot
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobVoxRLeg
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobVoxRArm
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobVoxRHand
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobVoxRFoot
-  baseSprite:
-    sprite: Mobs/Species/Vox/parts.rsi
-    state: r_foot
+      required: false # WD EDIT
diff --git a/Resources/Prototypes/StartingGear/base.yml b/Resources/Prototypes/StartingGear/base.yml
index a28c00d08bc..74e780633ca 100644
--- a/Resources/Prototypes/StartingGear/base.yml
+++ b/Resources/Prototypes/StartingGear/base.yml
@@ -18,7 +18,6 @@
     - Oni
     - Reptilian
     - Shadowkin
-    - SynthHuman
     - Tajaran
     - Thaven
     - Vulpkanin
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index 09a28de2af9..33f932f0a19 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -519,46 +519,46 @@
       tags:
         - SpiderCraft
 
-- type: trait
-  id: BionicArm
-  category: Physical
-  points: -8
-  enable: false # WD EDIT
-  requirements:
-    - !type:CharacterLogicOrRequirement
-      requirements:
-      - !type:CharacterJobRequirement
-        jobs:
-         - Paramedic
-      - !type:CharacterDepartmentRequirement
-          departments:
-          - Security
-          - Command
-  #       - Dignitary - WD EDIT
-    - !type:CharacterTraitRequirement
-      inverted: true
-      traits:
-        - BionicPryArm
-    - !type:CharacterSpeciesRequirement
-      inverted: true
-      species:
-        - Xelthia # this would fall off
-  functions:
-    - !type:TraitCyberneticLimbReplacement
-      removeBodyPart: Arm
-      partSymmetry: Left
-      protoId: JawsOfLifeLeftArm
-      slotId: "left arm"
-    - !type:TraitCyberneticLimbReplacement
-      removeBodyPart: Arm
-      partSymmetry: Right
-      protoId: JawsOfLifeRightArm
-      slotId: "right arm"
-    - !type:TraitPushDescription
-      descriptionExtensions:
-        - description: examine-bionic-arm-message
-          fontSize: 12
-          requireDetailRange: true
+# - type: trait
+#   id: BionicArm
+#   category: Physical
+#   points: -8
+#   enable: false # WD EDIT
+#   requirements:
+#     - !type:CharacterLogicOrRequirement
+#       requirements:
+#       - !type:CharacterJobRequirement
+#         jobs:
+#          - Paramedic
+#       - !type:CharacterDepartmentRequirement
+#           departments:
+#           - Security
+#           - Command
+#   #       - Dignitary - WD EDIT
+#     - !type:CharacterTraitRequirement
+#       inverted: true
+#       traits:
+#         - BionicPryArm
+#     - !type:CharacterSpeciesRequirement
+#       inverted: true
+#       species:
+#         - Xelthia # this would fall off
+#   functions:
+#     - !type:TraitCyberneticLimbReplacement
+#       removeBodyPart: Arm
+#       partSymmetry: Left
+#       protoId: JawsOfLifeLeftArm
+#       slotId: "left arm"
+#     - !type:TraitCyberneticLimbReplacement
+#       removeBodyPart: Arm
+#       partSymmetry: Right
+#       protoId: JawsOfLifeRightArm
+#       slotId: "right arm"
+#     - !type:TraitPushDescription
+#       descriptionExtensions:
+#         - description: examine-bionic-arm-message
+#           fontSize: 12
+#           requireDetailRange: true
 
 - type: trait
   id: PlateletFactories
@@ -947,29 +947,29 @@
 #       protoId: SpeedRightLeg
 #       slotId: "right leg"
 
-- type: trait
-  id: CyberneticLeftLeg
-  category: Physical
-  points: 0
-  slots: 0
-  functions:
-    - !type:TraitCyberneticLimbReplacement
-      removeBodyPart: Leg
-      partSymmetry: Left
-      protoId: LeftLegCybernetic
-      slotId: "left leg"
+# - type: trait
+#   id: CyberneticLeftLeg
+#   category: Physical
+#   points: 0
+#  slots: 0
+#   functions:
+#     - !type:TraitCyberneticLimbReplacement
+#       removeBodyPart: Leg
+#       partSymmetry: Left
+#       protoId: LeftLegCybernetic
+#       slotId: "left leg"
 
-- type: trait
-  id: CyberneticRightLeg
-  category: Physical
-  points: 0
-  slots: 0
-  functions:
-    - !type:TraitCyberneticLimbReplacement
-      removeBodyPart: Leg
-      partSymmetry: Right
-      protoId: RightLegCybernetic
-      slotId: "right leg"
+# - type: trait
+#   id: CyberneticRightLeg
+#   category: Physical
+#   points: 0
+#   slots: 0
+#   functions:
+#     - !type:TraitCyberneticLimbReplacement
+#       removeBodyPart: Leg
+#       partSymmetry: Right
+#       protoId: RightLegCybernetic
+#       slotId: "right leg"
 
 # - type: trait
 #  id: FlareShieldingModule
@@ -1251,40 +1251,40 @@
           - Crayon
           - Paper
 
-- type: trait
-  id: BionicPryArm
-  category: Physical
-  points: -2
-  enable: false # WD EDIT
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
-    - !type:CharacterTraitRequirement
-      inverted: true
-      traits:
-        - BionicArm
-    - !type:CharacterSpeciesRequirement
-      inverted: true
-      species:
-        - Xelthia # this would fall off
-  functions:
-    - !type:TraitCyberneticLimbReplacement
-      removeBodyPart: Arm
-      partSymmetry: Left
-      protoId: CrowbarLeftArm
-      slotId: "left arm"
-    - !type:TraitCyberneticLimbReplacement
-      removeBodyPart: Arm
-      partSymmetry: Right
-      protoId: CrowbarRightArm
-      slotId: "right arm"
-    - !type:TraitPushDescription
-      descriptionExtensions:
-        - description: examine-bionic-pryarm-message
-          fontSize: 12
-          requireDetailRange: true
+# - type: trait
+#   id: BionicPryArm
+#   category: Physical
+#   points: -2
+#   enable: false # WD EDIT
+#   requirements:
+#     - !type:CharacterJobRequirement
+#       inverted: true
+#      jobs:
+#         - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+#     - !type:CharacterTraitRequirement
+#       inverted: true
+#       traits:
+#         - BionicArm
+#     - !type:CharacterSpeciesRequirement
+#       inverted: true
+#       species:
+#         - Xelthia # this would fall off
+#   functions:
+#     - !type:TraitCyberneticLimbReplacement
+#       removeBodyPart: Arm
+#       partSymmetry: Left
+#       protoId: CrowbarLeftArm
+#       slotId: "left arm"
+#     - !type:TraitCyberneticLimbReplacement
+#       removeBodyPart: Arm
+#       partSymmetry: Right
+#       protoId: CrowbarRightArm
+#       slotId: "right arm"
+#     - !type:TraitPushDescription
+#       descriptionExtensions:
+#         - description: examine-bionic-pryarm-message
+#           fontSize: 12
+#           requireDetailRange: true
 
 - type: trait
   id: SuperiorRadiationShielding
diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
index 1e31e6c04c2..4b9082d7f03 100644
--- a/Resources/Prototypes/Traits/skills.yml
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -254,42 +254,42 @@
 #       addFactions:
 #         - AnimalFriend
 
-- type: trait
-  id: SurgeryTraining
-  category: Mental
-  points: -3
-  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: SurgerySpeedModifier
-          speedModifier: 3 # WWDP
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - MedicalDoctor
-        - Chemist
-        - MedicalIntern
-        - Paramedic
-        - ChiefMedicalOfficer
-        - Brigmedic
-        - SeniorPhysician
+# - type: trait
+#   id: SurgeryTraining
+#   category: Mental
+#   points: -3
+#   functions:
+#     - !type:TraitAddComponent
+#       components:
+#         - type: SurgerySpeedModifier
+#           speedModifier: 3 # WWDP
+#   requirements:
+#     - !type:CharacterJobRequirement
+#       inverted: true
+#       jobs:
+#         - MedicalDoctor
+#         - Chemist
+#         - MedicalIntern
+#         - Paramedic
+#         - ChiefMedicalOfficer
+#         - Brigmedic
+#         - SeniorPhysician
 
-- type: trait
-  id: ExperiencedSurgeon
-  category: Mental
-  points: -3
-  functions:
-    - !type:TraitReplaceComponent
-      components:
-      - type: SurgerySpeedModifier
-        speedModifier: 5 # WWDP
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-      - MedicalDoctor
-      - Chemist
-      - Paramedic
-      - Brigmedic
-      - SeniorPhysician
+# - type: trait
+#   id: ExperiencedSurgeon
+#   category: Mental
+#   points: -3
+#   functions:
+#     - !type:TraitReplaceComponent
+#       components:
+#       - type: SurgerySpeedModifier
+#         speedModifier: 5 # WWDP
+#   requirements:
+#     - !type:CharacterJobRequirement
+#       jobs:
+#       - MedicalDoctor
+#       - Chemist
+#       - Paramedic
+#       - Brigmedic
+#       - SeniorPhysician
 
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index c919c92cbb7..be0353f1dbc 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -40,6 +40,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: MaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: FemaleHuman
@@ -82,6 +86,10 @@
       collection: FemaleGasp
     DefaultDeathgasp:
       collection: FemaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: FemalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: MaleReptilian
@@ -124,6 +132,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: DeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: FemaleReptilian
@@ -166,6 +178,10 @@
       collection: FemaleGasp
     DefaultDeathgasp:
       collection: FemaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: FemalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: MaleSlime
@@ -210,6 +226,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: MaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: FemaleSlime
@@ -254,6 +274,10 @@
       collection: FemaleGasp
     DefaultDeathgasp:
       collection: FemaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: FemalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: MaleShadowkin
@@ -302,6 +326,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: MaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: FemaleShadowkin
@@ -350,6 +378,10 @@
       collection: FemaleGasp
     DefaultDeathgasp:
       collection: FemaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: FemalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: UnisexVox
@@ -392,6 +424,10 @@
       collection: FemaleGasp
     DefaultDeathgasp:
       collection: FemaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: FemalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: UnisexDiona
@@ -436,6 +472,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: DeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: UnisexArachnid
@@ -484,6 +524,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: DeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: UnisexDwarf
@@ -527,6 +571,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: MaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: FemaleDwarf
@@ -570,6 +618,10 @@
       collection: FemaleGasp
     DefaultDeathgasp:
       collection: FemaleDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: FemalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: UnisexMoth
@@ -618,6 +670,10 @@
       collection: MaleGasp
     DefaultDeathgasp:
       collection: MothDeathGasp
+    # WD EDIT START
+    PainScream:
+      collection: MalePainScream
+    # WD EDIT END
 
 - type: emoteSounds
   id: UnisexIPC
diff --git a/Resources/Prototypes/_ADT/Mobs/Customization/accesories/hair.yml b/Resources/Prototypes/_ADT/Mobs/Customization/accesories/hair.yml
index 0a973d156b0..19ea88fbbed 100644
--- a/Resources/Prototypes/_ADT/Mobs/Customization/accesories/hair.yml
+++ b/Resources/Prototypes/_ADT/Mobs/Customization/accesories/hair.yml
@@ -1,15 +1,20 @@
 - type: marking
   id: ADTAllhonor
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _ADT/Mobs/Customization/Hair/hair.rsi
       state: honor
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ADTAllShavedFemale
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _ADT/Mobs/Customization/Hair/hair.rsi
-      state: shaved_female
\ No newline at end of file
+      state: shaved_female
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
diff --git a/Resources/Prototypes/_ADT/Mobs/Customization/augments/misc.yml b/Resources/Prototypes/_ADT/Mobs/Customization/augments/misc.yml
index 870e43108a7..2e514d12532 100644
--- a/Resources/Prototypes/_ADT/Mobs/Customization/augments/misc.yml
+++ b/Resources/Prototypes/_ADT/Mobs/Customization/augments/misc.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: Malstrem
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia, Tajaran]
   forcedColoring: false
@@ -8,10 +7,13 @@
   sprites:
   - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
     state: malstrem
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: Beholder
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Vulpkanin, Arachne, Lamia, Tajaran]
   forcedColoring: false
@@ -19,4 +21,8 @@
   sprites:
   - sprite: _ADT/Mobs/Customization/augments/headaugs.rsi
     state: beholder
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
diff --git a/Resources/Prototypes/_ADT/Mobs/Customization/custom/Human_tattoos.yml b/Resources/Prototypes/_ADT/Mobs/Customization/custom/Human_tattoos.yml
index 57633a0ba4f..acb46567dd6 100644
--- a/Resources/Prototypes/_ADT/Mobs/Customization/custom/Human_tattoos.yml
+++ b/Resources/Prototypes/_ADT/Mobs/Customization/custom/Human_tattoos.yml
@@ -1,215 +1,287 @@
 - type: marking
   id: HumanTattooArmImheartmomL
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_arm_imheartmom_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooArmImheartmomR
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_arm_imheartmom_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooChurchdomes
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_churchdomes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooElysiumPatriotism
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_elysium_patriotism
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooFullskelet
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_fullskelet
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooKarabel
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_karabel
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooKrenelMercenary
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_KrenelMercenary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooLineArmL
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_line_arm_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooLineArmR
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_line_arm_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooRose
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_Rose
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSerpentTemptation
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_serpenttemptation
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkull
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Oni, SlimePerson, Arachnid, Tajaran, Felinid, Arachne]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skull
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkeletarmL
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skelet_arm_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkeletarmR
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skelet_arm_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkeletbody
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skelet_body
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkeletfootL
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skelet_foot_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkeletfootR
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skelet_foot_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkeletlegL
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skelet_leg_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkeletlegR
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skelet_leg_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSkullFace
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Oni, SlimePerson, Arachnid, Tajaran, Felinid, Arachne]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_skull_face
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooSymbolElysium
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_symbol_elysium
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooNarsi
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattoo_narsi
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooArmlazaL
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattooarm-laza_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: HumanTattooArmlazaR
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: tattooarm-laza_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
diff --git a/Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml b/Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml
index 1aecaaccf56..f0fe6346518 100644
--- a/Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml
+++ b/Resources/Prototypes/_ADT/Mobs/Customization/demon/demon.yml
@@ -1,206 +1,278 @@
 - type: marking
   id: DemonChestCowSpots
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: cow_spots
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: DemonChestGuard
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: guards_stripes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: DemonChestLinesEmperos
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: lines_emperos
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: DemonChestQueenLines
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: queen_lines
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: DemonChestTreeLines
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: tree_lines
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: DemonChestTrinitySpots
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: trinity_spots
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: DemonCowEars
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: cow_ears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonEars
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: demon_ears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonElfEars
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Oni, Harpy, Arachne, Lamia, Human, IPC]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: ears_elf
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonCowHorns
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: cow_horns
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsDeer
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: deer_antlers_horns
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsSmall
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: small_horns
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsBuffalo
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_buffalo
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsCarpicorn
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_capricorn
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsDevil
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_devil
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsDevil2
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_devil2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsDevil3
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_devil3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsDevil4
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_devil4
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsRam
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_ram
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemonHornsUnicorn
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Human, IPC, Oni]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: horns_unicorn
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DemomTail1
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: demon_tail
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: DemomTailLong
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
     state: long
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
 
 - type: marking
   id: DemomTailUp
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Human, IPC]
   sprites:
   - sprite: _ADT/Mobs/Customization/Demon/custom.rsi
-    state: up
\ No newline at end of file
+    state: up
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailFelinid
+    # WD EDIT END
diff --git a/Resources/Prototypes/_ADT/Mobs/Customization/reptilian/Reptilian.yml b/Resources/Prototypes/_ADT/Mobs/Customization/reptilian/Reptilian.yml
index 6f708f6c92c..7ed56cc97bf 100644
--- a/Resources/Prototypes/_ADT/Mobs/Customization/reptilian/Reptilian.yml
+++ b/Resources/Prototypes/_ADT/Mobs/Customization/reptilian/Reptilian.yml
@@ -1,344 +1,516 @@
 - type: marking
   id: ReptilianDrawingKhar
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: drawing_khar
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ReptilianDrawingSkeletBody
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: drawing_skelet_body
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ReptilianDrawingSkeleton
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: drawing_skeleton
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ReptilianDrawingSun
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: drawing_sun
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ReptilianDrawingWarpaint
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: drawing_warpaint
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ReptilianLineEyes
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: lineeyes
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Eyes
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: SnoutEasternDNW
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_snouts.rsi
       state: easterndnw_primary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_snouts.rsi
       state: easterndnw_secondary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: SnoutEasternDW
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_snouts.rsi
       state: easterndw_primary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_snouts.rsi
       state: easterndnw_secondary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Snout
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsSylveon
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: sylveon_primary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: sylveon_secondary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: sylveon_tertiary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsResomi
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: avali_inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: avali_outer
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsChemlight
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: chemlight_outer
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: chemlight_inner
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsDragonLong
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: dragonlong
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsEasternD
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: easternd_ears
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: easternd_horns
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsMagus
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: magus_ears
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_ears.rsi
       state: magus_neck
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ReptilianHornsBaran
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_baran
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsBullhorns
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_bullhorns
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsCrown
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_crown
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsFive
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_five
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsHighback
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_highback
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsJacksonchameleon
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_jacksonchameleon
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsLong
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_long
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsStagbeetle
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_stagbeetle
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsSuperlong
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_superlong
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ReptilianHornsTwoago
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: horns_twoago
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TailAxolotl
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: axolotl
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
 
 - type: marking
   id: TailDatashark
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: datashark_ears_inner
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: datashark_ears
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: datashark_fin
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: datashark_tail
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: datashark_taildata
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: TailEasternDragon
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: easternd_primary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: easternd_secondary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: TailFish
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: fish_primary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: fish_secondary
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: TailMaw
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: maw
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
 
 - type: marking
   id: TailShark
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: shark_fin
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: shark_tail
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: TailSnake
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
     - sprite: _ADT/Mobs/Customization/Reptilian/reptilian_tails.rsi
       state: snake
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailReptilian
+      # WD EDIT END
 
 - type: marking
   id: ReptilianTattoSkeletArmL
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: tatto_skelet_arm_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ReptilianTattoSkeletArmR
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: tatto_skelet_arm_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: ReptilianTattoSkeletLegL
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
     state: tatto_skelet_leg_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ReptilianTattoSkeletLegR
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _ADT/Mobs/Customization/Reptilian/custom.rsi
-    state: tatto_skelet_leg_r
\ No newline at end of file
+    state: tatto_skelet_leg_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
diff --git a/Resources/Prototypes/_ADT/Mobs/Customization/shadowkin/shadowkin.yml b/Resources/Prototypes/_ADT/Mobs/Customization/shadowkin/shadowkin.yml
index 0faf5c54336..799b89b22e6 100644
--- a/Resources/Prototypes/_ADT/Mobs/Customization/shadowkin/shadowkin.yml
+++ b/Resources/Prototypes/_ADT/Mobs/Customization/shadowkin/shadowkin.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: EarsShadekinMotley
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -15,21 +14,31 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: motley_secondary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinShady
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: shady
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinPiercingAll
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -44,12 +53,19 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: piercing_all
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinPiercingLeft
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -64,12 +80,19 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: piercing_left
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinPiercingRight
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -84,12 +107,19 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: piercing_right
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinRingedAll
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -104,12 +134,19 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: ringed_all_secondary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinRingedLeft
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -124,12 +161,19 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: ringed_left_secondary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinRingedRight
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   coloring:
@@ -144,488 +188,744 @@
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: ringed_right_secondary
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinGauzedAll
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: gauze_ear_all_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinGauzedLeft
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: gauze_ear_l_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinGauzedRight
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: Mobs/Customization/Shadowkin/ears.rsi
       state: shadowkin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: gauze_ear_r_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffyButterfly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_butterfly
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffyCowling
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_cowling
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffyCrow
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_crow
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffyMotley
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_motley
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffySpidy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_spidy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffyRingedAll
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_ringed_all
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffyRingedLeft
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_ringed_left
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinFluffyRingedRight
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: fluffy_ringed_right
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinSaggy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinSaggyBrawly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_brawly
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinSaggyZebra
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_zebra
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinSaggyGradient
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_gradient
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinSaggyGauzedAll
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_gauze_all
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinSaggyGauzedLeft
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_gauze_l
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinSaggyGauzedRight
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: saggy_gauze_r
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinShort
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinShortButterfly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_butterfly
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinShortRingedAll
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_ringed_all
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinShortRingedLeft
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_ringed_left
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinShortRingedRight
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: short_ringed_right
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinBull
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: bull_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinBullSmooth
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: bull_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: bull_smooth
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinAqua
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: aqua_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: EarsShadekinAquaIncolor
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: aqua_default
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_ears_32x32.rsi
       state: aqua_incolor
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinArrow
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_arrow
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinBlackHole
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_blackhole
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinBrace
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_brace
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinBrawly
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_brawly
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinHeart
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_heart
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinInk
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_ink
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinInk2
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_ink2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinInk3
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_ink3
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinInk4
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_ink4
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinInk5
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_ink5
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinInk6
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_ink6
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinInkAnim
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_ink_anim
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinLines
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_lines
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinNeck
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_neck
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Chest
+      bodyPart: Chest
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinShield
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_shield
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: BodyShadekinVacuum
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_overlay.rsi
       state: body_vacuum
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.LeftLeg
+      bodyPart: LeftLeg
+      # WD EDIT END
 
 - type: marking
   id: TailShadekinShorter
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_tails_32x32.rsi
       state: shadekin_shorter
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
 
 - type: marking
   id: TailShadekinShorterBrush
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_tails_32x32.rsi
       state: shadekin_shorter
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_tails_32x32.rsi
       state: shorter_brush
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
 - type: marking
   id: TailShadekinMedium
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_tails_32x32.rsi
       state: shadekin_medium
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
 
 - type: marking
   id: TailShadekinMediumTwoColored
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Shadowkin]
   sprites:
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_tails_32x32.rsi
       state: shadekin_medium
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      replacementBodyPart: BodyPartTailShadowkin
+      # WD EDIT END
     - sprite: _ADT/Mobs/Customization/Shadekin/shadekin_tails_32x32.rsi
       state: medium_twocolored
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Tail
+      bodyPart: Tail
+      # WD EDIT END
 
diff --git a/Resources/Prototypes/_EE/Body/Organs/dummy.yml b/Resources/Prototypes/_EE/Body/Organs/dummy.yml
deleted file mode 100644
index 5d7e25dd450..00000000000
--- a/Resources/Prototypes/_EE/Body/Organs/dummy.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: entity
-  id: OrganDummyBrain
-  parent: OrganHumanBrain
-  components:
-  - type: DeleteOnMapInit
-
-- type: entity
-  id: OrganDummyCore
-  parent: SentientSlimeCore
-  components:
-  - type: DeleteOnMapInit
diff --git a/Resources/Prototypes/_EE/Body/Organs/xelthia.yml b/Resources/Prototypes/_EE/Body/Organs/xelthia.yml
deleted file mode 100644
index eef12c3cb09..00000000000
--- a/Resources/Prototypes/_EE/Body/Organs/xelthia.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: entity
-  id: OrganXelthiaStomach
-  name: xelthia stomach
-  parent: OrganHumanStomach
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Stomach
-    specialDigestible:
-      tags:
-      - Meat
-      - Pill
-      - Crayon
-      - Paper
-  - type: SolutionContainerManager
-    solutions:
-      stomach:
-        maxVol: 50
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 5
-  - type: Metabolizer
-    maxReagents: 3
-    metabolizerTypes: [ Xelthia ]
-    removeEmpty: true
-    groups:
-      - id: Food
-      - id: Drink
\ No newline at end of file
diff --git a/Resources/Prototypes/_EE/Body/Parts/dummy.yml b/Resources/Prototypes/_EE/Body/Parts/dummy.yml
deleted file mode 100644
index 1eb3fdfe809..00000000000
--- a/Resources/Prototypes/_EE/Body/Parts/dummy.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# A set of limbs that despawn immediately, used for things that spawn with missing limbs.
-
-- type: entity
-  id: BaseDummyPart
-  abstract: true
-  parent: BaseItem
-  components:
-  - type: DeleteOnMapInit
-  - type: Sprite
-    visible: false
-
-- type: entity
-  id: HeadDummy
-  name: "dummy head"
-  parent: [HeadHuman, BaseDummyPart]
-
-- type: entity
-  id: LeftArmDummy
-  name: "dummy left arm"
-  parent: [LeftArmHuman, BaseDummyPart]
-
-- type: entity
-  id: RightArmDummy
-  name: "dummy right arm"
-  parent: [RightArmHuman, BaseDummyPart]
-
-- type: entity
-  id: LeftHandDummy
-  name: "dummy left hand"
-  parent: [LeftHandHuman, BaseDummyPart]
-
-- type: entity
-  id: RightHandDummy
-  name: "dummy right hand"
-  parent: [RightHandHuman, BaseDummyPart]
-
-- type: entity
-  id: LeftLegDummy
-  name: "dummy left leg"
-  parent: [LeftLegHuman, BaseDummyPart]
-
-- type: entity
-  id: RightLegDummy
-  name: "dummy right leg"
-  parent: [RightLegHuman, BaseDummyPart]
-
-- type: entity
-  id: LeftFootDummy
-  name: "dummy left foot"
-  parent: [LeftFootHuman, BaseDummyPart]
-
-- type: entity
-  id: RightFootDummy
-  name: "dummy right foot"
-  parent: [RightFootHuman, BaseDummyPart]
diff --git a/Resources/Prototypes/_EE/Body/Parts/shadow.yml b/Resources/Prototypes/_EE/Body/Parts/shadow.yml
deleted file mode 100644
index 7ecfb8eae20..00000000000
--- a/Resources/Prototypes/_EE/Body/Parts/shadow.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-- type: entity
-  id: TorsoShadow
-  name: "Shadow torso"
-  parent: BaseTorso
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Nutriment
-        Quantity: 10
-      - ReagentId: FluorosulfuricAcid
-        Quantity: 20
-
-- type: entity
-  id: HeadShadow
-  name: "Shadow head"
-  parent: BaseHead
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "head_m"
-
-- type: entity
-  id: LeftArmShadow
-  name: "left Shadow arm"
-  parent: BaseLeftArm
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmShadow
-  name: "right Shadow arm"
-  parent: BaseRightArm
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandShadow
-  name: "left Shadow hand"
-  parent: BaseLeftHand
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandShadow
-  name: "right Shadow hand"
-  parent: BaseRightHand
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegShadow
-  name: "left Shadow leg"
-  parent: BaseLeftLeg
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegShadow
-  name: "right Shadow leg"
-  parent: BaseRightLeg
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootShadow
-  name: "left Shadow foot"
-  parent: BaseLeftFoot
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootShadow
-  name: "right Shadow foot"
-  parent: BaseRightFoot
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_EE/Body/Parts/shadowling.yml b/Resources/Prototypes/_EE/Body/Parts/shadowling.yml
deleted file mode 100644
index d403e273e65..00000000000
--- a/Resources/Prototypes/_EE/Body/Parts/shadowling.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-- type: entity
-  id: TorsoShadowling
-  name: "Shadowling torso"
-  parent: BaseTorso
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Nutriment
-        Quantity: 10
-      - ReagentId: FluorosulfuricAcid
-        Quantity: 20
-
-- type: entity
-  id: HeadShadowling
-  name: "Shadowling head"
-  parent: BaseHead
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "head_m"
-
-- type: entity
-  id: LeftArmShadowling
-  name: "left Shadowling arm"
-  parent: BaseLeftArm
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmShadowling
-  name: "right Shadowling arm"
-  parent: BaseRightArm
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandShadowling
-  name: "left Shadowling hand"
-  parent: BaseLeftHand
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandShadowling
-  name: "right Shadowling hand"
-  parent: BaseRightHand
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegShadowling
-  name: "left Shadowling leg"
-  parent: BaseLeftLeg
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegShadowling
-  name: "right Shadowling leg"
-  parent: BaseRightLeg
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootShadowling
-  name: "left Shadowling foot"
-  parent: BaseLeftFoot
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootShadowling
-  name: "right Shadowling foot"
-  parent: BaseRightFoot
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_EE/Body/Parts/tajaran.yml b/Resources/Prototypes/_EE/Body/Parts/tajaran.yml
deleted file mode 100644
index 647bad63e2f..00000000000
--- a/Resources/Prototypes/_EE/Body/Parts/tajaran.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-- type: entity
-  id: PartTajaran
-  parent: [BaseItem, BasePart]
-  name: "tajaran body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoTajaran
-  name: "Tajaran torso"
-  parent: [PartTajaran, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-
-- type: entity
-  id: HeadTajaran
-  name: "Tajaran head"
-  parent: [BaseHead, PartTajaran] # WWDP
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmTajaran
-  name: "left Tajaran arm"
-  parent: [PartTajaran, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmTajaran
-  name: "right Tajaran arm"
-  parent: [PartTajaran, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandTajaran
-  name: "left Tajaran hand"
-  parent: [PartTajaran, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandTajaran
-  name: "right Tajaran hand"
-  parent: [PartTajaran, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegTajaran
-  name: "left Tajaran leg"
-  parent: [PartTajaran, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegTajaran
-  name: "right Tajaran leg"
-  parent: [PartTajaran, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootTajaran
-  name: "left Tajaran foot"
-  parent: [PartTajaran, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootTajaran
-  name: "right Tajaran foot"
-  parent: [PartTajaran, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_EE/Body/Parts/xelthia.yml b/Resources/Prototypes/_EE/Body/Parts/xelthia.yml
deleted file mode 100644
index 6a74ea276fc..00000000000
--- a/Resources/Prototypes/_EE/Body/Parts/xelthia.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-- type: entity
-  id: PartXelthia
-  parent: [BaseItem, BasePart]
-  name: "xelthia body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoXelthia
-  name: "xelthia torso"
-  parent: [PartXelthia, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-- type: entity
-  id: HeadXelthia
-  name: "xelthia head"
-  parent: [BaseHead, PartXelthia] # WWDP
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmXelthia
-  name: "left xelthia arm"
-  parent: [PartXelthia, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmXelthia
-  name: "right xelthia arm"
-  parent: [PartXelthia, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandXelthia
-  name: "left xelthia hand"
-  parent: [PartXelthia, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandXelthia
-  name: "right xelthia hand"
-  parent: [PartXelthia, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegXelthia
-  name: "left xelthia leg"
-  parent: [PartXelthia, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegXelthia
-  name: "right xelthia leg"
-  parent: [PartXelthia, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootXelthia
-  name: "left xelthia foot"
-  parent: [PartXelthia, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootXelthia
-  name: "right xelthia foot"
-  parent: [PartXelthia, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_EE/Body/Prototypes/biosynth.yml b/Resources/Prototypes/_EE/Body/Prototypes/biosynth.yml
deleted file mode 100644
index 7d6e0292a05..00000000000
--- a/Resources/Prototypes/_EE/Body/Prototypes/biosynth.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-- type: body
-  id: SynthHuman
-  name: "bio-synthetic human"
-  root: torso
-  slots:
-    head:
-      part: HeadDummy
-      connections:
-      - torso
-      organs:
-        brain: OrganDummyBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: BioSynthTorso
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-      organs:
-        heart: BioSynthHeart
-        lungs: BioSynthLungs
-        stomach: OrganHumanStomach
-        liver: BioSynthLiver
-        kidneys: OrganHumanKidneys
-        core: OrganDummyCore
-    right arm:
-      part: RightArmDummy
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmDummy
-      connections:
-      - left hand
-    right hand:
-      part: RightHandDummy
-    left hand:
-      part: LeftHandDummy
-    right leg:
-      part: RightLegDummy
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegDummy
-      connections:
-      - left foot
-    right foot:
-      part: RightFootDummy
-    left foot:
-      part: LeftFootDummy
diff --git a/Resources/Prototypes/_EE/Body/Prototypes/shadow.yml b/Resources/Prototypes/_EE/Body/Prototypes/shadow.yml
deleted file mode 100644
index 9a98ee29820..00000000000
--- a/Resources/Prototypes/_EE/Body/Prototypes/shadow.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Shadow
-  name: Shadow
-  root: torso
-  slots:
-    head:
-      part: HeadShadow
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoShadow
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed Change
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver:  OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmShadow
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmShadow
-      connections:
-      - left hand
-    right hand:
-      part: RightHandShadow
-    left hand:
-      part: LeftHandShadow
-    right leg:
-      part: RightLegShadow
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegShadow
-      connections:
-      - left foot
-    right foot:
-      part: RightFootShadow
-    left foot:
-      part: LeftFootShadow
diff --git a/Resources/Prototypes/_EE/Body/Prototypes/shadowling.yml b/Resources/Prototypes/_EE/Body/Prototypes/shadowling.yml
deleted file mode 100644
index 8efcb2e9b42..00000000000
--- a/Resources/Prototypes/_EE/Body/Prototypes/shadowling.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Shadowling
-  name: Shadowling
-  root: torso
-  slots:
-    head:
-      part: HeadShadowling
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoShadowling
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed Change
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver:  OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmShadowling
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmShadowling
-      connections:
-      - left hand
-    right hand:
-      part: RightHandShadowling
-    left hand:
-      part: LeftHandShadowling
-    right leg:
-      part: RightLegShadowling
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegShadowling
-      connections:
-      - left foot
-    right foot:
-      part: RightFootShadowling
-    left foot:
-      part: LeftFootShadowling
diff --git a/Resources/Prototypes/_EE/Body/Prototypes/tajaran.yml b/Resources/Prototypes/_EE/Body/Prototypes/tajaran.yml
deleted file mode 100644
index 1b5c919e839..00000000000
--- a/Resources/Prototypes/_EE/Body/Prototypes/tajaran.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Tajaran
-  name: tajaran
-  root: torso
-  slots:
-    head:
-      part: HeadTajaran
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoTajaran
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed Change
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganHumanLungs
-        stomach: OrganVulpkaninStomach
-        liver:  OrganAnimalLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmTajaran
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmTajaran
-      connections:
-      - left hand
-    right hand:
-      part: RightHandTajaran
-    left hand:
-      part: LeftHandTajaran
-    right leg:
-      part: RightLegTajaran
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegTajaran
-      connections:
-      - left foot
-    right foot:
-      part: RightFootTajaran
-    left foot:
-      part: LeftFootTajaran
diff --git a/Resources/Prototypes/_EE/Body/Prototypes/xelthia.yml b/Resources/Prototypes/_EE/Body/Prototypes/xelthia.yml
deleted file mode 100644
index 45aad13fc2f..00000000000
--- a/Resources/Prototypes/_EE/Body/Prototypes/xelthia.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  name: "xelthia"
-  id: Xelthia
-  root: torso
-  slots:
-    head:
-      part: HeadXelthia
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoXelthia
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganHumanLungs
-        stomach: OrganXelthiaStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganHumanKidneys
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed
-    right arm:
-      part: RightArmXelthia
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmXelthia
-      connections:
-      - left hand
-    right hand:
-      part: RightHandXelthia
-    left hand:
-      part: LeftHandXelthia
-    right leg:
-      part: RightLegXelthia
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegXelthia
-      connections:
-      - left foot
-    right foot:
-      part: RightFootXelthia
-    left foot:
-      part: LeftFootXelthia
\ No newline at end of file
diff --git a/Resources/Prototypes/_EE/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/_EE/Catalog/Fills/Items/firstaidkits.yml
index f2dbfa6c1f3..761a979d566 100644
--- a/Resources/Prototypes/_EE/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/_EE/Catalog/Fills/Items/firstaidkits.yml
@@ -6,8 +6,8 @@
   components:
   - type: StorageFill
     contents:
-      - id: EnergyCautery
-      - id: EnergyScalpel
-      - id: AdvancedRetractor
-      - id: BoneGel
+      # - id: EnergyCautery
+      # - id: EnergyScalpel
+      # - id: AdvancedRetractor
+      # - id: BoneGel
       - id: SyringeCaseFilled
diff --git a/Resources/Prototypes/_EE/Entities/Clothing/OuterClothing/jackets.yml b/Resources/Prototypes/_EE/Entities/Clothing/OuterClothing/jackets.yml
index f37a9edf8a6..9c764563e0b 100644
--- a/Resources/Prototypes/_EE/Entities/Clothing/OuterClothing/jackets.yml
+++ b/Resources/Prototypes/_EE/Entities/Clothing/OuterClothing/jackets.yml
@@ -32,4 +32,4 @@
   - type: Fiber
     fiberMaterial: fibers-nitrile
   - type: FingerprintMask
-  - type: GloveJacket
+  # - type: GloveJacket
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml
index 7aa446dce77..11d7a633211 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/harpy.yml
@@ -1,19 +1,29 @@
 - type: marking
   id: HarpyTricolorParrotZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: tricolor_parrot_zetawing_layer1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: tricolor_parrot_zetawing_layer2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: tricolor_parrot_zetawing_layer3
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyMonocolorParrotZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -27,10 +37,13 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: monocolor_parrot_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyMacawZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -42,10 +55,13 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: macaw_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyColorlessZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -59,10 +75,13 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: colorless_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyLimeZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -74,21 +93,31 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: lime_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyColorableDragobatZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: dragobat_c_zetawing_layer1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: dragobat_c_zetawing_layer2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyDragobatZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -100,21 +129,31 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: dragobat_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyColorableAsymagicalZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: asymagical_c_zetawing_layer1
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: asymagical_c_zetawing_layer2
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
 
 - type: marking
   id: HarpyAsymagicalZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -126,10 +165,13 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: asymagical_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpySmallZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -143,10 +185,13 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: small_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyQuintetZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -160,10 +205,13 @@
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
       state: quintet_zetawing
-      
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
+
 - type: marking
   id: HarpyDownwardZetawing
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Harpy]
   coloring:
@@ -176,4 +224,8 @@
           color: "#964b00"
   sprites:
     - sprite: _EE/Mobs/Customization/Harpy/harpy_wings.rsi
-      state: downward_zetawing
\ No newline at end of file
+      state: downward_zetawing
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.RightArm
+      bodyPart: RightArm
+      # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_facial_hair.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_facial_hair.yml
index ef78a106464..dc9b20eb0ce 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_facial_hair.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_facial_hair.yml
@@ -1,70 +1,100 @@
 - type: marking
   id: HumanFacialHairChin2
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-beardchin
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairSuperLong
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-beardlong
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairShort
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-beardshort
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairThick
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-beardthick
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairViking
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-beardviking
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairBristle
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-bristle
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairMoustacheWithStubble
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-mustachewithstubble
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairThickBristle
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: beard-thickbristle
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFacialHairHandlebar
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _Corvax/Mobs/Customization/human_facial_hair.rsi
       state: handlebar
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanFacialHairHandlebar2
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
     - sprite: _Corvax/Mobs/Customization/human_facial_hair.rsi
       state: handlebar2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.FacialHair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_hair.yml
index 0cbf0884714..c894dd80176 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1,179 +1,251 @@
 - type: marking
   id: HumanHairArabicGathered
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-arabicgatheredhair
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairClassicHair
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-classichairmale
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairSideComb
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-combedfromside
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairLong4
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-longhair
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairManbun2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-manbunold
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairPigtailTajaran
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-pigtailtajaran
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairShavedSide
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-shavedside
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairShorthair8
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-shorthaired
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanFembun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
   - sprite: _ADT/Mobs/Customization/Human/custom.rsi
     state: hair-womenbun
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: HumanHairAfricanPigtails
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Corvax/Mobs/Customization/human_hair.rsi
       state: africanpigtails
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairAfropuffDouble
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Corvax/Mobs/Customization/human_hair.rsi
       state: afropuffdouble
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairAfropuffLeft
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Corvax/Mobs/Customization/human_hair.rsi
       state: afropuffleft
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: HumanHairAfropuffRight
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Corvax/Mobs/Customization/human_hair.rsi
       state: afropuffright
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairHightight
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: hightight
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairBuzzhawk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: buzzhawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairShavedbun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: loosebunshaved
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairLoosebun
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: loosebun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairSergeantcut
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: sergeantcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFullshave
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: fullshave
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairCiacombover
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: ciacombover
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFlyboy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: flyboy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairOutwardponytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: outwardponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairStubbleshave
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: stubbleshave
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairOvereyeponytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _EE/Mobs/Customization/human_hair.rsi
       state: overeyeponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/mothchitinid.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/mothchitinid.yml
index b8e8a83bdef..88b2951171c 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/mothchitinid.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/mothchitinid.yml
@@ -2,495 +2,676 @@
 
 - type: marking
   id: MothChitinidSnout # Head, a "snout" as to not take up the head markings.
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/bodyparts.rsi
     state: head_f
-    
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
+
 - type: marking
   id: MothChitinidBodyMarkings # Chitinid body lines
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/bodyparts.rsi
     state: torso_m
-    
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
+
 - type: marking
   id: MothChitinidLArmSecondary # Secondary Arm
-  bodyPart: LHand
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/bodyparts.rsi
     state: l_secondary_arm
-    
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
+
 - type: marking
   id: MothChitinidRArmSecondary # Secondary Arm
-  bodyPart: RHand
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/bodyparts.rsi
     state: r_secondary_arm
-    
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
+
 # Antennas
 - type: marking
   id: MothChitinidAntennasDefault
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: default
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasCurly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: curly
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasGray
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: gray
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasSlick
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: slick
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasLong
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: long
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasBee
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: bee
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasShort
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: short
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasFirefly
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: firefly_primary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: firefly_secondary
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasRadar
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: radar
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidAntennasSpeed
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_antennas.rsi
     state: speed
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 
 # Wings
 - type: marking
   id: MothChitinidWingsDefault
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: default
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidWingsSmooth
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: smooth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidWingsHoneypot
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: honeypot_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: honeypot_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidWingsStubby
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: stubby
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidWingsBee
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: bee_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: bee_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidWingsFirefly
-  bodyPart: Tail
-  markingCategory: Tail
+  markingCategory: Wings # WD EDIT: Tail -> Wings
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: firefly_primary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_wings.rsi
     state: firefly_secondary
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    # WD EDIT END
 
 # Body markings:
 # Charred
 - type: marking
   id: MothChitinidChestCharred
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: charred_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidHeadCharred
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: charred_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLLegCharred
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: charred_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRLegCharred
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: charred_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLArmCharred
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: charred_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRArmCharred
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: charred_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Plated
 - type: marking
   id: MothChitinidChestPlated
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: plated_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLArmPlated
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: plated_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRArmPlated
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: plated_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Stripes
 - type: marking
   id: MothChitinidChestStripes
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: stripes_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidHeadStripes
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: stripes_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLLegStripes
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: stripes_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRLegStripes
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: stripes_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLArmStripes
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: stripes_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRArmStripes
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: stripes_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Radiant
 - type: marking
   id: MothChitinidChestRadiant
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: radiant_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidHeadRadiant
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: radiant_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLLegRadiant
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: radiant_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRLegRadiant
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: radiant_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLArmRadiant
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: radiant_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRArmRadiant
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: radiant_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Toxic
 - type: marking
   id: MothChitinidChestToxic
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: toxic_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidHeadToxic
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: toxic_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLLegToxic
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: toxic_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRLegToxic
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: toxic_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLArmToxic
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: toxic_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRArmToxic
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: toxic_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 # Spotted
 - type: marking
   id: MothChitinidChestSpotted
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: spotted_chest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidHeadSpotted
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: spotted_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLLegSpotted
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: spotted_l_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRLegSpotted
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: spotted_r_leg
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidLArmSpotted
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: spotted_l_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: MothChitinidRArmSpotted
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   sprites:
   - sprite: _EE/Mobs/Customization/Moth/ChitinidMarkings/chitinid_parts.rsi
     state: spotted_r_arm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/shadowling.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/shadowling.yml
index 028587a66db..a7e8dcfd875 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/shadowling.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/shadowling.yml
@@ -1,27 +1,40 @@
 - type: marking
   id: LesserShadowlingEyes
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Shadow]
   sprites:
   - sprite: _EE/Mobs/Customization/Shadow/lesser_eyes.rsi
     state: lesser_eyes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: AbominationHorns
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Shadowling]
   sprites:
   - sprite: _EE/Mobs/Customization/Shadow/abomination_horns.rsi
     state: abomination_horns
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: AbominationTorso
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Shadowling]
   sprites:
   - sprite: _EE/Mobs/Customization/Shadow/abomination_torso.rsi
-    state: abomination_torso
+  # WD EDIT START
+    state: abomination_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _EE/Mobs/Customization/Shadow/abomination_torso.rsi
+    state: abomination_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/tajaran.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/tajaran.yml
index fe5d5569296..9246c766814 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/tajaran.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/tajaran.yml
@@ -2,288 +2,428 @@
 
 - type: marking
   id: TajaranTailRetro
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/tails.rsi
     state: tail
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailTajaran
+    # WD EDIT END
 
 - type: marking
   id: TajaranTailAnim
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/tails.rsi
     state: tail_anim
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailTajaran
+    # WD EDIT END
 
 - type: marking
   id: TajaranTailRetroRings
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/tails.rsi
     state: tail
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailTajaran
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/tail_markings.rsi
     state: tail_rings
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: TajaranTailAnimRings
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/tails.rsi
     state: tail_anim
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailTajaran
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/tail_markings.rsi
     state: tail_anim_rings
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 # Tajaran Ears
 
 - type: marking
   id: TajaranEarsRetro
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/ears.rsi
     state: ears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsSeparate
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/ears.rsi
     state: outears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/ears.rsi
     state: inears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsRetroNear
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/ears.rsi
     state: ears_near
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsSeparateNear
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/ears.rsi
     state: outears_near
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/ears.rsi
     state: inears_near
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 # Tajaran Head/Face
 
 - type: marking
   id: TajaranHeadNose
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/head.rsi
     state: nose
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranHeadMuzzle
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/head.rsi
     state: muzzle
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranHeadMuzzleLarge
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/head.rsi
     state: muzzle_large
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranHeadPoints
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/head.rsi
     state: points
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranHeadTiger
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/head.rsi
     state: tiger_face
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranHeadTigerAlt
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/head.rsi
     state: tiger_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranHeadPatches
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/head.rsi
     state: patch
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 # Tajaran Torso
 
 - type: marking
   id: TajaranTorsoBelly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/torso.rsi
     state: belly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: TajaranTorsoCrest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/torso.rsi
     state: crest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: TajaranTorsoFullBelly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/torso.rsi
     state: fullbelly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 # Overlays
 
 - type: marking
   id: TajaranOverlayPatch
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/overlays.rsi
     state: patch
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: TajaranOverlayPoints
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/overlays.rsi
     state: points
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 # Felinid Ears, adapted for tajaran (all needed to be higher up and/or modified to fit better)
 
 - type: marking
   id: TajaranEarsBasic
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: basic_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: basic_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsCurled
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: curled_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: curled_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsDroopy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: droopy_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: droopy_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsFuzzy
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: basic_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: fuzzy_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsStubby
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: stubby_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: stubby_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsTall
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: tall_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: tall_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: tall_fuzz
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsTorn
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: torn_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: torn_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TajaranEarsWide
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Tajaran]
   sprites:
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: wide_outer
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _EE/Mobs/Customization/Tajaran/felinid_ears.rsi
     state: wide_inner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/xelthia.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/xelthia.yml
index 651b1e55299..438b928120f 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/xelthia.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/xelthia.yml
@@ -1,121 +1,157 @@
 # Tails
 - type: marking
   id: XelthiaTailNormal
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: tail_normal
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailXelthia
+    # WD EDIT END
 
 # Ears
 - type: marking
   id: XelthiaEarsNormal
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: ears_normal
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: XelthiaEarsSmall
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: ears_small
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 # Tendril Hair
 - type: marking
   id: XelthiaHairStandard
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: hair_standard
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: XelthiaHairShort
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: hair_short
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: XelthiaHairLongish
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: hair_longish
-    
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
+
 - type: marking
   id: XelthiaHairOvereye
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: hair_overeye
-    
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
+
 - type: marking
   id: XelthiaHairFancy
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: hair_fancy
-    
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
+
 - type: marking
   id: XelthiaHairTripoint
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: hair_tripoint
-    
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
+
 - type: marking
   id: XelthiaHairDownNBack
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: hair_downandback
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 # Chest Patterns
 
 - type: marking
   id: XelthiaStripeyChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: stripey
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: XelthiaUnderbelly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Xelthia]
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
     state: underbelly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 # Spikes
 
 - type: marking
   id: XelthiaBackspikes
-  bodyPart: Chest, RArm, LArm, Head
   markingCategory: Overlay
   speciesRestriction: [Xelthia]
   coloring:
@@ -125,4 +161,8 @@
           color: "#FFFFFF"
   sprites:
   - sprite: _EE/Mobs/Customization/xelthia_parts.rsi
-    state: backspikes
\ No newline at end of file
+    state: backspikes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/z_human_facial_hair.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/z_human_facial_hair.yml
index cf93086b2fa..89f0cfd64bf 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/z_human_facial_hair.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/Markings/z_human_facial_hair.yml
@@ -1,56 +1,80 @@
 - type: marking
   id: ZetaEMWhiskers
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
     state: emwhiskers
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ZetaSpiderWhiskers
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
     state: spiderwhiskers
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ZetaTwirlable
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
     state: twirlable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ZetaVoluminous
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
     state: voluminous
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ZetaWalrus
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
     state: walrus
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ZetaWizardous
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
     state: wizardous
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ZetaWorkinMan
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
     state: workinman
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ZetaOnTheChin
-  bodyPart: FacialHair
   markingCategory: FacialHair
   sprites:
   - sprite: _EE/Mobs/Customization/z_human_facial_hair.rsi
-    state: onthechin
\ No newline at end of file
+    state: onthechin
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Species/biosynth.yml b/Resources/Prototypes/_EE/Entities/Mobs/Species/biosynth.yml
deleted file mode 100644
index 43db222525c..00000000000
--- a/Resources/Prototypes/_EE/Entities/Mobs/Species/biosynth.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-- type: entity
-  parent: MobHuman
-  id: MobSynthHuman
-  name: bio-synthetic torso
-  description: A customizable synthetic human body.
-  suffix: Alive
-  components:
-  - type: HumanoidAppearance
-    species: SynthHuman
-  - type: Body
-    prototype: SynthHuman
-    requiredLegs: 2
-  - type: Renamable
-    singleUse: true
-  - type: ChangeableGender
-    singleUse: true
-  - type: ChangeableSex
-    singleUse: true
-  - type: UserInterface
-    interfaces:
-      enum.HumanoidMarkingModifierKey.Key:
-        type: HumanoidMarkingModifierBoundUserInterface
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
-      # Goobstation - changelings
-      enum.StoreUiKey.Key:
-        type: StoreBoundUserInterface
-      enum.InstrumentUiKey.Key:
-        type: InstrumentBoundUserInterface
-        requireInputValidation: false
-      enum.RadialSelectorUiKey.Key:
-        type: TrackedRadialSelectorMenuBUI # WD EDIT: RadialSelectorMenuBUI -> TrackedRadialSelectorMenuBUI
-      enum.ListViewSelectorUiKey.Key:
-        type: ListViewSelectorBUI
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
-      enum.SharedRenamableInterfaceKey.Key:
-        type: RenamableBoundUserInterface
-  - type: NameIdentifier
-    group: Synth
-  - type: Damageable
-    damage:
-      types:
-        Bloodloss: -100 # they spawn with 100 bloodloss for whatever reason
-  - type: Debrained
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Species/shadow.yml b/Resources/Prototypes/_EE/Entities/Mobs/Species/shadow.yml
index 768d5de7ba6..a88bed37452 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Species/shadow.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Species/shadow.yml
@@ -28,7 +28,6 @@
     damageContainer: Biological
   - type: Body
     prototype: Shadow
-    requiredLegs: 2
   - type: Tag
     tags:
     - CanPilot
@@ -58,8 +57,6 @@
         Heat: -0.14
       groups:
         Brute: -0.14
-  - type: Targeting
-  - type: SurgeryTarget
   - type: Bloodstream
     bloodReagent: FluorosulfuricAcid
   - type: LanguageSpeaker
@@ -79,6 +76,10 @@
   components:
   - type: HumanoidAppearance
     species: Shadow
+  # WD EDIT START
+  - type: Body
+    prototype: Shadow
+  # WD EDIT END
 
 - type: entity
   parent: MobShadowBase
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Species/shadowling.yml b/Resources/Prototypes/_EE/Entities/Mobs/Species/shadowling.yml
index abe9cf915af..8425c159d0b 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Species/shadowling.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Species/shadowling.yml
@@ -30,7 +30,6 @@
     damageContainer: Biological
   - type: Body
     prototype: Shadowling
-    requiredLegs: 2
   - type: Tag
     tags:
     - CanPilot
@@ -60,8 +59,6 @@
         Heat: -0.14
       groups:
         Brute: -0.14
-  - type: Targeting
-  - type: SurgeryTarget
   - type: Bloodstream
     bloodReagent: FluorosulfuricAcid
   - type: LanguageSpeaker
@@ -80,6 +77,10 @@
   components:
   - type: HumanoidAppearance
     species: Shadowling
+  # WD EDIT START
+  - type: Body
+    prototype: Shadowling
+  # WD EDIT END
 
 # for yaml linter
 - type: entity
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Species/tajaran.yml b/Resources/Prototypes/_EE/Entities/Mobs/Species/tajaran.yml
index 16a6a29f54c..00772498f11 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Species/tajaran.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Species/tajaran.yml
@@ -25,7 +25,6 @@
         - MobLayer
   - type: Body
     prototype: Tajaran
-    requiredLegs: 2
   - type: Damageable
     damageModifierSet: Tajaran
   - type: SlowOnDamage
@@ -135,3 +134,7 @@
           32:
             sprite: Mobs/Species/Human/displacement.rsi
             state: jumpsuit-female
+  # WD EDIT START
+  - type: Body
+    prototype: Tajaran
+  # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Species/xelthia.yml b/Resources/Prototypes/_EE/Entities/Mobs/Species/xelthia.yml
index bfcdadfa8c6..a0fbe5ef20c 100644
--- a/Resources/Prototypes/_EE/Entities/Mobs/Species/xelthia.yml
+++ b/Resources/Prototypes/_EE/Entities/Mobs/Species/xelthia.yml
@@ -21,8 +21,10 @@
   - type: HumanoidAppearance
     species: Xelthia
     hideLayersOnEquip:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: LanguageKnowledge
     speaks:
     - TauCetiBasic
@@ -288,3 +290,7 @@
               layerKey: dummy
               parameterTexture: displacementMap
               parameterUV: displacementUV
+  # WD EDIT START
+  - type: Body
+    prototype: Xelthia
+  # WD EDIT END
diff --git a/Resources/Prototypes/_EE/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/_EE/Entities/Objects/Specific/Hydroponics/tools.yml
index c289065a835..7659dacbb94 100644
--- a/Resources/Prototypes/_EE/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/_EE/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -27,13 +27,3 @@
   - type: Item
     sprite: _EE/Objects/Tools/Hydroponics/clippers-eoc.rsi
     storedRotation: -90
-  # Shitmed Change
-  - type: Retractor
-    speed: 0.38
-  - type: Hemostat
-    speed: 0.63
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor2.ogg
diff --git a/Resources/Prototypes/_EE/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/_EE/Entities/Objects/Specific/Robotics/mmi.yml
index 8171c8c7c43..99b79fa1faa 100644
--- a/Resources/Prototypes/_EE/Entities/Objects/Specific/Robotics/mmi.yml
+++ b/Resources/Prototypes/_EE/Entities/Objects/Specific/Robotics/mmi.yml
@@ -20,7 +20,6 @@
             components:
             - PAI
     - type: Organ
-      slotId: posibrain
     - type: Tag
       tags:
       - Posibrain
@@ -50,4 +49,3 @@
             tags:
             - Posibrain
     - type: Organ
-      slotId: brain
diff --git a/Resources/Prototypes/_EE/Reagents/biological.yml b/Resources/Prototypes/_EE/Reagents/biological.yml
index 1dd3ea70464..cde310b14ee 100644
--- a/Resources/Prototypes/_EE/Reagents/biological.yml
+++ b/Resources/Prototypes/_EE/Reagents/biological.yml
@@ -46,7 +46,7 @@
         emote: Scream
         probability: 0.3
 #      conditions: # TODO: Figure out how to make this work properly, it doesnt seem like it wants to do anything when uncommented lol
-#      - !type:OrganType
+#      - !type:MetabolizerType # WD EDIT OrganType -> MetabolizerType
 #        type: Xelthia
 #        shouldHave: false
 
@@ -65,7 +65,7 @@
         factor: -4
       - !type:SatiateHunger
         factor: -4
-      - !type:HealthChange 
+      - !type:HealthChange
         conditions:
         - !type:TotalDamage
           max: 50
@@ -74,4 +74,3 @@
             Brute: -1.5
           types:
             Heat: -0.4
-            
\ No newline at end of file
diff --git a/Resources/Prototypes/_EE/Recipes/Lathes/Packs/biofabricator.yml b/Resources/Prototypes/_EE/Recipes/Lathes/Packs/biofabricator.yml
deleted file mode 100644
index 8902db2825f..00000000000
--- a/Resources/Prototypes/_EE/Recipes/Lathes/Packs/biofabricator.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-## Static
-
-- type: latheRecipePack
-  id: Biofabricatortatic
-  recipes:
-  - SynthLiver
-  - SynthHeart
-  - SynthLungs
-  - SynthEyes
-  - SynthLeftLeg
-  - SynthRightLeg
-  - SynthLeftFoot
-  - SynthRightFoot
-  - SynthLeftArm
-  - SynthRightArm
-  - SynthLeftHand
-  - SynthRightHand
-  - SynthHead
-  - SynthTorso
-
-- type: latheRecipePack
-  id: SyndicateBiofabricatorStatic
-  recipes:
-  - PizzaLeftArm
-  - PizzaRightArm
-  - SpaceLungsAnimal
-  - SpaceHeartAnimal
-  - SpaceLungsDragon
-  - SpaceEyesLaser
-  - SpaceHeartCobra
diff --git a/Resources/Prototypes/_EE/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_EE/Recipes/Lathes/Packs/medical.yml
index 2e8cf5f967d..0b8be07d02d 100644
--- a/Resources/Prototypes/_EE/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/_EE/Recipes/Lathes/Packs/medical.yml
@@ -20,15 +20,6 @@
 
 ## Dynamic
 
-- type: latheRecipePack
-  id: Surgery
-  recipes:
-  - EnergyScalpel
-  - EnergyCautery
-  - AdvancedRetractor
-  - OmnimedTool
-  - MedicalCyberneticEyes
-
 - type: latheRecipePack
   id: MedicalClothing
   recipes:
diff --git a/Resources/Prototypes/_EE/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_EE/Recipes/Lathes/Packs/robotics.yml
index 41172020619..611628cbcc6 100644
--- a/Resources/Prototypes/_EE/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/_EE/Recipes/Lathes/Packs/robotics.yml
@@ -8,21 +8,6 @@
 
 ## Dynamic
 
-- type: latheRecipePack
-  id: Cybernetics
-  recipes:
-  - JawsOfLifeLeftArm
-  - JawsOfLifeRightArm
-  - SpeedLeftLeg
-  - SpeedRightLeg
-  - BasicCyberneticEyes
-
-- type: latheRecipePack
-  id: SecurityCybernetics
-  recipes:
-  - SecurityCyberneticEyes
-  - MedicalCyberneticEyes
-
 - type: latheRecipePack
   id: Modsuit
   recipes:
diff --git a/Resources/Prototypes/_EE/Species/biosynth.yml b/Resources/Prototypes/_EE/Species/biosynth.yml
index aa52ffc4e69..d63eecfcb63 100644
--- a/Resources/Prototypes/_EE/Species/biosynth.yml
+++ b/Resources/Prototypes/_EE/Species/biosynth.yml
@@ -1,15 +1,11 @@
-- type: species
-  id: SynthHuman
-  name: species-name-synth-human
-  roundStart: false
-  prototype: MobSynthHuman
-  # WD EDIT START
-  bodyTypes:
-  - HumanNormal
-  # WD EDIT END
-  defaultSkinTone: "#FFFFFFFF"
-  markingLimits: MobHumanMarkingLimits
-  dollPrototype: BioSynthTorso
-  skinColoration: Hues
-  sexes:
-  - Unsexed
+# - type: species
+#   id: SynthHuman
+#   name: species-name-synth-human
+#   roundStart: false
+#   prototype: MobSynthHuman
+#   defaultSkinTone: "#FFFFFFFF"
+#   markingLimits: MobHumanMarkingLimits
+#   dollPrototype: BioSynthTorso
+#   skinColoration: Hues
+#   sexes:
+#   - Unsexed
diff --git a/Resources/Prototypes/_EE/Species/shadow.yml b/Resources/Prototypes/_EE/Species/shadow.yml
index 1d3f9742873..a8d0c151c66 100644
--- a/Resources/Prototypes/_EE/Species/shadow.yml
+++ b/Resources/Prototypes/_EE/Species/shadow.yml
@@ -3,127 +3,6 @@
   name: species-name-Shadow
   roundStart: false
   prototype: MobShadow
-  # WD EDIT START
-  bodyTypes:
-  - ShadowNormal
-  # WD EDIT END
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobShadowDummy
   skinColoration: HumanToned
-
-# WD EDIT START
-- type: bodyType
-  id: ShadowNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobShadowHead
-    Face: MobHumanoidAnyMarking
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobShadowTorso
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Eyes: MobShadowEyes
-    LArm: MobShadowLArm
-    RArm: MobShadowRArm
-    LHand: MobShadowLHand
-    RHand: MobShadowRHand
-    LLeg: MobShadowLLeg
-    RLeg: MobShadowRLeg
-    Tail: MobHumanoidAnyMarking
-    LFoot: MobShadowLFoot
-    RFoot: MobShadowRFoot
-
-- type: humanoidBaseSprite
-  id: MobShadowEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobShadowHead
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobShadowHeadMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobShadowHeadFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobShadowTorso
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobShadowTorsoMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobShadowTorsoFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobShadowLLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobShadowLArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobShadowLHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobShadowLFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobShadowRLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobShadowRArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobShadowRHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobShadowRFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadow/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_EE/Species/shadowling.yml b/Resources/Prototypes/_EE/Species/shadowling.yml
index 06d250aa251..d2ad72431e1 100644
--- a/Resources/Prototypes/_EE/Species/shadowling.yml
+++ b/Resources/Prototypes/_EE/Species/shadowling.yml
@@ -3,128 +3,7 @@
   name: species-name-shadowling
   roundStart: false
   prototype: MobShadowling
-  # WD EDIT START
-  bodyTypes:
-  - ShadowlingNormal
-  # WD EDIT END
   markingLimits: MobHumanMarkingLimits
   dollPrototype: MobShadowlingDummy
   skinColoration: HumanToned
   defaultSkinTone: "#000000"
-
-# WD EDIT START
-- type: bodyType
-  id: ShadowlingNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobShadowlingHead
-    Face: MobHumanoidAnyMarking
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobShadowlingTorso
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Eyes: MobShadowlingEyes
-    LArm: MobShadowlingLArm
-    RArm: MobShadowlingRArm
-    LHand: MobShadowlingLHand
-    RHand: MobShadowlingRHand
-    LLeg: MobShadowlingLLeg
-    RLeg: MobShadowlingRLeg
-    Tail: MobHumanoidAnyMarking
-    LFoot: MobShadowlingLFoot
-    RFoot: MobShadowlingRFoot
-
-- type: humanoidBaseSprite
-  id: MobShadowlingEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobShadowlingHead
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobShadowlingHeadMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobShadowlingHeadFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobShadowlingTorso
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobShadowlingTorsoMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobShadowlingTorsoFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobShadowlingLLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobShadowlingLArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobShadowlingLHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobShadowlingLFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobShadowlingRLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobShadowlingRArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobShadowlingRHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobShadowlingRFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_EE/Species/tajaran.yml b/Resources/Prototypes/_EE/Species/tajaran.yml
index 031079d3418..7c7ada5839e 100644
--- a/Resources/Prototypes/_EE/Species/tajaran.yml
+++ b/Resources/Prototypes/_EE/Species/tajaran.yml
@@ -3,10 +3,6 @@
   name: species-name-tajaran
   roundStart: false # WD EDIT
   prototype: MobTajaran
-  # WD EDIT START
-  bodyTypes:
-  - TajaranNormal
-  # WD EDIT END
   markingLimits: MobTajaranMarkingLimits
   dollPrototype: MobTajaranDummy
   skinColoration: AnimalFur
@@ -32,8 +28,7 @@
       required: false
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [ TajaranTailRetro ]
+      required: false
     HeadTop:
       points: 1
       required: true
@@ -41,6 +36,11 @@
     Chest:
       points: 1
       required: false
+    # WD EDIT START
+    Groin:
+      points: 1
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -71,120 +71,3 @@
     LeftHand:
       points: 6
       required: false
-
-# WD EDIT START
-- type: bodyType
-  id: TajaranNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobTajaranHead
-    Face: MobHumanoidAnyMarking
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobTajaranTorso
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Eyes: MobTajaranEyes
-    LArm: MobTajaranLArm
-    RArm: MobTajaranRArm
-    LHand: MobTajaranLHand
-    RHand: MobTajaranRHand
-    LLeg: MobTajaranLLeg
-    RLeg: MobTajaranRLeg
-    Tail: MobHumanoidAnyMarking
-    LFoot: MobTajaranLFoot
-    RFoot: MobTajaranRFoot
-
-- type: humanoidBaseSprite
-  id: MobTajaranEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobTajaranHead
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobTajaranHeadMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobTajaranHeadFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobTajaranTorso
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobTajaranTorsoMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobTajaranTorsoFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobTajaranLLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobTajaranLArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobTajaranLHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobTajaranLFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobTajaranRLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobTajaranRArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobTajaranRHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobTajaranRFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_EE/Species/xelthia.yml b/Resources/Prototypes/_EE/Species/xelthia.yml
index 75675564c60..29dcac8308d 100644
--- a/Resources/Prototypes/_EE/Species/xelthia.yml
+++ b/Resources/Prototypes/_EE/Species/xelthia.yml
@@ -3,10 +3,6 @@
   name: species-name-xelthia
   roundStart: false # WD EDIT
   prototype: MobXelthia
-  # WD EDIT START
-  bodyTypes:
-  - XelthiaNormal
-  # WD EDIT END
   defaultSkinTone: "#56a2de"
   markingLimits: MobXelthiaMarkingLimits
   dollPrototype: MobXelthiaDummy
@@ -21,38 +17,6 @@
   defaultWidth: 0.95
   maxWidth: 1.3
 
-# WD EDIT START
-- type: bodyType
-  id: XelthiaNormal
-  name: body-normal
-  # WD EDIT END
-  sprites:
-    Head: MobXelthiaHead
-    Face: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobXelthiaTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobXelthiaEyes
-    LArm: MobXelthiaLArm
-    RArm: MobXelthiaRArm
-    LHand: MobXelthiaLHand
-    RHand: MobXelthiaRHand
-    LLeg: MobXelthiaLLeg
-    RLeg: MobXelthiaRLeg
-    LFoot: MobXelthiaLFoot
-    RFoot: MobXelthiaRFoot
-
-- type: humanoidBaseSprite
-  id: MobXelthiaEyes
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: eyes
-
 - type: markingPoints
   id: MobXelthiaMarkingLimits
   onlyWhitelisted: true
@@ -65,8 +29,7 @@
       required: false
     Tail:
       points: 1
-      required: true
-      defaultMarkings: [ XelthiaTailNormal ]
+      required: false # WD EDIT: true -> false
     Snout:
       points: 1
       required: true
@@ -80,6 +43,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -114,86 +82,3 @@
       points: 1
       required: true
       defaultMarkings: [ XelthiaBackspikes ]
-- type: humanoidBaseSprite
-  id: MobXelthiaHead
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobXelthiaHeadMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobXelthiaHeadFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobXelthiaTorso
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobXelthiaTorsoMale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobXelthiaTorsoFemale
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobXelthiaLLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobXelthiaLHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobXelthiaLArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobXelthiaLFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobXelthiaRLeg
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobXelthiaRHand
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobXelthiaRArm
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobXelthiaRFoot
-  baseSprite:
-    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_Goobstation/Changeling/Entities/Objects/Weapons/Melee/changeling_armblade.yml b/Resources/Prototypes/_Goobstation/Changeling/Entities/Objects/Weapons/Melee/changeling_armblade.yml
index 6bd19656253..d56a4e56370 100644
--- a/Resources/Prototypes/_Goobstation/Changeling/Entities/Objects/Weapons/Melee/changeling_armblade.yml
+++ b/Resources/Prototypes/_Goobstation/Changeling/Entities/Objects/Weapons/Melee/changeling_armblade.yml
@@ -14,7 +14,6 @@
       types:
         Slash: 25 # WD edit 15 -> 25
         Structural: 20
-    clickPartDamageMultiplier: 1.5 # WD edit 3 -> 1.5
     lightRangeModifier: 1.2
     maxTargets: 1
     angle: 10
diff --git a/Resources/Prototypes/_Goobstation/Devil/clauses.yml b/Resources/Prototypes/_Goobstation/Devil/clauses.yml
index 7630fa65889..fd04c5c3043 100644
--- a/Resources/Prototypes/_Goobstation/Devil/clauses.yml
+++ b/Resources/Prototypes/_Goobstation/Devil/clauses.yml
@@ -39,7 +39,7 @@
   id: fearofspace
   clauseWeight: -30
   addedComponents:
-  - type: BreathingImmunity
+  # - type: BreathingImmunity
   - type: PressureImmunity
 #  - type: SpecialLowTempImmunity
 
@@ -187,7 +187,7 @@
 - type: clause
   id: time
   clauseWeight: 150
-  addedComponents:
-  - type: DelayedDeath
-    deathTime: 300
-    deathMessageId: devil-deal-time-ran-out
+  # addedComponents:
+  # - type: DelayedDeath
+  #   deathTime: 300
+  #  deathMessageId: devil-deal-time-ran-out
diff --git a/Resources/Prototypes/_Goobstation/Devil/devilgrip.yml b/Resources/Prototypes/_Goobstation/Devil/devilgrip.yml
index 196ccc1b065..f1cd2a6a722 100644
--- a/Resources/Prototypes/_Goobstation/Devil/devilgrip.yml
+++ b/Resources/Prototypes/_Goobstation/Devil/devilgrip.yml
@@ -20,24 +20,3 @@
     radius: 2
     energy: 1
     color: "#8B0000"
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Goobstation/Heretic/crack2.ogg
-    endSound:
-      path: /Audio/Items/welder.ogg
-  - type: Hemostat
-    speed: 1.5
-  - type: Retractor
-    speed: 1.5
-  - type: Tweezers
-    speed: 1.5
-  - type: Drill
-    speed: 0.75
-  - type: BoneSetter
-    speed: 0.75
-  - type: Cautery
-    speed: 0.75
-  - type: BoneGel
-    speed: 0.75
-  - type: Tending
-    speed: 0.75
diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml
index 3b3d6c9893e..5eb88966ea6 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/modsuit.yml
@@ -35,10 +35,12 @@
   - type: IngestionBlocker
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
 
 - type: entity
   parent: BaseClothingModsuitHelmet
@@ -57,7 +59,9 @@
       map: [ "sealed" ]
   - type: HideLayerClothing # This helmet don't have sprite on unsealed state
     slots:
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: SealableClothing
     sealUpPopup: sealable-clothing-seal-up-helmet
     sealDownPopup: sealable-clothing-seal-down-helmet
@@ -86,10 +90,12 @@
     - type: IngestionBlocker
     - type: HideLayerClothing
       slots:
-      - Hair
-      - Snout
-      - HeadTop
-      - HeadSide
+      # WD EDIT START
+      - enum.HumanoidVisualLayers.Hair
+      - enum.HumanoidVisualLayers.Snout
+      - enum.HumanoidVisualLayers.HeadTop
+      - enum.HumanoidVisualLayers.HeadSide
+      # WD EDIT END
   # This will all be replaced by modules later
   - type: ToggleableLightVisuals
   - type: PointLight
diff --git a/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/IPCwings.yml b/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/IPCwings.yml
index f24c02cf992..992d524fbbe 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/IPCwings.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/IPCwings.yml
@@ -1,11 +1,19 @@
 - type: marking
   id: WingsRoboticMerciful
-  bodyPart: Wings
   markingCategory: Wings
   speciesRestriction: [IPC]
   sprites:
     - sprite: _Goobstation/Mobs/Customization/IPCwings.rsi
       state: merciful_base
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Wings
+      bodyPart: Wings
+      replacementBodyPart: BodyPartWingsIPC
+      # WD EDIT END
     - sprite: _Goobstation/Mobs/Customization/IPCwings.rsi
       state: merciful_light
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Wings
+      bodyPart: Wings
+      # WD EDIT END
 
diff --git a/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/human_hair.yml
index 96abc2dfd42..81778a3b288 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1,264 +1,363 @@
 # Goobstation TODO: this should be in a goobstation folder
 - type: marking
   id: HumanHairBraidedExtension
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: braidedExtensions
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairCometTail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: cometTail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFantasyHair
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: fantasyHair
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFlatTwistsUpdo
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: flatTwistsUpdo
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFloorlengthBraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: floorlengthBraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFloorlengthWavy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: floorlengthWavy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFrontBraidsLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: frontBraidsLong
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFrontBraidsMedium
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: frontBraidsMedium
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFrontBraidsShort
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: frontBraidsShort
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairHairnet
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: hairnet
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairJellyfish
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: jellyfish
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairKazuyaMishima
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: kazuyaMishima
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairLongBraids
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: longBraids
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairLongCurvy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: longCurvy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairLongPompadour
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: longPompadour
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairMediumCurls
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: mediumCurls
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairMullet
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: mullet
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairPelvicLengthBraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: pelvicLengthBraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairPlateau
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: plateau
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairQueenBee
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: queenBee
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairSaggedMohawk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: saggedMohawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairSharpMohawk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: sharpMohawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairShortAndPoofy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: shortAndPoofy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairShortCurls
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: shortCurls
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairShoulderLengthBraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: shoulderLengthBraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairSideSpike
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: sideSpike
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairSpaceLoops
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: spaceLoops
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairStar
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: star
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairStarFro
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: starFro
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairStyledCurls
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: styledCurls
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairUnkemptScientist
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: unkemptScientist
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFrizzyBraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: frizzyBraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairWispy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Goobstation/Mobs/Customization/human_hair.rsi
       state: wispy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml
index 4388aa5097e..d8ae2fc5b3e 100644
--- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml
+++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/fish.yml
@@ -794,13 +794,6 @@
     netsync: false
     radius: 1.5
     color: red
-  - type: Cautery
-    speed: 0.45
-  - type: SurgeryTool
-    startSound:
-      collection: lighterOnSounds
-    endSound:
-      collection: lighterOffSounds
 
 - type: entity
   id: FishArmorfish
@@ -856,13 +849,6 @@
     netsync: false
     radius: 1.5
     color: blue
-  - type: Cautery
-    speed: 0.45
-  - type: SurgeryTool
-    startSound:
-      collection: lighterOnSounds
-    endSound:
-      collection: lighterOffSounds
 
 - type: entity
   id: FishHalfFish
diff --git a/Resources/Prototypes/_Goobstation/Reagents/drinks.yml b/Resources/Prototypes/_Goobstation/Reagents/drinks.yml
index 14215f944dd..b87aa1e3909 100644
--- a/Resources/Prototypes/_Goobstation/Reagents/drinks.yml
+++ b/Resources/Prototypes/_Goobstation/Reagents/drinks.yml
@@ -7,7 +7,7 @@
   flavor: sour
   color: "#d9f929"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:SatiateThirst
       - !type:HealthChange
diff --git a/Resources/Prototypes/_Goobstation/Reagents/medicine.yml b/Resources/Prototypes/_Goobstation/Reagents/medicine.yml
index c4c9ef0c19c..09b664ed5df 100644
--- a/Resources/Prototypes/_Goobstation/Reagents/medicine.yml
+++ b/Resources/Prototypes/_Goobstation/Reagents/medicine.yml
@@ -7,7 +7,7 @@
   flavor: clean
   color: "#ff0000"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.5
       effects:
         - !type:HealthChange
@@ -51,7 +51,7 @@
   color: "#ff0000"
   worksOnTheDead: true
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.5
       effects:
         - !type:ModifyBloodLevel
@@ -82,7 +82,7 @@
   flavor: medicine
   color: "#ffff64"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -144,7 +144,7 @@
   flavor: medicine
   color: "#ffc41a"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.05
       effects:
       - !type:ChemVomit
@@ -162,7 +162,7 @@
   flavor: terrible
   color: "#cc9c14"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -173,7 +173,7 @@
         amount: -0.5
       - !type:ModifyBloodLevel
         amount: 3
-    Food:
+    Digestion: # WD EDIT
       effects:
       - !type:SatiateHunger
         factor: 1.5 # 50% less
@@ -187,7 +187,7 @@
   flavor: medicine
   color: "#ff6060"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -222,7 +222,7 @@
     - !type:PlantAdjustToxins
       amount: -30
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 3
       effects:
       - !type:HealthChange
@@ -266,7 +266,7 @@
   flavor: medicine
   color: "#e1d758"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.25
       effects:
       - !type:HealthChange
@@ -296,7 +296,7 @@
   flavor: medicine
   color: "#996fcc"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 3
       effects:
       - !type:HealthChange
@@ -340,7 +340,7 @@
   flavor: medicine
   color: "#ff8af3"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.5
       effects:
       - !type:HealthChange
@@ -377,7 +377,7 @@
   flavor: medicine
   color: "#ffdf97"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 3
       effects:
       - !type:HealthChange
@@ -423,7 +423,7 @@
   flavor: medicine
   color: "#65583b"
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.05
       effects:
       - !type:HealthChange
@@ -460,20 +460,8 @@
     - !type:PlantAdjustHealth
       amount: 10
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
-      - !type:AdjustReagent
-        group: Medicine
-        amount: -3
-        conditions:
-        - !type:UniqueBloodstreamChemThreshold
-          max: 3 # the gist is, 2 and below this sucks, 3 and above it's great; mix with water etc for good results
-      - !type:AdjustReagent
-        group: Poison
-        amount: -3
-      - !type:AdjustReagent
-        group: Narcotic
-        amount: -3
       - !type:HealthChange
         damage:
           types:
@@ -506,7 +494,7 @@
     - !type:PlantAdjustHealth
       amount: -10
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -539,7 +527,7 @@
     - !type:PlantAdjustHealth
       amount: -50
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 1
       effects:
       - !type:ChemCleanBloodstream
@@ -588,12 +576,9 @@
     - !type:PlantAdjustHealth
       amount: -20
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.1
       effects:
-      - !type:AdjustReagent
-        group: Poison
-        amount: -6
       - !type:HealthChange
         damage:
           types:
@@ -669,7 +654,7 @@
     - !type:PlantAdjustHealth
       amount: -10
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         conditions:
@@ -696,7 +681,7 @@
     - !type:PlantAdjustHealth
       amount: -10
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.1
       effects:
       - !type:HealthChange
@@ -762,7 +747,7 @@
           - type: PressureProtection # can't get through this to reach the bodyparts!
           invert: true
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 3
       effects:
       - !type:HealthChange
@@ -828,7 +813,7 @@
           - type: PressureProtection
           invert: true
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 3
       effects:
       - !type:HealthChange
@@ -857,7 +842,7 @@
     - !type:PlantAdjustHealth
       amount: -10
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -902,7 +887,7 @@
     - !type:PlantAdjustHealth
       amount: -8
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -952,7 +937,7 @@
     - !type:PlantAdjustToxins
       amount: -8
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.25
       effects:
       - !type:ChemCleanBloodstream
@@ -982,7 +967,7 @@
     - !type:PlantAdjustHealth
       amount: -5
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 0.25
       effects:
       - !type:HealthChange
@@ -1044,7 +1029,7 @@
     - !type:PlantAdjustHealth
       amount: -20
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       metabolismRate: 1
       effects:
       - !type:HealthChange
@@ -1097,7 +1082,7 @@
           min: 160.15
         amount: -10000
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
@@ -1154,7 +1139,7 @@
           max: 420
         amount: 10000
   metabolisms:
-    Medicine:
+    Absorption: # WD EDIT
       effects:
       - !type:HealthChange
         damage:
diff --git a/Resources/Prototypes/_Goobstation/Reagents/narcotics.yml b/Resources/Prototypes/_Goobstation/Reagents/narcotics.yml
index a71a2052b1e..f2f1e8faf4d 100644
--- a/Resources/Prototypes/_Goobstation/Reagents/narcotics.yml
+++ b/Resources/Prototypes/_Goobstation/Reagents/narcotics.yml
@@ -8,7 +8,7 @@
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:TakeStaminaDamage
         amount: 15
@@ -24,7 +24,7 @@
   boilingPoint: 255.0
   meltingPoint: 36.0
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: TemporaryBlindness
@@ -42,7 +42,7 @@
   flavor: oily
   color: "#75fff5"
   metabolisms:
-    Narcotic:
+    Absorption: # WD EDIT
       effects:
       - !type:GenericStatusEffect
         key: Stun
diff --git a/Resources/Prototypes/_Goobstation/Reagents/toxins.yml b/Resources/Prototypes/_Goobstation/Reagents/toxins.yml
index fc8900d35cc..61de9c83e66 100644
--- a/Resources/Prototypes/_Goobstation/Reagents/toxins.yml
+++ b/Resources/Prototypes/_Goobstation/Reagents/toxins.yml
@@ -7,7 +7,7 @@
   flavor: terrible
   color: "#174f17"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects: # considering vomiting and re-add the metabolism rate works out to ~2.5/s
       - !type:HealthChange # ~20/20 damage per 15u, inconsistent
         damage:
@@ -52,7 +52,7 @@
   flavor: bitter
   color: "#1abcff"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.1
       effects:
       - !type:HealthChange
@@ -73,25 +73,9 @@
   flavor: bitter
   color: "#819cb5"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 0.05
       effects:
-      - !type:AdjustReagent
-        group: Medicine
-        amount: -4.5
-        conditions: # higher quality anti-poisons, save for calomel which is low effort but high risk
-        - !type:BloodReagentThreshold
-          reagent: PentenicAcid
-          max: 0.1
-        - !type:BloodReagentThreshold
-          reagent: Calomel
-          max: 0.1
-        - !type:BloodReagentThreshold
-          reagent: Diphenhydramine
-          max: 0.1
-      - !type:AdjustReagent
-        group: Medicine
-        amount: -0.5
       - !type:HealthChange
         damage:
           types:
@@ -106,11 +90,8 @@
   flavor: bitter
   color: "#22ff1a"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       effects:
-      - !type:AdjustReagent
-        group: Medicine
-        amount: -5
       - !type:HealthChange
         damage:
           types:
@@ -134,7 +115,7 @@
   flavor: bitter
   color: "#8e8e8e"
   metabolisms:
-    Poison:
+    Absorption: # WD EDIT
       metabolismRate: 3
       effects:
       - !type:HealthChange
diff --git a/Resources/Prototypes/_Imp/_Drone/Mobs_Player_silicon.yml b/Resources/Prototypes/_Imp/_Drone/Mobs_Player_silicon.yml
index adfaa743374..09d2308b59f 100644
--- a/Resources/Prototypes/_Imp/_Drone/Mobs_Player_silicon.yml
+++ b/Resources/Prototypes/_Imp/_Drone/Mobs_Player_silicon.yml
@@ -70,7 +70,6 @@
   - type: StandingState
   - type: Alerts
   - type: ProtectedFromStepTriggers
-  - type: Targeting # Shitmed Change
 
 - type: entity
   name: drone
diff --git a/Resources/Prototypes/_Impstation/Body/Organs/thaven.yml b/Resources/Prototypes/_Impstation/Body/Organs/thaven.yml
deleted file mode 100644
index f8c91affa37..00000000000
--- a/Resources/Prototypes/_Impstation/Body/Organs/thaven.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  id: OrganThavenBrain
-  parent: [BaseItem, OrganHumanBrain]
-  name: thaven brain
-  description: "An organic positronic brain. Quite remarkable, really."
-  components:
-    - type: Sprite
-      sprite: _Impstation/Mobs/Species/Thaven/organs.rsi
-      state: brain-thaven
diff --git a/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml b/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml
deleted file mode 100644
index 15a810d1a98..00000000000
--- a/Resources/Prototypes/_Impstation/Body/Parts/thaven.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-- type: entity
-  id: PartThaven
-  parent: [BaseItem, BasePart]
-  name: "thaven body part"
-  abstract: true
-  components:
-  - type: Sprite # Shitmed Change
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-  - type: BodyPart # Shitmed Change
-    species: Thaven
-
-- type: entity
-  id: TorsoThaven
-  name: "thaven torso"
-  parent: [PartThaven, BaseTorso]
-  components:
-  - type: Sprite
-    state: "torso_m"
-
-- type: entity
-  id: HeadThaven
-  name: "thaven head"
-  parent: [BaseHead, PartThaven] # WWDP
-  components:
-  - type: Sprite
-    state: "head"
-
-- type: entity
-  id: LeftArmThaven
-  name: "left thaven arm"
-  parent: [PartThaven, BaseLeftArm]
-  components:
-  - type: Sprite
-    state: "l_arm"
-
-- type: entity
-  id: RightArmThaven
-  name: "right thaven arm"
-  parent: [PartThaven, BaseRightArm]
-  components:
-  - type: Sprite
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandThaven
-  name: "left thaven hand"
-  parent: [PartThaven, BaseLeftHand]
-  components:
-  - type: Sprite
-    state: "l_hand"
-
-- type: entity
-  id: RightHandThaven
-  name: "right thaven hand"
-  parent: [PartThaven, BaseRightHand]
-  components:
-  - type: Sprite
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegThaven
-  name: "left thaven leg"
-  parent: [PartThaven, BaseLeftLeg]
-  components:
-  - type: Sprite
-    state: "l_leg"
-
-- type: entity
-  id: RightLegThaven
-  name: "right thaven leg"
-  parent: [PartThaven, BaseRightLeg]
-  components:
-  - type: Sprite
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootThaven
-  name: "left thaven foot"
-  parent: [PartThaven, BaseLeftFoot]
-  components:
-  - type: Sprite
-    state: "l_foot"
-
-- type: entity
-  id: RightFootThaven
-  name: "right thaven foot"
-  parent: [PartThaven, BaseRightFoot]
-  components:
-  - type: Sprite
-    state: "r_foot"
diff --git a/Resources/Prototypes/_Impstation/Body/Prototypes/thaven.yml b/Resources/Prototypes/_Impstation/Body/Prototypes/thaven.yml
deleted file mode 100644
index e0541b691f1..00000000000
--- a/Resources/Prototypes/_Impstation/Body/Prototypes/thaven.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: body
-  id: Thaven
-  name: "thaven"
-  root: torso
-  slots:
-    head:
-      part: HeadThaven
-      connections:
-      - torso
-      organs:
-        brain: OrganThavenBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoThaven
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head # Shitmed Change
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right arm:
-      part: RightArmThaven
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmThaven
-      connections:
-      - left hand
-    right hand:
-      part: RightHandThaven
-    left hand:
-      part: LeftHandThaven
-    right leg:
-      part: RightLegThaven
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegThaven
-      connections:
-      - left foot
-    right foot:
-      part: RightFootThaven
-    left foot:
-      part: LeftFootThaven
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/diona.yml
index f0d72eea2f5..248892b9850 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/diona.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/diona.yml
@@ -1,46 +1,77 @@
 - type: marking
   id: DionaThornsHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: thorns_head_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaThornsBody_colorable
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
-    state: thorns_body_colorable
+  # WD EDIT START
+    state: thorns_chest_colorable
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/diona.rsi
+    state: thorns_groin_colorable
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: DionaFlowersHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: flowers_head_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: flowers_head_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaFlowersBody_colorable
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
-    state: flowers_body_primary_colorable
-  - sprite: _Impstation/Mobs/Customization/diona.rsi
-    state: flowers_body_secondary_colorable
+  # WD EDIT START
+    state: flowers_chest_primary_colorable
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/diona.rsi
+    state: flowers_groin_primary_colorable
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
+  - sprite: _Impstation/Mobs/Customization/diona.rsi
+  # WD EDIT START
+    state: flowers_chest_secondary_colorable
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/diona.rsi
+    state: flowers_groin_secondary_colorable
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: DionaLeafCover_colorable
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Diona]
   coloring:
@@ -49,22 +80,36 @@
         !type:SkinColoring
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
-    state: leaf_cover_colorable
+  # WD EDIT START
+    state: leaf_cover_chest_colorable
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/diona.rsi
+    state: leaf_cover_groin_colorable
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: DionaBloomHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: bloom_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: bloom_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaBracketHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -74,10 +119,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: bracket_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaBrushHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   coloring:
@@ -87,225 +135,373 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: brush_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaCornflowerHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: cornflower_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: cornflower_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: cornflower_flowers_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaFicusHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: ficus_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaGarlandHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: garland_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: garland_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: garland_flowers1_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: garland_flowers2_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: garland_flowers3_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaKingHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: king_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: king_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaLaurelHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: laurel_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaLeafyHeadTop_colorable
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: leafy_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaLotusHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: lotus_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: lotus_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaMeadowHeadTop_colorable
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: meadow_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaOakHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: oak_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaPalmHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: palm_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaRootHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: root_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaRoseHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: rose_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: rose_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaRoseyHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: rosey_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: rosey_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: rosey_flowers_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaShrubHeadTop_colorable
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: shrub_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaSpinnerHeadSide_colorable
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: spinner_primary_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: spinner_secondary_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaSproutHeadSide_colorable
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: sprout_primary_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: sprout_secondary_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaVineHeadTop_colorable
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: vine_primary_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: vine_secondary_colorable
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaVinelHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: vinel_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: vinel_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaVinesHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: vines_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: vines_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaWildflowerHead_colorable
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Diona]
   sprites:
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: wildflower_primary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: wildflower_secondary_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: wildflower_flowers1_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: wildflower_flowers2_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: wildflower_flowers3_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/diona.rsi
     state: wildflower_flowers4_colorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/human_hair.yml
index 38c5c964eac..d30f31ae7c1 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1,31 +1,43 @@
 - type: marking
   id: HumanHairGatheredlow
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Impstation/Mobs/Customization/human_hair.rsi
       state: gatheredlow
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairLowpigtails
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Impstation/Mobs/Customization/human_hair.rsi
       state: lowpigtails
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairFrenchBraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Impstation/Mobs/Customization/human_hair.rsi
       state: frenchbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: HumanHairMessyPonytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Impstation/Mobs/Customization/human_hair.rsi
-      state: messyponytail
\ No newline at end of file
+      state: messyponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml
index 05147e5ff82..f04c1b324b2 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc.yml
@@ -4,7 +4,6 @@
 
 #- type: marking
 #  id: FullID
-#  bodyPart: Part
 #  markingCategory: Category
 #  speciesRestriction: [Species, Species]
 #  youre on your own for figuring out the coloring system, my friend
@@ -15,7 +14,6 @@
 
 - type: marking
   id: fizz
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ SlimePerson ]
   forcedColoring: false
@@ -23,34 +21,59 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: fizz
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: bubble
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ SlimePerson ]
   forcedColoring: false
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
-    state: bubble
+  # WD EDIT START
+    state: bubble_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
+    state: bubble_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: fishbowl
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ SlimePerson ]
   forcedColoring: false
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
-    state: fishbowl1
+  # WD EDIT START
+    state: fishbowl1_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
+    state: fishbowl1_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
-    state: fishbowl2
+  # WD EDIT START
+    state: fishbowl2_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
+    state: fishbowl2_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: FadingStars
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ SlimePerson ]
   forcedColoring: false
@@ -58,35 +81,60 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: fadingstars1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: fadingstars2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: fadingstars3
     shader: unshaded
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaLivingNymph
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Diona ]
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
-    state: dionalivingnymph
+  # WD EDIT START
+    state: dionalivingnymph_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
+    state: dionalivingnymph_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: DionaMossChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Diona ]
   forcedColoring: false
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
-    state: dionamosschest
+  # WD EDIT START
+    state: dionamoss_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
+    state: dionamoss_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: DionaMoonBloom
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [ Diona ]
   forcedColoring: false
@@ -95,10 +143,13 @@
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: dionamoonbloom
     shader: unshaded
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaBigFirefly
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Diona ]
   forcedColoring: false
@@ -107,22 +158,33 @@
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: dionabigfirefly
     shader: unshaded
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: DionaFirefly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Diona ]
   forcedColoring: false
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
-    state: dionafirefly
+    state: dionafirefly_chest # WD EDIT
+    shader: unshaded
+  # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
+    state: dionafirefly_groin
     shader: unshaded
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  # WD EDIT END
 
 - type: marking
   id: DionaPollenDust
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Diona ]
   forcedColoring: false
@@ -130,10 +192,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: dionapollendust
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: SpiderMirror
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Arachnid ]
   forcedColoring: false
@@ -142,10 +207,13 @@
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: spidermirror
     shader: unshaded
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: SpiderGlowEyes
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [ Arachnid ]
   forcedColoring: false
@@ -154,10 +222,13 @@
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: spidergloweyes
     shader: unshaded
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: SpiderEyesMulti
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [ Arachnid ]
   forcedColoring: false
@@ -165,16 +236,31 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: spidereyesmulti1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: spidereyesmulti2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: spidereyesmulti3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: spidereyesmulti4
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: MothTrueButterfly
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Moth ]
   forcedColoring: false
@@ -182,14 +268,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: mothtruebutterfly1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: mothtruebutterfly2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: mothtruebutterfly3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: MothRhinoBeetle
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Moth, Chitinid]
   forcedColoring: false
@@ -197,14 +295,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: rhinobeetle1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: rhinobeetle2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: rhinobeetle3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: MothGlasswing
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Moth ]
   forcedColoring: false
@@ -212,14 +322,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: glasswing1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: glasswing2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: glasswing3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: MothBee
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Moth ]
   forcedColoring: false
@@ -227,14 +349,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: bee1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: bee2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: bee3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: MothGlowAntenna
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [ Moth, Chitinid]
   forcedColoring: false
@@ -243,10 +377,13 @@
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: mothglowantenna
     shader: unshaded
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothFireflyOverlay
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Moth ]
   forcedColoring: false
@@ -255,10 +392,13 @@
   - sprite: _Impstation/Mobs/Customization/animatedmarkings.rsi
     state: mothfirefly1
     shader: unshaded
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: MothFirefly
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Moth ]
   forcedColoring: false
@@ -266,10 +406,14 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: mothfirefly2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: MothBeetleTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Moth, Chitinid]
   forcedColoring: false
@@ -277,14 +421,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: beetle1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: beetle2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: beetle3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: MothBeetleHorn1
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [ Moth]
   forcedColoring: true
@@ -292,10 +448,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: mothbeetlehorn1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothBeetleHorn2
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [ Moth]
   forcedColoring: true
@@ -303,10 +462,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: mothbeetlehorn2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothBiggerEyes
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [ Moth, Chitinid]
   coloring:
@@ -316,10 +478,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: mothbiggereyes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: MothSnoth
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Moth ]
   forcedColoring: false
@@ -327,12 +492,20 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snoth1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: snoth2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxCocktail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -340,16 +513,32 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxcocktail1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailVox
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxcocktail2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxcocktail3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxcocktail4
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxTailBalled
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Vox ]
   forcedColoring: true
@@ -357,10 +546,14 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailballed
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailVox
+    # WD EDIT END
 
 - type: marking
   id: VoxTailSplit
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Vox ]
   forcedColoring: true
@@ -368,10 +561,14 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailsplit
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailVox
+    # WD EDIT END
 
 - type: marking
   id: VoxTailStripes
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -379,10 +576,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailstripes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VoxLArmProsthetic
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -395,10 +595,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxarmprostheticl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: VoxRArmProsthetic
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -411,10 +614,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxarmprostheticr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: VoxBeakColor
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -422,10 +628,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxbeakcolor
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxBeakSplit
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -433,12 +642,19 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxbeaksplit1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxbeaksplit2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxBeakTipped
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -446,10 +662,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxbeaktipped
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxChestPlumage
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -457,10 +676,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxchestplumage
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VoxFootSpines
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -468,10 +690,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxfootspines
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxFootGradientLFoot
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -479,10 +704,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxfootgradientl1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: VoxFootGradientRFoot
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -490,10 +718,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxfootgradientr1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: VoxLegGradientLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -501,10 +732,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxfootgradientl2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: VoxLegGradientRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -512,10 +746,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxfootgradientr2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: VoxHandGradientRHand
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -523,14 +760,25 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxhandgradientr1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxhandgradientr2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxhandgradientr3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: VoxHandGradientLHand
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -538,14 +786,25 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxhandgradientl1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxhandgradientl2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxhandgradientl3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: VoxHeadGradient
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -553,14 +812,25 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxheadgradient1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxheadgradient2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxheadgradient3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxTailBell
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -568,12 +838,19 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailbell1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailbell2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxTailBack
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [ Vox ]
   forcedColoring: true
@@ -581,10 +858,14 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailcolorable
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailVox
+    # WD EDIT END
 
 - type: marking
   id: VoxTailLantern
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -593,10 +874,13 @@
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtaillantern
     shader: unshaded
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxTailSingleStripe
-  bodyPart: Chest
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -604,10 +888,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailsinglestripe
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VoxTailSmallPlume
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -615,10 +902,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailsmallplume
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxTailSpines
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -626,10 +916,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxtailspines
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxArmsStripesLHand
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -637,10 +930,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxarmsstripesl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: VoxArmsStripesRHand
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -648,10 +944,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxarmsstripesr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: VoxLegsStripesLLeg
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -659,10 +958,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxlegsstripesl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: VoxLegsStripesRLeg
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -670,10 +972,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxlegsstripesr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: VoxChains
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -681,10 +986,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxchains
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxSunAndMoon
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -692,10 +1000,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxsunandmoon
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxCheeks
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -703,10 +1014,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxcheeks
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxBelly
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Vox ]
   forcedColoring: false
@@ -714,10 +1028,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: voxbelly
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VitiligoHeadL
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Human,  Oni ]
   forcedColoring: true
@@ -729,10 +1046,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligoheadl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VitiligoHeadR
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -744,10 +1064,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligoheadr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VitiligoHeadJaw
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -759,10 +1082,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligoheadjaw
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VitiligoChestF
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -774,10 +1100,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligochestf
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VitiligoChestSpots
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -789,10 +1118,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligochestspots
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VitiligoArmR
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -804,10 +1136,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligoarmr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: VitiligoArmL
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -819,10 +1154,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligoarml
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: VitiligoHandR
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -834,10 +1172,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligohandr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: VitiligoHandL
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -849,10 +1190,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligohandl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: VitiligoLegR
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -864,10 +1208,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligolegr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: VitiligoLegL
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [ Human, Oni ]
   forcedColoring: true
@@ -879,10 +1226,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: vitiligolegl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ChitinidBeetleHorn1
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   forcedColoring: true
@@ -890,10 +1240,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: chitinidbeetlehorn1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChitinidBeetleHorn2
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Chitinid]
   forcedColoring: true
@@ -901,10 +1254,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: chitinidbeetlehorn2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: Gills
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -912,10 +1268,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenchestgills
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenChestScales
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -923,10 +1282,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenchestscales
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenHeadScales
-  bodyPart: Head
   markingCategory: HeadTop
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -934,10 +1296,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenheadscales
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenLArmScales
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -945,10 +1310,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenleftarmscales
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ThavenRArmScales
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -956,10 +1324,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenrightarmscales
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: ThavenLLegScales
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -967,10 +1338,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenleftlegscales
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: ThavenRLegScales
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -978,10 +1352,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenrightlegscales
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: ThavenFishEars
-  bodyPart: HeadSide
   markingCategory: Headside
   speciesRestriction: [ Thaven ]
   forcedColoring: true
@@ -989,10 +1366,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenfishears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenTattooVines
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1000,10 +1380,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thaventattoovines
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenSpines
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1011,10 +1394,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenspines
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenBiteMark
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1022,10 +1408,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenbitemark
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenTattooWave
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1033,10 +1422,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thaventattoowave
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: SharkminnowEyeliner
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1044,10 +1436,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thaventattoosharkminnoweyeliner
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenTiger
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1055,12 +1450,19 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thaventiger1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thaventiger2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenTigerRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1068,10 +1470,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thaventigerarmsr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: ThavenTigerLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1079,10 +1484,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thaventigerarmsl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ThavenHeadStripes
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1090,10 +1498,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenheadstripes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenBodyStripes
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1101,10 +1512,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenbodystripes
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenEarsBigFins
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1112,12 +1526,19 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenearsbigfins
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenearsbigfins2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenHeadCap
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Thaven ]
   forcedColoring: false
@@ -1125,6 +1546,14 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenheadcap1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle1.rsi
     state: thavenheadcap2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc2.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc2.yml
index 8b9e8ab99be..e2db53966b9 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc2.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/misc2.yml
@@ -1,156 +1,239 @@
 - type: marking
   id: HumanoidEyebags
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: eyebags
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HumanoidAbs
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   followSkinColor: true
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: muscular
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: EyebrowsBig
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: eyebrowsthick
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EyebrowsBigger
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: eyebrowsultra
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EyebrowsUnibrow
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne, Lamia, Tajaran]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: eyebrowsunibrow
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: AbdomenBasic
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
-    state: abdomenbasic1
+  # WD EDIT START
+    state: abdomenbasic1_chest
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
+    state: abdomenbasic1_groin
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: abdomenbasic2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: CreepyArms
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: creepy
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+    # WD EDIT END
 
 - type: marking
   id: AbdomenWidow
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Arachnid]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
-    state: widow1
+  # WD EDIT START
+    state: widow1_chest
+    layer: enum.BodyAppearanceLayer.Wings
+    bodyPart: Wings
+    replacementBodyPart: BodyPartWingsArachnid
+  - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
+    state: widow1_groin
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailArachnid
+  # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: widow2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: ScarTalons
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: lizardtalonscar
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarSlash
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: lizardsnoutscar
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: BadMoltHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: badmolthead
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: BadMoltChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: badmoltchest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: BadMoltLArm
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: badmoltlarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: BadMoltRArm
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: badmoltrarm
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: TailGecko
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: tail_gecko1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: tail_gecko2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: TailSnailLizard
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: tail_snizard1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: tail_snizard2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/markingsbundle2.rsi
     state: tail_snizard3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/moth.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/moth.yml
index ac1f3fcd695..2b638985f7f 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/moth.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/moth.yml
@@ -2,57 +2,71 @@
 
 - type: marking
   id: MothBodyClaw
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: moth_body_claw
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: MothBurnLeft
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: moth_burn_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothBurnRight
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: moth_burn_r
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothFaceClaw
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: moth_face_claw
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: MothSlashLeft
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: moth_slash_l
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ChimeraArmLeftMoth
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -64,10 +78,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: arm_l_chimera_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ProstheticArmLeftMoth
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -79,20 +96,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: arm_l_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: TwistingArmLeftMoth
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: arm_l_twisting_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ProstheticArmRightMoth
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -104,30 +127,40 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: arm_r_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: TwistingArmRightMoth
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: arm_r_twisting_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: WingsBackstabbed
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: wings_backstabbed
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartWingsMoth
+    # WD EDIT END
 
 - type: marking
   id: ChestChimeraFemaleMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sexRestriction: [Female]
@@ -140,10 +173,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: chest_chimera_f_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestChimeraMaleMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sexRestriction: [Male]
@@ -156,10 +192,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: chest_chimera_m_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestTwistingLeftFemaleMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sexRestriction: [Female]
@@ -167,10 +206,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: chest_l_twisting_f_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestTwistingLeftMaleMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sexRestriction: [Male]
@@ -178,10 +220,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: chest_l_twisting_m_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestTwistingRightFemaleMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sexRestriction: [Female]
@@ -189,10 +234,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: chest_r_twisting_f_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestTwistingRightMaleMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   sexRestriction: [Male]
@@ -200,20 +248,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: chest_r_twisting_m_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestStarMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: chest_star_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HeterochromiaMoth
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
@@ -225,10 +279,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: eyes_heterochromia_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: FootChimeraLeftMoth
-  bodyPart: LFoot
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -240,10 +297,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: foot_l_chimera_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: FootProstheticLeftMoth
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -255,10 +315,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: foot_l_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: FootProstheticRightMoth
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -270,10 +333,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: foot_r_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: HandChimeraLeftMoth
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -285,10 +351,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: hand_l_chimera_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: HandProstheticLeftMoth
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -300,20 +369,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: hand_l_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: HandTwistingLeftMoth
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: hand_l_twisting_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: HandProstheticRightMoth
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -325,30 +400,39 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: hand_r_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: HandTwistingRightMoth
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: hand_r_twisting_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: BadmoltMoth
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: head_badmolt_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HeadChimeraMoth
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -360,30 +444,39 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: head_chimera_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: EyebagsMoth
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: head_eyebags_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HeadTwistingMoth
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: head_twisting_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LegChimeraLeftMoth
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -395,10 +488,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: leg_l_chimera_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegProstheticLeftMoth
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -410,20 +506,26 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: leg_l_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegTwistingLeftMoth
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: leg_l_twisting_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegProstheticRightMoth
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   followSkinColor: false
@@ -435,23 +537,33 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: leg_r_prosthetic_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: LegTwistingRightMoth
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Moth]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: leg_r_twisting_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: TorsoIncisionMoth
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Moth, Chitinid]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/moth.rsi
     state: torso_incision_moth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/reptilian.yml
index 98405f2d863..ee1df1d8149 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: Fangs
-  bodyPart: Snout
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   coloring:
@@ -11,49 +10,68 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: fangs
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardBeard
-  bodyPart: Snout
   markingCategory: Overlay
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: beard
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardSnoutTall
-  bodyPart: Snout
   forcedColoring: true
   markingCategory: Snout
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: snout_tall
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsKoboldEarspiercings
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: horns_kobold_ears
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: horns_kobold_ears_piercings
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHornsNubby
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: horns_nubby
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardSnoutpiercings
-  bodyPart: Snout
   markingCategory: Overlay
   forcedColoring: true
   speciesRestriction: [Reptilian]
@@ -65,12 +83,19 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: piercings1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LizardHeadFlat
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _Impstation/Mobs/Customization/reptilian_parts.rsi
     state: head_flat
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/scars.yml
index 906e42a9559..d55983d470a 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/scars.yml
@@ -1,146 +1,187 @@
 - type: marking
   id: ArmTwistingLeft
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: arm_l_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ArmTwistingRight
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: arm_r_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: ChestBackstabbed
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: chest_backstabbed
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestTwistingLeft
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: chest_l_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestTwistingRight
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: chest_r_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ChestStar
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: chest_star
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: HandTwistingLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: hand_l_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: HandTwistingRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: hand_r_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: SmileScars
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Oni, SlimePerson, Tajaran, Felinid, Arachne]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: head_smile
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HeadTwisting
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Oni, SlimePerson, Tajaran, Felinid, Arachne]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: head_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HeadTwistingFlipped
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Oni, SlimePerson, Tajaran, Felinid, Arachne]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: head_twisting_flipped
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LegTwistingLeft
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Shadowkin, Moth, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: leg_l_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegTwistingRight
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Shadowkin, Moth, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: leg_r_twisting
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: TorsoIncision
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: torso_incision
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ArmProstheticLeft
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
@@ -152,10 +193,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: arm_l_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ArmProstheticRight
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
@@ -167,10 +211,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: arm_r_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: FootProstheticLeft
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Shadowkin, Moth, Vulpkanin]
   followSkinColor: false
@@ -182,10 +229,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: foot_l_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: FootProstheticRight
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Shadowkin, Moth, Vulpkanin]
   followSkinColor: false
@@ -197,10 +247,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: foot_r_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: HandProstheticLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
@@ -212,10 +265,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: hand_l_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: HandProstheticRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Vulpkanin]
   followSkinColor: false
@@ -227,10 +283,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: hand_r_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: LegProstheticLeft
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Shadowkin, Moth, Vulpkanin]
   followSkinColor: false
@@ -242,10 +301,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
     state: leg_l_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegProstheticRight
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Shadowkin, Moth, Vulpkanin]
   followSkinColor: false
@@ -256,4 +318,8 @@
           color: "#E4E4E4"
   sprites:
   - sprite: _Impstation/Mobs/Customization/scars.rsi
-    state: leg_r_prosthetic
\ No newline at end of file
+    state: leg_r_prosthetic
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml
index 98fb834152f..906e1286281 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/slime.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: SlimeNose
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [SlimePerson]
   forcedColoring: true
@@ -8,30 +7,39 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: nose
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: SlimeMouth
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [SlimePerson]
   followSkinColor: true
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: mouth
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: SlimeBrain
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [SlimePerson]
   followSkinColor: true
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: brain
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: SlimeEyeglow
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [SlimePerson]
   coloring:
@@ -43,30 +51,39 @@
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: eyeglow
     shader: unshaded
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Eyes
+    organ: Eyes
+    # WD EDIT END
 
 - type: marking
   id: SlimeLungs
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [SlimePerson]
   followSkinColor: true
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: lungs
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: SlimeCore
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [SlimePerson]
   followSkinColor: true
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: core
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonehead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -78,10 +95,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonehead
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonechest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -93,10 +113,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonechest
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonearmleft
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -108,10 +131,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonearmleft
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonearmright
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -123,10 +149,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonearmright
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonefootleft
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -138,10 +167,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonefootleft
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonefootright
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -153,10 +185,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonefootright
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonehandleft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -168,10 +203,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonehandleft
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonehandright
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -183,10 +221,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonehandright
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonelegleft
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -198,10 +239,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonelegleft
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: SlimeBonelegright
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [SlimePerson]
   followSkinColor: false
@@ -213,4 +257,8 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/slime_parts.rsi
     state: bonelegright
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/tattoos.yml
index c24a8753f2b..ca1717c578b 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/tattoos.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/tattoos.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: ChestCutHere
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: chest_cuthere
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ArmDollJointsTattooLeft
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -25,11 +27,14 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_arm_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 
 - type: marking
   id: ArmDollJointsTattooRight
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -40,10 +45,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_arm_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: HandDollJointsTattooLeft
-  bodyPart: LHand
   markingCategory: LeftHand
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -54,10 +62,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_hand_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
+    # WD EDIT END
 
 - type: marking
   id: HandDollJointsTattooRight
-  bodyPart: RHand
   markingCategory: RightHand
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -68,10 +79,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_hand_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
+    # WD EDIT END
 
 - type: marking
   id: LegDollJointsTattooLeft
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -82,10 +96,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_leg_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegDollJointsTattooRight
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -96,10 +113,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_leg_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: FootDollJointsTattooLeft
-  bodyPart: LFoot
   markingCategory: LeftFoot
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -110,10 +130,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_foot_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 - type: marking
   id: FootDollJointsTattooRight
-  bodyPart: RFoot
   markingCategory: RightFoot
   speciesRestriction: [Human, Oni, Reptilian, SlimePerson, Arachnid, Tajaran, Felinid, Arachne, Shadowkin, Moth, Vulpkanin]
   coloring:
@@ -124,10 +147,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_foot_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
+    # WD EDIT END
 
 - type: marking
   id: ArmDollJointsTattooLeftIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -138,11 +164,14 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_arm_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
+    # WD EDIT END
 
 
 - type: marking
   id: ArmDollJointsTattooRightIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -153,10 +182,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_arm_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: HandDollJointsTattooLeftIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -167,10 +199,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_hand_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: HandDollJointsTattooRightIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -181,10 +216,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_hand_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegDollJointsTattooLeftIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -195,10 +233,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_leg_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: LegDollJointsTattooRightIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -209,10 +250,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_leg_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: FootDollJointsTattooLeftIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -223,10 +267,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: l_foot_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: FootDollJointsTattooRightIPCONLY
-  bodyPart: LLeg
   markingCategory: Overlay
   speciesRestriction: [IPC]
   coloring:
@@ -237,3 +284,7 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/tattoos.rsi
     state: r_foot_doll
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml
index bdf07d3c67a..f7d10221050 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: ThavenEars1
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Thaven]
   forcedColoring: true
@@ -8,10 +7,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: ears1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenEars2
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Thaven]
   forcedColoring: true
@@ -19,10 +21,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: ears2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenEars3
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Thaven]
   forcedColoring: true
@@ -30,10 +35,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: ears3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenEars4
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Thaven]
   forcedColoring: true
@@ -41,10 +49,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: ears4
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenPiercings
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Thaven]
   forcedColoring: false
@@ -52,10 +63,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: piercings
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenPiercings2
-  bodyPart: HeadTop
   markingCategory: HeadTop
   speciesRestriction: [Thaven]
   forcedColoring: false
@@ -63,10 +77,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: piercings2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ThavenChestTattoo1
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Thaven]
   coloring:
@@ -77,10 +94,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: chesttat1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: ThavenLArmTattoo1
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [Thaven]
   coloring:
@@ -91,10 +111,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: larmtat1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: ThavenRArmTattoo1
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [Thaven]
   coloring:
@@ -105,3 +128,7 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven.rsi
     state: rarmtat1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml
index a62cf63c5cd..d96aada3fc8 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/thaven_hair.yml
@@ -1,1496 +1,2057 @@
 - type: marking
   id: ThavenHairBalding
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: e
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBedhead
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBedheadv2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bedhead2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBedheadv3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bedhead3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongBedhead
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: long_bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongBedhead2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: long_bedhead2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairFloorlengthBedhead
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: floorlength_bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBeehive
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: beehive
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBeehive2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: beehive2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBob
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bob
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBob2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bob2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBobcut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bobcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBob4
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bob4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBob5
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bob5
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBobcurl
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bobcurl
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBowlcut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bowlcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBowlcut2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bowlcut2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBraid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: braid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBraided
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: braided
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBraidfront
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: braidfront
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBraid2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: braid2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHbraid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: hbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShortbraid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shortbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBraidtail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: braidtail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBun
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBunhead2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bunhead2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBun3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bun3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLargebun
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: largebun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairManbun
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: manbun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTightbun
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: tightbun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBusiness
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: business
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBusiness2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: business2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBusiness3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: business3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBusiness4
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: business4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBuzzcut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: buzzcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCia
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: cia
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicCia
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classiccia
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicFloorlengthBedhead
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classicfloorlength_bedhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicModern
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classicmodern
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicMulder
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classicmulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicWisp
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classicwisp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCombover
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: combover
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCornrows
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: cornrows
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCornrows2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: cornrows2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCornrowbun
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: cornrowbun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCornrowbraid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: cornrowbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCornrowtail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: cornrowtail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCrewcut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: crewcut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCrewcut2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: crewcut2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCurls
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: curls
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairC
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: c
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairDandypompadour
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: dandypompadour
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairDevilock
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: devilock
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairDoublebun
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: doublebun
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairDoublebunLong
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
   - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
     state: doublebun_long
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadTop
+    bodyPart: Head
+    # WD EDIT END
 - type: marking
   id: ThavenHairDreads
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: dreads
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairDrillruru
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: drillruru
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairDrillhairextended
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: drillhairextended
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairEmofringe
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: emofringe
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairNofade
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: nofade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHighfade
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: highfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairMedfade
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: medfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLowfade
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: lowfade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBaldfade
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: baldface
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairFeather
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: feather
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairFather
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: father
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSargeant
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: sargeant
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairFlair
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: flair
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBigflattop
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bigflattop
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairFlow
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: f
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairGelled
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: gelled
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairGentle
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: gentle
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHalfbang
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: halfbang
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHalfbang2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: halfbang2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHalfshaved
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: halfshaved
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHedgehog
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: hedgehog
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHimecut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: himecut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHimecut2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: himecut2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShorthime
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shorthime
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHimeup
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: himeup
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHitop
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: hitop
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairJade
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: jade
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairJensen
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: jensen
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairJoestar
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: joestar
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairKeanu
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: keanu
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairKusanagi
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: kusanagi
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLong
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: long
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLong2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: long2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLong3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: long3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongWithBundles
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longbundled
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongovereye
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longovereye
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLbangs
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: lbangs
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongeremo
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longeremo
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongfringe
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longfringe
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongsidepart
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longsidepart
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairMegaeyebrows
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: megaeyebrows
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairMessy
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: messy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairModern
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: modern
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairMohawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: d
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairNitori
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: nitori
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairReversemohawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: reversemohawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairMulder
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: mulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairOdango
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: odango
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairOmbre
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ombre
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairOneshoulder
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: oneshoulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShortovereye
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shortovereye
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairOxton
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: oxton
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairParted
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: parted
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPart
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: part
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairKagami
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: kagami
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPigtails
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: pigtails
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPigtails2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: pigtails2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPixie
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: pixie
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPompadour
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: pompadour
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBigpompadour
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bigpompadour
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPonytail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPonytail2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ponytail2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPonytail3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ponytail3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPonytail4
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ponytail4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPonytail5
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ponytail5
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPonytail6
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ponytail6
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPonytail7
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ponytail7
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairHighponytail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: highponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairStail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: stail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongstraightponytail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longstraightponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCountry
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: country
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairFringetail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: fringetail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSidetail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: sidetail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSidetail2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: sidetail2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSidetail3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: sidetail3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSidetail4
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: sidetail4
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSpikyponytail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: spikyponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairPoofy
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: poofy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairQuiff
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: quiff
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairRonin
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: ronin
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShaved
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shaved
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShavedpart
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shavedpart
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShortbangs
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shortbangs
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairA
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: a
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShorthair2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shorthair2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShorthair3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shorthair3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShorthair9
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shorthair9
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHair80s
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: 80s
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairRosa
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: rosa
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairB
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: b
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSidecut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: sidecut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSkinhead
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: skinhead
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairProtagonist
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: protagonist
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSpiky
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: spiky
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSpookyLong
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: spookylong
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSwept
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: swept
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairSwept2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: swept2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShoulderLengthOverEye
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shoulderlengthovereye
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairThinning
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: thinning
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairThinningfront
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: thinningfront
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairThinningrear
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: thinningrear
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTopknot
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: topknot
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTressshoulder
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: tressshoulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTrimmed
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: trimmed
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTrimflat
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: trimflat
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTwintail
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: twintail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTwoStrands
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: twostrands
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairUndercut
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: undercut
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairUndercutleft
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: undercutleft
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairUndercutright
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: undercutright
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairUnkept
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: unkept
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairVlong
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: vlong
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongest
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longest
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairLongest2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: longest2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairVeryshortovereyealternate
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: veryshortovereyealternate
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairVlongfringe
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: vlongfringe
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairVolaju
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: volaju
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairWisp
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: wisp
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairUneven
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: uneven
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairTailed
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: tailed
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicLong2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classiclong2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicLong3
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classiclong3
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairBald
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: bald
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairShavedMohawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: shavedmohawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairMediumSidepart
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: mediumsidepart
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairEmo2
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: emo2
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairDrillHair
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: drillhair
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicAfro
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classicafro
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicciaBusiness
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classicciabusiness
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairClassicCornrows
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: classiccornrows
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairCoffeeHouse
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: coffeehouse
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
 - type: marking
   id: ThavenHairFrenchbraid
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Thaven]
   sprites:
     - sprite: _Impstation/Mobs/Customization/thaven/thaven_hair.rsi
       state: frenchbraid
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.HeadTop
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox.yml
index d4fc4e330e3..0b95925f1e5 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox.yml
@@ -1,279 +1,397 @@
 - type: marking
   id: FeatheredLegL
-  bodyPart: LLeg
   markingCategory: LeftLeg
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: featheredlegl
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    bodyPart: LeftLeg
+    # WD EDIT END
 
 - type: marking
   id: FeatheredLegR
-  bodyPart: RLeg
   markingCategory: RightLeg
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: featheredlegr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightLeg
+    bodyPart: RightLeg
+    # WD EDIT END
 
 - type: marking
   id: SpotsArmL
-  bodyPart: LArm
   markingCategory: LeftArm
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: spotsarml
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.LeftArm
+    bodyPart: LeftArm
+    # WD EDIT END
 
 - type: marking
   id: SpotsArmR
-  bodyPart: RArm
   markingCategory: RightArm
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: spotsarmr
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.RightArm
+    bodyPart: RightArm
+    # WD EDIT END
 
 - type: marking
   id: SpotsChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: spotschest1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: spotschest2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: SpotsTail
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: spotstail
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxStreamers
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: streamers1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: streamers2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: streamers3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VChest
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: vchest1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: vchest2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: vchest3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VoxBald
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: balding
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LargeWattle
-  bodyPart: FacialHair
   markingCategory: HeadSide
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: beardlargewattle
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: BeardPadovana
-  bodyPart: FacialHair
   markingCategory: FacialHair
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: beardpadovana
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: HairPadovana
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: hairpadovana
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: SmallWattle
-  bodyPart: FacialHair
   markingCategory: HeadSide
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: beardsmallwattle
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.FacialHair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxEmover
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: hairemover
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxPolish
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: hairpolish
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxWindswept
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: hairwindswept
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: LargeComb
-  bodyPart: Hair
   markingCategory: HeadSide
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: largecomb
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxEarhole
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: earhole
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: FriendsOfAFeather
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: friendsfeather1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: friendsfeather2
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
 
 - type: marking
   id: VoxNeckband
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: neckband
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxScarBlasted
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: scarheadblasted
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: VoxScarIncision
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: scarincision
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VoxScarMangled
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: scarmangled
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: VoxScarSpinal
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: scarspinal
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
 - type: marking
   id: SideQuills
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: sidequills1
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: sidequills2
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: sidequills3
+    # WD EDIT START
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: TailBloom
-  bodyPart: Tail
   markingCategory: Overlay
   speciesRestriction: [ Vox ]
   followSkinColor: false
   sprites:
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: tailbloom1
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
   - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
     state: tailbloom2
-  - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
-    state: tailbloom3
\ No newline at end of file
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
+  - sprite: _Impstation/Mobs/Customization/voxbundle1.rsi
+    state: tailbloom3
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox_scars.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox_scars.yml
index ec189b9958c..6b2bf826187 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox_scars.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/vox_scars.yml
@@ -1,6 +1,5 @@
 - type: marking
   id: ScarsVoxRoadrashLeftHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vox]
   coloring:
@@ -11,10 +10,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/vox_scars.rsi
     state: roadrash_l_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarsVoxRoadrashRightHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vox]
   coloring:
@@ -25,10 +27,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/vox_scars.rsi
     state: roadrash_r_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarsVoxBigslashLeftHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vox]
   coloring:
@@ -39,10 +44,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/vox_scars.rsi
     state: bigslash_l_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarsVoxBigslashRightHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vox]
   coloring:
@@ -53,10 +61,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/vox_scars.rsi
     state: bigslash_r_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarsVoxSlashLeftHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vox]
   coloring:
@@ -67,10 +78,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/vox_scars.rsi
     state: slash_l_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarsVoxSlashRightHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Vox]
   coloring:
@@ -81,10 +95,13 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/vox_scars.rsi
     state: slash_r_head
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+    # WD EDIT END
 
 - type: marking
   id: ScarsVoxClawTorso
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Vox]
   coloring:
@@ -95,4 +112,8 @@
   sprites:
   - sprite: _Impstation/Mobs/Customization/vox_scars.rsi
     state: claw_torso
+    # WD EDIT START
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+    # WD EDIT END
 
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml
index 7acfe1f6bd5..639a3cb53ed 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml
@@ -24,7 +24,6 @@
     scale: 1, 1.05
   - type: Body
     prototype: Thaven
-    requiredLegs: 2
   - type: NoContractionsAccent
   - type: Damageable
     damageContainer: Biological
@@ -67,8 +66,10 @@
   - type: HumanoidAppearance
     species: Thaven
     hideLayersOnEquip:
-    - Hair
-    - Snout
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    # WD EDIT END
   - type: UserInterface
     interfaces:
       enum.ThavenMoodsUiKey.Key: # impstation edit
@@ -80,9 +81,6 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      # Shitmed
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: Inventory
     templateId: thaven
     displacements:
@@ -241,3 +239,7 @@
               layerKey: dummy
               parameterTexture: displacementMap
               parameterUV: displacementUV
+  # WD EDIT START
+  - type: Body
+    prototype: Thaven
+  # WD EDIT END
diff --git a/Resources/Prototypes/_Impstation/Species/thaven.yml b/Resources/Prototypes/_Impstation/Species/thaven.yml
index f61c74a24c9..4f04fbc77bd 100644
--- a/Resources/Prototypes/_Impstation/Species/thaven.yml
+++ b/Resources/Prototypes/_Impstation/Species/thaven.yml
@@ -3,10 +3,6 @@
   name: species-name-thaven
   roundStart: false
   prototype: MobThaven
-  # WD EDIT START
-  bodyTypes:
-  - ThavenNormal
-  # WD EDIT END
   defaultSkinTone: "#ffffff"
   markingLimits: MobThavenMarkingLimits
   dollPrototype: MobThavenDummy
@@ -15,27 +11,6 @@
   femaleFirstNames: names_thaven
   naming: First
 
-# WD EDIT START
-- type: bodyType
-  id: ThavenNormal
-  name: body-normal
-  # WD EDIT END
-  sprites:
-    Hair: MobHumanoidAnyMarking
-    Eyes: MobThavenEyes
-    Head: MobThavenHead
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Chest: MobThavenTorso
-    LArm: MobThavenLArm
-    RArm: MobThavenRArm
-    LHand: MobThavenLHand
-    RHand: MobThavenRHand
-    LLeg: MobThavenLLeg
-    RLeg: MobThavenRLeg
-    LFoot: MobThavenLFoot
-    RFoot: MobThavenRFoot
-
 - type: markingPoints
   id: MobThavenMarkingLimits
   points:
@@ -55,6 +30,11 @@
     Chest:
       points: 6
       required: false
+    # WD EDIT START
+    Groin:
+      points: 6
+      required: false
+    # WD EDIT END
     Underwear:
       points: 1
       required: false
@@ -85,94 +65,3 @@
     LeftHand:
       points: 6
       required: false
-
-- type: humanoidBaseSprite
-  id: MobThavenEyes
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: eyes
-
-- type: humanoidBaseSprite
-  id: MobThavenHead
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobThavenHeadMale
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobThavenHeadFemale
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobThavenTorso
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobThavenTorsoMale
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobThavenTorsoFemale
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: torso_f
-
-
-- type: humanoidBaseSprite
-  id: MobThavenLLeg
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobThavenLHand
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobThavenLArm
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobThavenLFoot
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobThavenRLeg
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobThavenRHand
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobThavenRArm
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobThavenRFoot
-  baseSprite:
-    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_Lavaland/Entities/Clothing/explorer_suit.yml b/Resources/Prototypes/_Lavaland/Entities/Clothing/explorer_suit.yml
index ca226ecb463..66590605382 100644
--- a/Resources/Prototypes/_Lavaland/Entities/Clothing/explorer_suit.yml
+++ b/Resources/Prototypes/_Lavaland/Entities/Clothing/explorer_suit.yml
@@ -16,7 +16,7 @@
         Blunt: 0.70
         Slash: 0.70
         Piercing: 0.70
-        Heat: 0.75 # parity with 13 :) 
+        Heat: 0.75 # parity with 13 :)
         Caustic: 0.50
   - type: ExplosionResistance
     damageCoefficient: 0.50
@@ -47,16 +47,18 @@
     - WhitelistChameleon
   - type: HideLayerClothing
     slots:
-    - Hair
-    - HeadTop
-    - HeadSide
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
+    # WD EDIT END
   - type: Armor
     modifiers:
       coefficients:
         Blunt: 0.90
         Slash: 0.90
         Piercing: 0.90
-        Heat: 0.70 # parity with 13 :) 
+        Heat: 0.70 # parity with 13 :)
         Caustic: 0.90
 
 - type: entity
@@ -207,4 +209,4 @@
         Slash: 0.75
         Piercing: 0.90
         Heat: 0.70
-        Caustic: 0.90
\ No newline at end of file
+        Caustic: 0.90
diff --git a/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Salvage/lavaland_loot.yml b/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Salvage/lavaland_loot.yml
index ef76dc2daea..a98aac51878 100644
--- a/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Salvage/lavaland_loot.yml
+++ b/Resources/Prototypes/_Lavaland/Entities/Objects/Specific/Salvage/lavaland_loot.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: LavalandCursedHeart
-  parent: BaseHumanOrgan
+  parent: BaseOrganHuman # WD EDIT: BaseHumanOrgan -> BaseOrganHuman
   name: heart
   description: "I feel bad for the heartless bastard who lost this."
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml
index 9bade6e0f17..6aec3afc449 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml
@@ -16,7 +16,9 @@
         Caustic: 0.9
   - type: HideLayerClothing
     slots:
-    - Hair
+    # WD EDIT START
+    - enum.HumanoidVisualLayers.Hair
+    # WD EDIT END
 
 - type: entity
   parent: ClothingHeadHatHoodAcidRaincoat
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/Customization/Markings/hair.yml
index 00afd2d080a..4b42879c8e0 100644
--- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/Customization/Markings/hair.yml
+++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/Customization/Markings/hair.yml
@@ -1,241 +1,331 @@
 - type: marking
   id: ZetaHairLongSpikehair
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: long_spikehair
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairNerfish
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: nerfish
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairPlantpoofs
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: plantish_poofs
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairRattyRoyalty
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: ratty_royalty
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairShortMessy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: short_and_messy
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairShortSpikehair
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: short_spikehair
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairSpikehawk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: spikehawk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairPolitical
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: the_political
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairZetaBasicBraids
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: zeta_basic_braids
-      
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
+
 - type: marking
   id: ZetaHairQuadspike
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: quadspike
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairJohnny
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: the_johnny
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairMattedSpikes
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: matted_spikes
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairManageableMess
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: manageable_mess
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairPoofed
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: poofed
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairOverShoulderBraids
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: over_shoulder_braids
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairMonk
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: monk
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairMiniMattedSpikes
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: mini_matted_spikes
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairNaturalMessShort
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: natural_mess_short
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairNaturalMessLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: natural_mess_long
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairFrontSpikes
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: front_spikes
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairMessyPonytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: messy_ponytail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairFaded
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: faded
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairHalfsies
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: halfsies
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairPorcupine
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: porcupine
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairHalfShavedBraids
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: half_shaved_braids
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairLoneTail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: lone_tail
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 # Falling out irradiated hair. Commented out because it's probably not needed here?
 #- type: marking
 #  id: ZetaHairRadical
-#  bodyPart: Hair
 #  markingCategory: Hair
 #  sprites:
 #    - sprite: _Nuclear14/Mobs/Customization/hair.rsi
 #      state: radical
+#      # WD EDIT START
+#      layer: enum.HumanoidVisualLayers.Hair
+#      bodyPart: Head
+#      # WD EDIT END
 
 # Just a fallout reference. Unlikely to be wanted on the main EE repo?
 #- type: marking
 #  id: ZetaHairTunnelSnake
-#  bodyPart: Hair
 #  markingCategory: Hair
 #  sprites:
 #    - sprite: _Nuclear14/Mobs/Customization/hair.rsi
 #      state: tunnel_snake
+#      # WD EDIT START
+#      layer: enum.HumanoidVisualLayers.Hair
+#      bodyPart: Head
+#      # WD EDIT END
 
 - type: marking
   id: ZetaHairOverTheShoulder
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
       state: over_the_shoulder
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
 
 - type: marking
   id: ZetaHairStandardAsymmetry
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: _Nuclear14/Mobs/Customization/hair.rsi
-      state: standard_asymmetry
\ No newline at end of file
+      state: standard_asymmetry
+      # WD EDIT START
+      layer: enum.HumanoidVisualLayers.Hair
+      bodyPart: Head
+      # WD EDIT END
diff --git a/Resources/Prototypes/_Shitmed/Actions/abductor.yml b/Resources/Prototypes/_Shitmed/Actions/abductor.yml
deleted file mode 100644
index b2097afc10b..00000000000
--- a/Resources/Prototypes/_Shitmed/Actions/abductor.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Actions
-- type: entity
-  id: ActionExitConsole
-  name: Exit console
-  description: Exit console.
-  components:
-  - type: InstantAction
-    priority: -20
-    itemIconStyle: BigAction
-    icon:
-      sprite: _Shitmed/Interface/Actions/actions_abductor.rsi
-      state: exit
-    event: !type:ExitConsoleEvent
-
-- type: entity
-  id: ActionSendYourself
-  name: Send yourself
-  description: You need to FTL to the same map as the station to use this ability!
-  components:
-  - type: WorldTargetAction
-    useDelay: 10
-    priority: -19
-    range: -1
-    checkCanAccess: false
-    itemIconStyle: BigAction
-    icon:
-      sprite: _Shitmed/Interface/Actions/actions_abductor.rsi
-      state: send-yourself
-    event: !type:SendYourselfEvent
-
-- type: entity
-  id: ActionReturnToShip
-  name: return
-  description: return to the ship.
-  components:
-  - type: InstantAction
-    useDelay: 30
-    icon:
-      sprite: _Shitmed/Interface/Actions/actions_abductor.rsi
-      state: take
-    priority: -12
-    event: !type:AbductorReturnToShipEvent
-
diff --git a/Resources/Prototypes/_Shitmed/Body/Actions/organactions.yml b/Resources/Prototypes/_Shitmed/Body/Actions/organactions.yml
deleted file mode 100644
index 0903c9b73b0..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Actions/organactions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Technically goliath will also have these, but its HTN should not abuse it.
-# Only player controlled ones would, and you could claim its a feature to throw salvies off at that point :trollface:
-#- type: entity
-#  id: ActionGoliathTentacleCrew
-#  name: "[color=red]Tentacle Slam[/color]"
-#  description: Use your tentacles to grab and stun a target player!
-#  #components:
-#  #- type: EntityWorldTargetAction
-#  #  raiseOnUser: true
-  #  icon:
-  #    sprite: Mobs/Aliens/Asteroid/goliath.rsi
-  #    state: goliath_tentacle_spawn
-  #  iconOn:
-  #    sprite: Mobs/Aliens/Asteroid/goliath.rsi
-  #    state: goliath_tentacle_wiggle
-  #  sound:
-  #    path: "/Audio/Weapons/slash.ogg"
-  #  event: !type:GoliathSummonTentacleAction
-  #  useDelay: 80
-  #  range: 10
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
deleted file mode 100644
index b7a40d18a79..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/animal.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-- type: entity
-  id: OrganAnimalBrain
-  parent: BaseAnimalOrganUnGibbable
-  name: animal brain
-  description: "Not so intelligence, not so honk."
-  components:
-  - type: Sprite
-    state: brain
-  - type: Organ
-    slotId: brain
-  - type: Food
-    delay: 5
-    forceFeedDelay: 6
-    popupOnEat: true
-  - 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: Item
-    size: Small
-    heldPrefix: brain
-
-- type: entity
-  id: OrganAnimalEyes
-  parent: BaseAnimalOrgan
-  name: animal eyes
-  description: "I see you!"
-  components:
-  - type: Organ # Shitmed Change
-    slotId: eyes
-  - type: Eyes # Shitmed Change
-  - type: Sprite
-    layers:
-      - state: eyeball-l
-      - state: eyeball-r
-  - type: Item
-    size: Small
-    heldPrefix: eyeballs
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml
deleted file mode 100644
index faa6c002a5c..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/kobold.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# TODO: Add descriptions (many)
-
-- type: entity
-  id: PartKobold
-  parent: [BaseItem, BasePart]
-  name: "kobold body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoKobold
-  name: "kobold torso"
-  parent: [PartKobold, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-- type: entity
-  id: HeadKobold
-  name: "kobold head"
-  parent: [BaseHead, PartKobold] # WWDP
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmKobold
-  name: "left kobold arm"
-  parent: [PartKobold, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmKobold
-  name: "right kobold arm"
-  parent: [PartKobold, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandKobold
-  name: "left kobold hand"
-  parent: [PartKobold, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandKobold
-  name: "right kobold hand"
-  parent: [PartKobold, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegKobold
-  name: "left kobold leg"
-  parent: [PartKobold, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegKobold
-  name: "right kobold leg"
-  parent: [PartKobold, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootKobold
-  name: "left kobold foot"
-  parent: [PartKobold, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootKobold
-  name: "right kobold foot"
-  parent: [PartKobold, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/kobold.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml
deleted file mode 100644
index b15333a74df..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/monkey.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# TODO: Add descriptions (many)
-
-- type: entity
-  id: PartMonkey
-  parent: [BaseItem, BasePart]
-  name: "monkey body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoMonkey
-  name: "monkey torso"
-  parent: [PartMonkey, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-- type: entity
-  id: HeadMonkey
-  name: "monkey head"
-  parent: [BaseHead, PartMonkey] # WWDP
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmMonkey
-  name: "left monkey arm"
-  parent: [PartMonkey, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmMonkey
-  name: "right monkey arm"
-  parent: [PartMonkey, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandMonkey
-  name: "left monkey hand"
-  parent: [PartMonkey, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandMonkey
-  name: "right monkey hand"
-  parent: [PartMonkey, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegMonkey
-  name: "left monkey leg"
-  parent: [PartMonkey, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegMonkey
-  name: "right monkey leg"
-  parent: [PartMonkey, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootMonkey
-  name: "left monkey foot"
-  parent: [PartMonkey, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootMonkey
-  name: "right monkey foot"
-  parent: [PartMonkey, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Animals/monkey.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/space.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/space.yml
deleted file mode 100644
index d895b246f02..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/Animal/space.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-- type: entity
-  parent: OrganAnimalLungs
-  id: OrganSpaceAnimalLungs
-  name: space animal lungs
-  components:
-  - type: Organ
-    onAdd:
-    - type: BreathingImmunity
-
-- type: entity
-  parent: OrganAnimalHeart
-  id: OrganSpaceAnimalHeart
-  name: space animal heart
-  components:
-  - type: Organ
-    onAdd:
-    - type: PressureImmunity
-
-- type: entity
-  parent: OrganAnimalHeart
-  id: OrganGoliathHeart
-  name: goliath heart
-  components:
-  - type: Organ
-    onAdd:
-    - type: GoliathTentacle
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Space/Goliath/organs.rsi
-    state: heart-on
-
-- type: entity
-  parent: OrganAnimalLungs
-  id: OrganDragonLungs
-  name: dragon lungs
-  components:
-  - type: Organ
-    onAdd:
-    - type: ActionGun
-      action: ActionDragonsBreath
-      gunProto: DragonsBreathGun
-
-- type: entity
-  parent: OrganHumanEyes
-  id: OrganLaserEyes
-  name: laser raptor eyes
-  components:
-  - type: Organ
-    onAdd:
-    - type: ProjectileBatteryAmmoProvider # WWDP
-      proto: BulletEnergyGunLaser # WWDP
-      fireCost: 50
-    - type: BatterySelfRecharger
-      autoRecharge: true
-      autoRechargeRate: 25
-    - type: Battery
-      maxCharge: 100
-      startingCharge: 0
-    - type: Gun
-      fireRate: 1
-      useKey: false
-      selectedMode: SemiAuto
-      availableModes:
-        - SemiAuto
-      soundGunshot: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
-
-- type: entity
-  parent: OrganAnimalHeart
-  id: OrganCobraHeart
-  name: cobra gland
-  components:
-  - type: Organ
-    onAdd:
-    - type: Stealth
-      enabledOnDeath: false
-      maxVisibility: 1.2
-    - type: StealthOnMove
-      passiveVisibilityRate: -0.25
-      movementVisibilityRate: 0.25
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Space/Cobra/organs.rsi
-    state: heart-on
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/abductor.yml b/Resources/Prototypes/_Shitmed/Body/Organs/abductor.yml
deleted file mode 100644
index ceccb17faeb..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/abductor.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-- type: entity
-  id: OrganAbductorBrain
-  parent: OrganHumanBrain
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    state: brain
-
-- type: entity
-  id: OrganAbductorEyes
-  parent: OrganHumanEyes
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    state: eyeballs
-    layers:
-      - state: eyeballs
-
-- type: entity
-  id: OrganAbductorEars
-  parent: OrganHumanEars
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    state: ears
-
-- type: entity
-  id: OrganAbductorLungs
-  parent: OrganHumanLungs
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    layers:
-      - state: lung-l
-      - state: lung-r
-  - type: Lung
-    alert: LowNitrogen
-  - type: Organ
-    slotId: lungs
-
-- type: entity
-  id: OrganAbductorHeart
-  parent: OrganHumanHeart
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    state: heart-on
-
-- type: entity
-  id: OrganAbductorStomach
-  parent: OrganHumanStomach
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    state: stomach
-
-- type: entity
-  id: OrganAbductorLiver
-  parent: OrganHumanLiver
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    state: liver
-
-- type: entity
-  id: OrganAbductorKidneys
-  parent: OrganHumanKidneys
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/organs.rsi
-    layers:
-      - state: kidney-l
-      - state: kidney-r
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/cybernetic.yml b/Resources/Prototypes/_Shitmed/Body/Organs/cybernetic.yml
deleted file mode 100644
index a7e68c5a29b..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/cybernetic.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-- type: entity
-  parent: OrganHumanEyes
-  abstract: true
-  id: BaseCyberneticEyes
-  components:
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Species/IPC/organs.rsi
-    state: "eyes"
-
-- type: entity
-  parent: BaseCyberneticEyes
-  id: BasicCyberneticEyes
-  name: cybernetic eyes
-  description: A pair of cybernetic eyes that enhance your vision, and protect you from eye damage.
-  components:
-  - type: Organ
-    onAdd:
-    - type: FlashImmunity
-    - type: EyeProtection
-
-- type: entity
-  parent: BaseCyberneticEyes
-  id: SecurityCyberneticEyes
-  name: cybernetic security eyes
-  description: A pair of cybernetic eyes that enhance your vision, featuring an integrated SecHUD.
-  components:
-  - type: Organ
-    onAdd:
-    - type: FlashImmunity
-    - type: EyeProtection
-    - type: ShowJobIcons
-    - type: ShowMindShieldIcons
-    - type: ShowCriminalRecordIcons
-
-- type: entity
-  parent: BaseCyberneticEyes
-  id: MedicalCyberneticEyes
-  name: cybernetic diagnostic eyes
-  description: A pair of cybernetic eyes that enhance your vision, featuring an integrated MedHUD.
-  components:
-  - type: Organ
-    onAdd:
-    - type: FlashImmunity
-    - type: EyeProtection
-    - type: ShowHealthBars
-      damageContainers:
-      - Biological
-    - type: ShowHealthIcons
-      damageContainers:
-      - Biological
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/dubious.yml b/Resources/Prototypes/_Shitmed/Body/Organs/dubious.yml
deleted file mode 100644
index 74271d9ec27..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/dubious.yml
+++ /dev/null
@@ -1,226 +0,0 @@
-- type: entity
-  id: OrganDubiousBase
-  parent: OrganHumanHeart
-  name: mysterious gland
-  categories: [ HideSpawnMenu ]
-  abstract: true
-  description: Suspicious alien gland, replaces the heart.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Misc/Dubious/organs.rsi
-    state: gland
-  - type: AbductorOrgan
-
-- type: entity
-  id: OrganDubiousHealth
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: health
-  - type: Organ
-    onAdd:
-    - type: PassiveDamage
-      allowedStates:
-      - Alive
-      - Critical
-      damageCap: 150
-      damage:
-        groups:
-          Brute: -0.14
-          Burn: -0.14
-          Airloss: -0.14
-          Toxin: -0.14
-          Genetic: -0.14
-
-- type: entity
-  id: OrganDubiousAA
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: emp
-  - type: Organ
-    onAdd:
-    - type: Access
-      enabled: true
-      groups:
-      - AllAccess
-    - type: AccessReader
-      access: [["Command"], ["Research"]]
-
-- type: entity
-  id: OrganDubiousShock
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: emp
-  - type: Organ
-    onAdd:
-    - type: Insulated
-    - type: LightningArcShooter
-      arcDepth: 1
-      maxLightningArc: 3
-      shootMinInterval: 90
-      shootMaxInterval: 300
-      shootRange: 5
-      lightningPrototype: Lightning
-
-- type: entity
-  id: OrganDubiousInvisible
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: species
-  - type: Organ
-    onAdd:
-    - type: Stealth
-      enabledOnDeath: false
-      maxVisibility: 1.2
-    - type: StealthOnMove
-      passiveVisibilityRate: -0.25
-      movementVisibilityRate: 0.25
-
-- type: entity
-  id: OrganDubiousGoliath
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: species
-  - type: Organ
-    onAdd:
-    - type: GoliathTentacle
-
-- type: entity
-  id: OrganDubiousSpaceAdaptation
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: species
-  - type: Organ
-    onAdd:
-    - type: PressureImmunity
-    - type: BreathingImmunity
-
-- type: entity
-  id: OrganDubiousArtifact
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: mindshock
-  - type: Organ
-    onAdd:
-    - type: Artifact
-    - type: RandomStatusActivation
-      statusEffects:
-        ActivateArtifactEffect: ActivateArtifactEffect
-
-- type: entity
-  id: OrganDubiousScrambleDna
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: species
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      statusEffects:
-        ScrambleDnaEffect: ScrambleDnaEffect
-
-- type: entity
-  id: OrganDubiousScrambleLocation
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: vent
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      statusEffects:
-        ScrambleLocationEffect: ScrambleLocationEffect
-
-- type: entity
-  id: OrganDubiousSpiderEggs
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: spider
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      minActivationTime: 120
-      maxActivationTime: 360
-      statusEffects:
-        SpawnSpiderEggs: SpawnSpiderEggs
-
-- type: entity
-  id: OrganDubiousSlimeEggs
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: slime
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      minActivationTime: 120
-      maxActivationTime: 360
-      statusEffects:
-        SpawnSlimes: SpawnSlimes
-
-- type: entity
-  id: OrganDubiousEMP
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: emp
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      statusEffects:
-        SpawnEmp: SpawnEmp
-
-- type: entity
-  id: OrganDubiousGravityWell
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: emp
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      statusEffects:
-        SpawnGravityWell: SpawnGravityWell
-
-- type: entity
-  id: OrganDubiousFlash
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: emp
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      statusEffects:
-        SpawnFlash: SpawnFlash
-
-- type: entity
-  id: OrganDubiousSmoke
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: emp
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      statusEffects:
-        SpawnSmoke: SpawnSmoke
-
-- type: entity
-  id: OrganDubiousGas
-  parent: OrganDubiousBase
-  components:
-  - type: Sprite
-    state: viral
-  - type: Organ
-    onAdd:
-    - type: RandomStatusActivation
-      statusEffects:
-        ExpelGas: ExpelGas
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/felinid.yml b/Resources/Prototypes/_Shitmed/Body/Organs/felinid.yml
deleted file mode 100644
index 0c6c7ea91d2..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/felinid.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: entity
-  id: OrganFelinidEars
-  parent: OrganHumanEars
-  name: cat ears
-  description: "Holding these might potentially be contagious."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/catears.rsi
-    state: icon
-  - type: MarkingContainer
-    marking: FelinidEarsBasic
-
-- type: entity
-  id: OrganFelinidTail
-  parent: BaseHumanOrgan
-  name: cat tail
-  description: "Should you really have this?"
-  components:
-  - type: Sprite
-    sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
-    state: basic_tail_tip
-  - type: MarkingContainer
-    marking: FelinidTailBasic
-  - type: Tail
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/generic.yml b/Resources/Prototypes/_Shitmed/Body/Organs/generic.yml
deleted file mode 100644
index 68dc80b3ab3..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/generic.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- 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.
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/silicon.yml b/Resources/Prototypes/_Shitmed/Body/Organs/silicon.yml
deleted file mode 100644
index c1503aa7d53..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Organs/silicon.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: entity
-  id: RightArmSiliconIndestructible
-  name: "right silicon arm"
-  parent: [BaseItem, BaseRightArm]
-  components:
-    - type: Damageable
-    - type: BodyPart
-      partType: Arm
-      symmetry: Right
-      toolName: "a right arm" # Shitmed Change
-      canSever: false
-    - type: Sprite
-      sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-      state: "l_arm-combined"
-
-- type: entity
-  id: RightHandSiliconIndestructible
-  name: "right silicon hand"
-  parent: [BaseItem, BaseRightArm]
-  components:
-    - type: Damageable
-    - type: BodyPart
-      partType: Hand
-      symmetry: Right
-      toolName: "a right hand" # Shitmed Change
-      canSever: false
-    - type: Sprite
-      sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-      state: "r_hand"
diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/abductor.yml b/Resources/Prototypes/_Shitmed/Body/Parts/abductor.yml
deleted file mode 100644
index caefc68a9c3..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Parts/abductor.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-- type: entity
-  id: TorsoAbductor
-  name: "abductor torso"
-  parent: BaseTorso
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "torso"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Nutriment
-        Quantity: 10
-      - ReagentId: Sugar
-        Quantity: 20
-
-- type: entity
-  id: HeadAbductor
-  name: "abductor head"
-  parent: BaseHead
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "head"
-
-- type: entity
-  id: LeftArmAbductor
-  name: "left abductor arm"
-  parent: BaseLeftArm
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmAbductor
-  name: "right abductor arm"
-  parent: BaseRightArm
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandAbductor
-  name: "left abductor hand"
-  parent: BaseLeftHand
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandAbductor
-  name: "right abductor hand"
-  parent: BaseRightHand
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegAbductor
-  name: "left abductor leg"
-  parent: BaseLeftLeg
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegAbductor
-  name: "right abductor leg"
-  parent: BaseRightLeg
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootAbductor
-  name: "left abductor foot"
-  parent: BaseLeftFoot
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootAbductor
-  name: "right abductor foot"
-  parent: BaseRightFoot
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml b/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml
deleted file mode 100644
index d48e2a2499b..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Monkey head for borging/transplanting pun pun
-- type: entity
-  parent: [BaseHead, PartAnimal] # WWDP
-  id: HeadAnimal
-  name: animal head
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: head_m
-
-- type: entity
-  abstract: true
-  parent: PartAnimal
-  id: BaseCarpPart
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Aliens/Carps/carp_parts.rsi
-
-- type: entity
-  categories: [ HideSpawnMenu ]
-  parent: BaseCarpPart
-  id: TailCarp
-  name: carp tail
-  description: Unique glands in this tail let space carp fly in a vacuum.
-  components:
-  - type: Sprite
-    layers:
-    - state: tail
-  - type: BodyPart
-    partType: Tail
-  - type: MovementBodyPart
-    walkSpeed: 2.5
-    sprintSpeed: 3.5
-  # TODO: Make it actually needed. Legs are hardcoded to be the only parts that matter for movement.
-  # TODO: space flight stuff
-
-- type: entity
-  categories: [ HideSpawnMenu ]
-  parent: BaseCarpPart
-  id: TorsoCarp
-  name: carp torso
-  components:
-  - type: Sprite
-    layers:
-    - state: torso
-  - type: BodyPart
-    partType: Torso
diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml b/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml
deleted file mode 100644
index 2cb4aec0cd4..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml
+++ /dev/null
@@ -1,201 +0,0 @@
-- type: entity
-  id: LeftArmCybernetic
-  parent: [PartIPC, BaseLeftArm]
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLArm
-  - type: GenerateChildPart
-    id: LeftHandCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_arm-combined"
-
-- type: entity
-  id: RightArmCybernetic
-  parent: [PartIPC, BaseRightArm]
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRArm
-  - type: GenerateChildPart
-    id: RightHandCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_arm-combined"
-
-- type: entity
-  id: LeftLegCybernetic
-  parent: [PartIPC, BaseLeftLeg]
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLLeg
-  - type: GenerateChildPart
-    id: LeftFootCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_leg-combined"
-
-- type: entity
-  id: RightLegCybernetic
-  parent: [PartIPC, BaseRightLeg]
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRLeg
-  - type: GenerateChildPart
-    id: RightFootCybernetic
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_leg-combined"
-
-- type: entity
-  id: LeftHandCybernetic
-  parent: [PartIPC, BaseLeftHand]
-  name: cybernetic left hand
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLHand
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandCybernetic
-  parent: [PartIPC, BaseRightHand]
-  name: cybernetic right hand
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRHand
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftFootCybernetic
-  parent: [PartIPC, BaseLeftFoot]
-  name: cybernetic left foot
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopLFoot
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootCybernetic
-  parent: [PartIPC, BaseRightFoot]
-  name: cybernetic right foot
-  components:
-  - type: Damageable
-    damageContainer: Silicon
-  - type: BodyPart
-    baseLayerId: MobCyberneticBishopRFoot
-  - type: Cybernetics
-  - type: Sprite
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_foot"
-
-- type: entity
-  parent: LeftArmCybernetic
-  id: JawsOfLifeLeftArm
-  name: J.W.L left arm
-  description: A cybernetic left arm with the ability to pry doors open.
-  components:
-  - type: BodyPart
-    onAdd:
-    - type: Prying
-      speedModifier: 1.5
-      pryPowered: true
-    - type: UseDelay # For insta prying
-      delay: 1
-
-- type: entity
-  parent: RightArmCybernetic
-  id: JawsOfLifeRightArm
-  name: J.W.L right arm
-  description: A cybernetic right arm with the ability to pry doors open.
-  components:
-  - type: BodyPart
-    onAdd:
-    - type: Prying
-      speedModifier: 1.5
-      pryPowered: true
-    - type: UseDelay # For insta prying
-      delay: 1
-
-- type: entity
-  parent: LeftLegCybernetic
-  id: SpeedLeftLeg
-  name: S.P.E.E.D left leg
-  description: A cybernetic left leg that allows its wearer to run faster.
-  components:
-  - type: MovementBodyPart
-    walkSpeed: 3.125
-    sprintSpeed: 5.625
-  - type: BodyPart
-    onAdd:
-    - type: ProtectedFromStepTriggers
-      whitelist:
-        types:
-        - Shard
-        - Mousetrap
-        - SlipEntity
-
-- type: entity
-  parent: RightLegCybernetic
-  id: SpeedRightLeg
-  name: S.P.E.E.D right leg
-  description: A cybernetic left leg that allows its wearer to run faster.
-  components:
-  - type: MovementBodyPart
-    walkSpeed: 3.125
-    sprintSpeed: 5.625
-  - type: BodyPart
-    onAdd:
-    - type: ProtectedFromStepTriggers
-      whitelist:
-        types:
-        - Shard
-        - Mousetrap
-        - SlipEntity
-
-- type: entity
-  parent: LeftArmCybernetic
-  id: CrowbarLeftArm
-  name: DX-1 left Pryarm
-  description: A cybernetic left arm that can easily pry open unpowered doors.
-  components:
-  - type: BodyPart
-    onAdd:
-    - type: Prying
-      speedModifier: 2
-
-- type: entity
-  parent: RightArmCybernetic
-  id: CrowbarRightArm
-  name: DX-1 right Pryarm
-  description: A cybernetic right arm that can easily pry open unpowered doors.
-  components:
-  - type: BodyPart
-    onAdd:
-    - type: Prying
-      speedModifier: 2
diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/generic.yml b/Resources/Prototypes/_Shitmed/Body/Parts/generic.yml
deleted file mode 100644
index 7c4f37ebdae..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Parts/generic.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-- 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.
-  components:
-  - type: BodyPart
-    children:
-      left hand:
-        id: "left hand"
-        type: Hand
-
-- 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.
-  components:
-  - type: BodyPart
-    children:
-      right hand:
-        id: "right hand"
-        type: Hand
-
-- 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.
-  components:
-  - type: BodyPart
-    children:
-      left foot:
-        id: "left foot"
-        type: Foot
-
-- 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.
-  components:
-  - type: BodyPart
-    children:
-      right foot:
-        id: "right foot"
-        type: Foot
-
-- 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.
-
-- type: entity
-  parent: HeadHuman
-  id: BioSynthHead
-  name: bio-synthetic head
-  description: This head can be transplanted into any living organism and it will adapt to its recipient.
-
-- type: entity
-  parent: TorsoHuman
-  id: BioSynthTorso
-  name: bio-synthetic torso
-  description: This torso can be transplanted into any living organism and it will adapt to its recipient.
-
-# JOKE ITEMS
-
-- type: entity
-  parent: LeftArmHuman
-  id: PizzaLeftArm
-  name: pizza left arm
-  description: For when you want to turn someone into a Space John's.
-  components:
-  - type: BodyPart
-    partType: Arm
-    symmetry: Left
-    toolName: "a left arm"
-    baseLayerId: MobPizzaLArm
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Misc/Pizza/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  parent: RightArmHuman
-  id: PizzaRightArm
-  name: pizza right arm
-  description: For when you want to turn someone into a Space John's.
-  components:
-  - type: BodyPart
-    partType: Arm
-    symmetry: Right
-    toolName: "a right arm"
-    baseLayerId: MobPizzaRArm
-  - type: Sprite
-    sprite: _Shitmed/Mobs/Species/Misc/Pizza/parts.rsi
-    state: "r_arm"
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/carp.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/carp.yml
deleted file mode 100644
index 81bf6a4bd5c..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/carp.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: body
-  id: Carp
-  name: carp
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - tail
-      organs:
-        lungs: OrganSpaceAnimalLungs # Immunity to airloss
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganSpaceAnimalHeart # Immunity to cold
-        kidneys: OrganAnimalKidneys
-    tail:
-      part: TailCarp
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/dragon.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/dragon.yml
deleted file mode 100644
index 85bd9ea92d8..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/dragon.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: body
-  id: SpaceDragon
-  name: "space dragon"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganDragonLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/goliath.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/goliath.yml
deleted file mode 100644
index e13737817c6..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/goliath.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: body
-  id: Goliath
-  name: "goliath"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganGoliathHeart # Allows you to use a slower version of their tentacles.
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/kobold.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/kobold.yml
deleted file mode 100644
index 6cf15dae081..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/kobold.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# Shitmed - this is just a copy of human body but with animal organs.
-- type: body
-  id: Kobold
-  name: "Kobold"
-  root: torso
-  slots:
-    head:
-      part: HeadKobold
-      connections:
-      - torso
-      organs:
-        brain: OrganAnimalBrain
-        eyes: OrganAnimalEyes
-    torso:
-      part: TorsoKobold
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganAnimalKidneys
-    right arm:
-      part: RightArmKobold
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmKobold
-      connections:
-      - left hand
-    right hand:
-      part: RightHandKobold
-    left hand:
-      part: LeftHandKobold
-    right leg:
-      part: RightLegKobold
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegKobold
-      connections:
-      - left foot
-    right foot:
-      part: RightFootKobold
-    left foot:
-      part: LeftFootKobold
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/laserraptor.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/laserraptor.yml
deleted file mode 100644
index 1015b932142..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/laserraptor.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: body
-  id: LaserRaptor
-  name: "space dragon"
-  root: torso
-  slots:
-    head:
-      part: HeadAnimal
-      organs:
-        eyes: OrganLaserEyes
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      - head
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganAnimalHeart
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/monkey.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/monkey.yml
deleted file mode 100644
index a34f3c3c42d..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/monkey.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# Shitmed - this is just a copy of human body but with animal organs.
-- type: body
-  id: Monkey
-  name: "Monkey"
-  root: torso
-  slots:
-    head:
-      part: HeadMonkey
-      connections:
-      - torso
-      organs:
-        brain: OrganAnimalBrain
-        eyes: OrganAnimalEyes
-    torso:
-      part: TorsoMonkey
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        heart: OrganAnimalHeart
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        kidneys: OrganAnimalKidneys
-    right arm:
-      part: RightArmMonkey
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmMonkey
-      connections:
-      - left hand
-    right hand:
-      part: RightHandMonkey
-    left hand:
-      part: LeftHandMonkey
-    right leg:
-      part: RightLegMonkey
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegMonkey
-      connections:
-      - left foot
-    right foot:
-      part: RightFootMonkey
-    left foot:
-      part: LeftFootMonkey
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/spacecobra.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/spacecobra.yml
deleted file mode 100644
index dfd98ca5303..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/spacecobra.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: body
-  id: SpaceCobra
-  name: "space cobra"
-  root: torso
-  slots:
-    torso:
-      part: TorsoAnimal
-      connections:
-      - legs
-      organs:
-        lungs: OrganAnimalLungs
-        stomach: OrganAnimalStomach
-        liver: OrganAnimalLiver
-        heart: OrganCobraHeart # Allows you to become invisible.
-        kidneys: OrganAnimalKidneys
-    legs:
-      part: LegsAnimal
-      connections:
-      - feet
-    feet:
-      part: FeetAnimal
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/abductor.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/abductor.yml
deleted file mode 100644
index 4551e4fc110..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/abductor.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- type: body
-  id: Abductor
-  name: Abductor
-  root: torso
-  slots:
-    head:
-      part: HeadAbductor
-      connections:
-      - torso
-      organs:
-        brain: OrganAbductorBrain
-        eyes: OrganAbductorEyes
-    torso:
-      part: TorsoAbductor
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      organs:
-        heart: OrganAbductorHeart
-        lungs: OrganAbductorLungs
-        stomach: OrganAbductorStomach
-        liver: OrganAbductorLiver
-        kidneys: OrganAbductorKidneys
-    right arm:
-      part: RightArmAbductor
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmAbductor
-      connections:
-      - left hand
-    right hand:
-      part: RightHandAbductor
-    left hand:
-      part: LeftHandAbductor
-    right leg:
-      part: RightLegAbductor
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegAbductor
-      connections:
-      - left foot
-    right foot:
-      part: RightFootAbductor
-    left foot:
-      part: LeftFootAbductor
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Body/Prototypes/silicon/siliconhand.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/silicon/siliconhand.yml
deleted file mode 100644
index c545a138075..00000000000
--- a/Resources/Prototypes/_Shitmed/Body/Prototypes/silicon/siliconhand.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# It's a silicon that has a hand. And nothing else.
-- type: body
-  id: SiliconHand
-  name: "Silicon"
-  root: right arm
-  slots:
-    right arm:
-      part: RightArmSiliconIndestructible
-      connections:
-      - right hand
-    right hand:
-      part: RightHandSiliconIndestructible
diff --git a/Resources/Prototypes/_Shitmed/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_Shitmed/Catalog/Fills/Backpacks/duffelbag.yml
deleted file mode 100644
index 65e5abe3a0c..00000000000
--- a/Resources/Prototypes/_Shitmed/Catalog/Fills/Backpacks/duffelbag.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  parent: ClothingBackpackDuffelAbductor
-  id: ClothingBackpackDuffelAbductorFilled
-  name: alien surgery duffel bag
-  description: An ordinary surgical duffel bag woven from a durable fiber.
-  components:
-  - type: StorageFill
-    contents:
-      - id: EnergyScalpelAbductor
-      - id: SearingToolAbductor
-      - id: MechanicalPinchesAbductor
-      - id: BoneManipulatorAbductor
diff --git a/Resources/Prototypes/_Shitmed/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_Shitmed/Catalog/Fills/Items/belt.yml
deleted file mode 100644
index b4256c37d96..00000000000
--- a/Resources/Prototypes/_Shitmed/Catalog/Fills/Items/belt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: entity
-  id: ClothingAbductorBeltFilled
-  parent: ClothingAbductorBelt
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - id: CrowbarAbductor
-      - id: WrenchAbductor
-      - id: ScrewdriverAbductor
-      - id: WirecutterAbductor
-      - id: WelderAbductor
-      - id: MultitoolAbductor
diff --git a/Resources/Prototypes/_Shitmed/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Shitmed/Clothing/Uniforms/jumpsuits.yml
deleted file mode 100644
index 25515ab8765..00000000000
--- a/Resources/Prototypes/_Shitmed/Clothing/Uniforms/jumpsuits.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  parent: UnsensoredClothingUniformBase
-  id: ClothingUniformJumpsuitAbductor
-  name: abductor uniform
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi
-  - type: Clothing
-    sprite: _Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi
diff --git a/Resources/Prototypes/_Shitmed/Damage/containers.yml b/Resources/Prototypes/_Shitmed/Damage/containers.yml
deleted file mode 100644
index ba9acfa34cf..00000000000
--- a/Resources/Prototypes/_Shitmed/Damage/containers.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Shitmed
-- type: damageContainer
-  id: OrganicPart
-  supportedGroups:
-    - Brute
-    - Burn
-
-- type: damageContainer
-  id: Organ
-  supportedGroups:
-    - OrganFailure
diff --git a/Resources/Prototypes/_Shitmed/Damage/groups.yml b/Resources/Prototypes/_Shitmed/Damage/groups.yml
deleted file mode 100644
index 02735159fe5..00000000000
--- a/Resources/Prototypes/_Shitmed/Damage/groups.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: damageGroup
-  id: OrganFailure
-  name: damage-group-organ-failure
-  damageTypes:
-    - Decay
-    - Trauma
diff --git a/Resources/Prototypes/_Shitmed/Damage/modifier_sets.yml b/Resources/Prototypes/_Shitmed/Damage/modifier_sets.yml
deleted file mode 100644
index 5992081ac13..00000000000
--- a/Resources/Prototypes/_Shitmed/Damage/modifier_sets.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: damageModifierSet
-  id: PartDamage
-  coefficients:
-    Blunt: 0.8
-    Slash: 1.2
-    Piercing: 0.5
-    Cold: 0.5
-    Heat: 0.8
-    Shock: 0.5
-
-- type: damageModifierSet
-  id: OrganDamage
-  coefficients:
-    Decay: 1.0
-    Trauma: 1.0
diff --git a/Resources/Prototypes/_Shitmed/Damage/types.yml b/Resources/Prototypes/_Shitmed/Damage/types.yml
deleted file mode 100644
index b468fe80de3..00000000000
--- a/Resources/Prototypes/_Shitmed/Damage/types.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Damage taken when the organ fails or is rotting.
-- type: damageType
-  id: Decay
-  name: damage-type-organ
-  armorCoefficientPrice: 1
-  armorFlatPrice: 1
-
-- type: damageType
-  id: Trauma
-  name: damage-type-trauma
-  armorCoefficientPrice: 1
-  armorFlatPrice: 1
diff --git a/Resources/Prototypes/_Shitmed/Datasets/Names/abductor.yml b/Resources/Prototypes/_Shitmed/Datasets/Names/abductor.yml
deleted file mode 100644
index e6a7daa3242..00000000000
--- a/Resources/Prototypes/_Shitmed/Datasets/Names/abductor.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-- type: dataset
-  id: AbductorNames
-  values:
-  - abductor-name-0
-  - abductor-name-1
-  - abductor-name-2
-  - abductor-name-3
-  - abductor-name-4
-  - abductor-name-5
-  - abductor-name-6
-  - abductor-name-7
-  - abductor-name-8
-  - abductor-name-9
-  - abductor-name-10
-  - abductor-name-11
-  - abductor-name-12
-  - abductor-name-13
-  - abductor-name-14
-  - abductor-name-15
-  - abductor-name-16
-  - abductor-name-17
-  - abductor-name-18
-  - abductor-name-19
-  - abductor-name-20
-  - abductor-name-21
-  - abductor-name-22
-  - abductor-name-23
-  - abductor-name-24
-  - abductor-name-25
-  - abductor-name-26
-  - abductor-name-27
-  - abductor-name-28
-  - abductor-name-29
-  - abductor-name-30
-  - abductor-name-31
-  - abductor-name-32
-  - abductor-name-33
-  - abductor-name-34
-  - abductor-name-35
-  - abductor-name-36
-  - abductor-name-37
-  - abductor-name-38
-  - abductor-name-39
-  - abductor-name-40
-  - abductor-name-41
-  - abductor-name-42
-  - abductor-name-43
-  - abductor-name-44
-
-- type: dataset
-  id: AbductorScientistPrefix
-  values:
-  - abductor-prefix-Dr
-  - abductor-prefix-Professor
-
-- type: dataset
-  id: AbductorAgentPrefix
-  values:
-  - abductor-prefix-Assistant
-  - abductor-prefix-Officer
diff --git a/Resources/Prototypes/_Shitmed/DeviceLinking/sink_ports.yml b/Resources/Prototypes/_Shitmed/DeviceLinking/sink_ports.yml
deleted file mode 100644
index be7ba7accf3..00000000000
--- a/Resources/Prototypes/_Shitmed/DeviceLinking/sink_ports.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: sinkPort
-  id: OperatingTableReceiver
-  name: signal-port-name-operating-table
-  description: signal-port-description-operating-table-receiver
diff --git a/Resources/Prototypes/_Shitmed/DeviceLinking/source_ports.yml b/Resources/Prototypes/_Shitmed/DeviceLinking/source_ports.yml
deleted file mode 100644
index 5c7f7445bd4..00000000000
--- a/Resources/Prototypes/_Shitmed/DeviceLinking/source_ports.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: sourcePort
-  id: OperatingTable
-  name: signal-port-name-operating-table
-  description: signal-port-description-operating-table-sender
-  defaultLinks: [ OperatingTableReceiver ]
diff --git a/Resources/Prototypes/_Shitmed/Entities/Clothing/Back/backpack.yml b/Resources/Prototypes/_Shitmed/Entities/Clothing/Back/backpack.yml
deleted file mode 100644
index ba3cb7981fa..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Clothing/Back/backpack.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
-  parent: ClothingBackpack
-  id: ClothingBackpackAbductor
-  name: alien backpack
-  description: An ordinary backpack woven from a durable fiber.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Clothing/Back/Backpacks/abductor.rsi
-  - type: ExplosionResistance
-    damageCoefficient: 0.1
diff --git a/Resources/Prototypes/_Shitmed/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_Shitmed/Entities/Clothing/Back/duffel.yml
deleted file mode 100644
index bd175d5f51f..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Clothing/Back/duffel.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: entity
-  parent: ClothingBackpackDuffel
-  id: ClothingBackpackDuffelAbductor
-  name: alien duffel bag
-  description: An ordinary duffel bag woven from a durable fiber.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Clothing/Back/Duffels/abductor.rsi
-  - type: ExplosionResistance
-    damageCoefficient: 0.1
-  - type: Storage
-    grid:
-    - 0,0,8,4
diff --git a/Resources/Prototypes/_Shitmed/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Shitmed/Entities/Clothing/Belt/belts.yml
deleted file mode 100644
index e69c7e0baaf..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Clothing/Belt/belts.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
-  parent: ClothingBeltUtility
-  id: ClothingAbductorBelt
-  name:  alien belt
-  description: Can hold various OUR things. # I was going to change this, but it's funny so it stays.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Clothing/Belt/abductor.rsi
-  - type: Clothing
-    sprite: _Shitmed/Clothing/Belt/abductor.rsi
diff --git a/Resources/Prototypes/_Shitmed/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_Shitmed/Entities/Clothing/Ears/headsets_alt.yml
deleted file mode 100644
index e547ff86b3f..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Clothing/Ears/headsets_alt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: entity
-  parent: ClothingHeadsetAlt
-  id: ClothingHeadsetAltAbductor
-  name: abductor over-ear headset
-  components:
-  - type: ContainerFill
-    containers:
-      key_slots:
-      - EncryptionKeyStationMaster
-  - type: Sprite
-    sprite: _Shitmed/Clothing/Ears/Headsets/abductor.rsi
-  - type: Clothing
-    sprite: _Shitmed/Clothing/Ears/Headsets/abductor.rsi
diff --git a/Resources/Prototypes/_Shitmed/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Shitmed/Entities/Clothing/Head/helmets.yml
deleted file mode 100644
index 824a363a292..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Clothing/Head/helmets.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: entity
-  id: ClothingHeadHelmetAbductor
-  parent: ClothingHeadHelmetBasic
-  name: alien helmet
-  description: Zeep Glorp!
-  components:
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.80
-        Slash: 0.80
-        Piercing: 0.80
-        Heat: 0.80
-        Radiation: 0.80
-        Caustic: 0.95
-  - type: Tag
-    tags:
-    - WhitelistChameleon
-  - type: HideLayerClothing
-    slots:
-    - HeadTop
-    - HeadSide
-  - type: ExplosionResistance
-    damageCoefficient: 0.75
-  - type: Sprite
-    sprite: _Shitmed/Clothing/Head/Helmets/abductor.rsi
-  - type: Clothing
-    sprite: _Shitmed/Clothing/Head/Helmets/abductor.rsi
-  - type: EyeProtection
diff --git a/Resources/Prototypes/_Shitmed/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Shitmed/Entities/Clothing/OuterClothing/armor.yml
deleted file mode 100644
index 3dc2f904c29..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Clothing/OuterClothing/armor.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-- type: entity
-  parent: [ ClothingOuterBase, AllowSuitStorageClothing ]
-  id: ClothingOuterArmorAbductor
-  name: agent vest
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Clothing/OuterClothing/Armor/abductor.rsi
-  - type: AbductorVest
-# DON'T FEEL LIKE DOIN THIS RIGHT NOW SORRY!!
-#  - type: ModifyDelayedKnockdown # Goobstation
-#    delayDelta: 2
-#    knockdownTimeDelta: -2
-  - type: ItemSwitch
-    state: stealth
-    states:
-      Stealth: !type:ItemSwitchState
-        verb: Stealth
-        hidden: true
-        sprite:
-          sprite: _Shitmed/Clothing/OuterClothing/Armor/abductor.rsi
-          state: icon
-        components:
-        - type: Armor
-          modifiers:
-            coefficients:
-              Blunt: 0.85
-              Slash: 0.85
-              Heat: 0.85
-              Piercing: 0.85
-              Radiation: 0.85
-              Caustic: 0.25
-        - type: ExplosionResistance
-          damageCoefficient: 0.85
-        - type: Clothing
-          sprite: _Shitmed/Clothing/OuterClothing/Armor/abductor.rsi
-          slots:
-          - outerClothing
-
-      Combat: !type:ItemSwitchState
-        verb: Combat
-        hidden: true
-        sprite:
-          sprite: _Shitmed/Clothing/OuterClothing/Armor/abductor.rsi
-          state: combat-icon
-        components:
-        - type: Armor
-          modifiers:
-            coefficients:
-              Blunt: 0.5
-              Slash: 0.5
-              Heat: 0.5
-              Piercing: 0.5
-              Radiation: 0.5
-              Caustic: 0.1
-        - type: StaminaDamageResistance
-          coefficient: 0.25
-        - type: ExplosionResistance
-          damageCoefficient: 0.5
-        - type: Clothing
-          sprite: _Shitmed/Clothing/OuterClothing/Armor/abductor.rsi
-          slots:
-          - outerClothing
-          equippedPrefix: combat
-
-- type: entity
-  parent: [ ClothingOuterStorageBase, AllowSuitStorageClothing ]
-  id: ClothingOuterCoatAbductor
-  name: alien lab coat
-  description: A suit of alien origin that protects from various injuries, as well as from chemical spills.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Clothing/OuterClothing/Coats/abductor.rsi
-  - type: Clothing
-    sprite: _Shitmed/Clothing/OuterClothing/Coats/abductor.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.85
-        Slash: 0.85
-        Heat: 0.85
-        Piercing: 0.85
-        Radiation: 0.85
-        Caustic: 0.25
-  - type: ExplosionResistance
-    damageCoefficient: 0.85
diff --git a/Resources/Prototypes/_Shitmed/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/_Shitmed/Entities/Debugging/debug_sweps.yml
deleted file mode 100644
index fa70fe7abb8..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Debugging/debug_sweps.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-- type: entity
-  name: bang severer
-  parent: BaseItem
-  id: MeleeDebugSever
-  description: sever yer parts a week from now
-  suffix: DEBUG
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/debug.rsi
-    state: icon
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 20000
-    clickPartDamageMultiplier: 10
-  - type: Item
-    size: Tiny
-    sprite: Objects/Weapons/Melee/debug.rsi
-
-- type: entity
-  name: bang severer 100dmg
-  parent: MeleeDebugSever
-  id: MeleeDebugSever100
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 100
-
-- type: entity
-  name: bang severer 200dmg
-  parent: MeleeDebugSever
-  id: MeleeDebugSever200
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 200
-
-- type: entity
-  name: bang burner
-  parent: BaseItem
-  id: MeleeDebugBurner
-  description: burn yer parts
-  suffix: DEBUG
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/debug.rsi
-    state: icon
-  - type: MeleeWeapon
-    damage:
-      types:
-        Heat: 20000
-    clickPartDamageMultiplier: 10
-  - type: Item
-    size: Tiny
-    sprite: Objects/Weapons/Melee/debug.rsi
-
-- type: entity
-  name: bang burner 200dmg
-  parent: MeleeDebugBurner
-  id: MeleeDebugBurner200
-  components:
-  - type: Tag
-    tags:
-      - Debug
-  - type: MeleeWeapon
-    damage:
-      types:
-        Heat: 200
diff --git a/Resources/Prototypes/_Shitmed/Entities/Effects/teleportation.yml b/Resources/Prototypes/_Shitmed/Entities/Effects/teleportation.yml
deleted file mode 100644
index 24ccda7dc65..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Effects/teleportation.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-- type: entity
-  id: EffectTeleportation
-  categories: [ HideSpawnMenu ]
-  name: teleportation
-  components:
-  - type: Transform
-    anchored: True
-  - type: Physics
-    bodyType: Static
-    canCollide: false
-  - type: Sprite
-    sprite: _Shitmed/Effects/teleportation.rsi
-    state: teleportation
-    scale: 0.65, 0.65
-    color: "#FD009899"
-  - type: TimedDespawn
-    lifetime: 5.0
-  # WD EDIT START
-  - type: PointLight
-    radius: 1.5
-    energy: 2
-    color: "#B069DB"
-  # WD EDIT END
-
-- type: entity
-  id: EffectTeleportationEntity
-  categories: [ HideSpawnMenu ]
-  name: teleportation
-  components:
-  - type: Physics
-    bodyType: Static
-    canCollide: false
-  - type: Sprite
-    sprite: _Shitmed/Effects/teleportation.rsi
-    state: teleportation-entity
-    scale: 0.65, 0.65
-    color: "#FD009899"
-  - type: TimedDespawn
-    lifetime: 5.0
-  # WD EDIT START
-  - type: PointLight
-    radius: 1.5
-    energy: 2
-    color: "#B069DB"
-  # WD EDIT END
diff --git a/Resources/Prototypes/_Shitmed/Entities/Markers/Spawners/Random/dubious.yml b/Resources/Prototypes/_Shitmed/Entities/Markers/Spawners/Random/dubious.yml
deleted file mode 100644
index 9aae53074f2..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Markers/Spawners/Random/dubious.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-- type: entityTable
-  id: DubiousOrgansTable
-  table: !type:GroupSelector
-    children:
-    # Not-so Annoying Organs Group - 50% chance
-    - !type:GroupSelector
-      weight: 50
-      children:
-      - id: OrganDubiousHealth
-     # - id: OrganDubiousInvisible
-      - id: OrganDubiousSpaceAdaptation
-      - id: OrganDubiousScrambleDna
-      - id: OrganDubiousScrambleLocation
-      - id: OrganDubiousArtifact
-    # Annoying/Disruptive Organs Group - 35% chance
-    - !type:GroupSelector
-      weight: 35
-      children:
-      - id: OrganDubiousShock
-      # - id: OrganDubiousGoliath
-      - id: OrganDubiousEMP
-      - id: OrganDubiousGravityWell
-      - id: OrganDubiousFlash
-      - id: OrganDubiousSmoke
-      - id: OrganDubiousGas
-    # Very Disruptive Organs Group - 15% chance
-    - !type:GroupSelector
-      weight: 15
-      children:
-      - id: OrganDubiousAA
-      - id: OrganDubiousSpiderEggs
-      - id: OrganDubiousSlimeEggs
-
-- type: entity
-  name: Dubious Organ Spawner
-  id: DubiousOrganSpawner
-  parent: MarkerBase
-  components:
-  - type: Sprite
-    layers:
-      - state: red
-      - sprite: _Shitmed/Mobs/Species/Misc/Dubious/organs.rsi
-        state: gland
-  - type: EntityTableSpawner
-    table: !type:NestedSelector
-      tableId: DubiousOrgansTable
diff --git a/Resources/Prototypes/_Shitmed/Entities/Mobs/Player/abductor.yml b/Resources/Prototypes/_Shitmed/Entities/Mobs/Player/abductor.yml
deleted file mode 100644
index e9d4b689336..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Mobs/Player/abductor.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-# Entity Prototypes
-
-- type: entity
-  parent: MobAbductor
-  id: MobAbductorAntag
-  abstract: true
-  components:
-  - type: Abductor
-  - type: ActionGrant
-    actions:
-      - ActionReturnToShip
-  - type: GhostRole
-    rules: abductors-ghost-role-rules
-    raffle:
-      settings: default
-  - type: GhostTakeoverAvailable
-  - type: NpcFactionMember
-    factions:
-      - SimpleHostile
-  - type: RandomMetadata
-    nameSegments:
-      - AbductorScientistPrefix
-      - AbductorNames
-  - type: Tag
-    tags:
-      - Abductor
-      - AbductorScientist
-      - CanPilot
-      - FootstepSound
-      - DoorBumpOpener
-  - type: SurgeryIgnoreClothing
-  - type: SurgerySpeedModifier
-    speedModifier: 5 # WWDP
-
-- type: entity
-  name: lone abductor
-  parent: MobAbductorAntag
-  id: MobLoneAbductor
-  components:
-  - type: GhostRole
-    name: abductor-lone-ghost-role-name
-    description: abductor-lone-ghost-role-desc
-    requirements:
-    - !type:CharacterOverallTimeRequirement
-      time: 18000 #5 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Medical
-      time: 7200 #2 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Security
-      time: 7200 #2 hours
-  - type: AbductorScientist
-  - type: SurgeryIgnoreClothing
-  - type: Sanitized
-  - type: SurgerySpeedModifier
-    speedModifier: 5 # WWDP
-  - type: Loadout
-    prototypes:
-      - LoneAbductorGear
-
-- type: entity
-  name: abductor scientist
-  parent: MobAbductorAntag
-  id: MobAbductorScientist
-  components:
-  - type: GhostRole
-    name: abductor-scientist-ghost-role-name
-    description: abductor-scientist-ghost-role-desc
-    requirements:
-    - !type:CharacterOverallTimeRequirement
-      time: 18000 #5 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Medical
-      time: 10800 #3 hours
-  - type: AbductorScientist
-  - type: SurgeryIgnoreClothing
-  - type: Sanitized
-  - type: SurgerySpeedModifier
-    speedModifier: 5 # WWDP
-  - type: Loadout
-    prototypes:
-      - AbductorScientistGear
-
-- type: entity
-  name: abductor agent
-  parent: MobAbductorAntag
-  id: MobAbductorAgent
-  components:
-  - type: GhostRole
-    name: abductor-agent-ghost-role-name
-    description: abductor-agent-ghost-role-desc
-    requirements:
-    - !type:CharacterOverallTimeRequirement
-      time: 18000 #5 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Security
-      time: 10800 #3 hours
-  - type: RandomMetadata
-    nameSegments:
-      - AbductorAgentPrefix
-      - AbductorNames
-  - type: Tag # Ignore AbductorScientist tag
-    tags:
-      - Abductor
-      - CanPilot
-      - FootstepSound
-      - DoorBumpOpener
-  - type: AbductorScientist # Should be removed when we have proper teleportation system
-  - type: Loadout
-    prototypes:
-      - AbductorAgentGear
-
-# Gearsets
-
-- type: startingGear
-  id: LoneAbductorGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitAbductor
-    ears: ClothingHeadsetAltAbductor
-    shoes: ClothingShoesBootsCombat
-    gloves: ClothingHandsGlovesCombat
-    head: ClothingHeadHelmetAbductor
-    outerClothing: ClothingOuterCoatAbductor
-    back: ClothingBackpackAbductor
-    pocket1: AbductorGizmo
-    pocket2: WeaponAlien
-    suitstorage: Wonderprod
-
-- type: startingGear
-  id: AbductorScientistGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitAbductor
-    ears: ClothingHeadsetAltAbductor
-    shoes: ClothingShoesBootsCombat
-    gloves: ClothingHandsGlovesCombat
-    head: ClothingHeadMirror
-    outerClothing: ClothingOuterCoatAbductor
-    back: ClothingBackpackDuffelAbductor
-    pocket1: AbductorGizmo
-    suitstorage: WeaponDecloner
-
-- type: startingGear
-  id: AbductorAgentGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitAbductor
-    ears: ClothingHeadsetAltAbductor
-    shoes: ClothingShoesBootsCombat
-    gloves: ClothingHandsGlovesCombat
-    head: ClothingHeadHelmetAbductor
-    outerClothing: ClothingOuterArmorAbductor
-    back: ClothingBackpackAbductor
-    pocket1: Silencer
-    pocket2: WeaponAlien
-    suitstorage: Wonderprod
-
-# Spawners
-
-- type: entity
-  name: lone abductor spawner
-  id: SpawnPointLoneAbductor
-  parent: MarkerBase
-  components:
-  - type: SpawnPoint
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: Structures/Wallmounts/signs.rsi
-        state: radiation
-
-- type: entity
-  categories: [ HideSpawnMenu, Spawner ]
-  parent: BaseAntagSpawner
-  id: LoneAbductorSpawner
-  components:
-  - type: GhostRole
-    name: abductor-lone-ghost-role-name
-    description: abductor-lone-ghost-role-desc
-    rules: abductors-ghost-role-rules
-    raffle:
-      settings: default
-    requirements:
-    - !type:CharacterOverallTimeRequirement
-      time: 18000 #5 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Medical
-      time: 7200 #2 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Security
-      time: 7200 #2 hours
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: Structures/Wallmounts/signs.rsi
-        state: radiation
-
-- type: entity
-  name: abductor agent spawner
-  id: SpawnPointAbductorAgent
-  parent: MarkerBase
-  components:
-  - type: SpawnPoint
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: Structures/Wallmounts/signs.rsi
-        state: radiation
-
-- type: entity
-  categories: [ HideSpawnMenu, Spawner ]
-  parent: BaseAntagSpawner
-  id: AbductorAgentSpawner
-  components:
-  - type: GhostRole
-    name: abductor-agent-ghost-role-name
-    description: abductor-agent-ghost-role-desc
-    rules: abductors-ghost-role-rules
-    raffle:
-      settings: default
-    requirements:
-    - !type:CharacterOverallTimeRequirement
-      time: 18000 #5 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Security
-      time: 10800 #3 hours
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: Structures/Wallmounts/signs.rsi
-        state: radiation
-
-- type: entity
-  name: abductor scientist spawner
-  id: SpawnPointAbductorScientist
-  parent: MarkerBase
-  components:
-  - type: SpawnPoint
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: Structures/Wallmounts/signs.rsi
-        state: radiation
-
-- type: entity
-  categories: [ HideSpawnMenu, Spawner ]
-  parent: BaseAntagSpawner
-  id: AbductorScientistSpawner
-  components:
-  - type: GhostRole
-    name: abductor-scientist-ghost-role-name
-    description: abductor-scientist-ghost-role-desc
-    rules: abductors-ghost-role-rules
-    raffle:
-      settings: default
-    requirements:
-    - !type:CharacterOverallTimeRequirement
-      time: 18000 #5 hours
-    - !type:CharacterDepartmentTimeRequirement
-      department: Medical
-      time: 10800 #3 hours
-  - type: Sprite
-    sprite: Markers/jobs.rsi
-    layers:
-      - state: green
-      - sprite: Structures/Wallmounts/signs.rsi
-        state: radiation
diff --git a/Resources/Prototypes/_Shitmed/Entities/Mobs/Species/abductor.yml b/Resources/Prototypes/_Shitmed/Entities/Mobs/Species/abductor.yml
deleted file mode 100644
index 755f0deff41..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Mobs/Species/abductor.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-- type: entity
-  save: false
-  name: Urist McAlien
-  parent:
-  - MobBloodstream
-  - MobFlammable
-  - BaseMobSpecies
-  id: MobAbductor
-  components:
-  - type: Absorbable # BLOOD FOR THE BLOOD GOD
-  - type: Psionic
-    removable: false
-    roller: false
-  - type: InnatePsionicPowers
-    powersToAdd:
-    - TelepathyPower
-    # no glorp accent for you.
-  - type: HumanoidAppearance
-    species: Abductor
-  - type: Icon
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: full
-  - type: Fingerprint
-  - type: Blindable
-  - type: Body
-    prototype: Abductor
-    requiredLegs: 2
-  - type: FireVisuals
-    alternateState: Standing
-  - type: Damageable
-    damageContainer: Biological
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
-  - type: DamageVisuals
-    damageOverlayGroups:
-      Brute:
-        sprite: Mobs/Effects/brute_damage.rsi
-        color: "#878787"
-      Burn:
-        sprite: Mobs/Effects/burn_damage.rsi
-  - type: PassiveDamage
-    allowedStates:
-    - Alive
-    damageCap: 40
-    damage:
-      types:
-        Heat: -0.14
-      groups:
-        Brute: -0.14
-  - type: Targeting
-  - type: SurgeryTarget
-  - type: Bloodstream
-    bloodReagent: AlienBlood
-  #EE changes
-  - type: LanguageSpeaker
-    currentLanguage: Xeeplian
-  - type: LanguageKnowledge
-    speaks:
-    - Xeeplian
-    understands:
-    - TauCetiBasic
-    - Xeeplian
-
-- type: entity
-  parent: BaseSpeciesDummy
-  id: MobAbductorDummy
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: HumanoidAppearance
-    species: Abductor
diff --git a/Resources/Prototypes/_Shitmed/Entities/Mobs/Species/primate.yml b/Resources/Prototypes/_Shitmed/Entities/Mobs/Species/primate.yml
deleted file mode 100644
index 4a351bd6e86..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Mobs/Species/primate.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-- type: entity
-  save: false
-  parent: BaseSpeciesDummy
-  id: MobMonkeyDummy
-  categories: [ HideSpawnMenu ]
-  description: A dummy monkey meant to be used in character setup.
-  components:
-  - type: Icon
-    sprite: Mobs/Animals/monkey.rsi
-    state: full
-  - type: Appearance
-  - type: HumanoidAppearance
-    species: Monkey
-  - type: Body
-    prototype: Monkey
-    requiredLegs: 2
-  - type: UserInterface
-    interfaces:
-      enum.HumanoidMarkingModifierKey.Key: # sure, this can go here too
-        type: HumanoidMarkingModifierBoundUserInterface
-
-- type: entity
-  save: false
-  parent: BaseSpeciesDummy
-  id: MobKoboldDummy
-  categories: [ HideSpawnMenu ]
-  description: A dummy kobold meant to be used in character setup.
-  components:
-  - type: Icon
-    sprite: Mobs/Animals/kobold.rsi
-    state: full
-  - type: Appearance
-  - type: HumanoidAppearance
-    species: Kobold
-  - type: Body
-    prototype: Kobold
-    requiredLegs: 2
-  - type: UserInterface
-    interfaces:
-      enum.HumanoidMarkingModifierKey.Key: # sure, this can go here too
-        type: HumanoidMarkingModifierBoundUserInterface
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Devices/Circuitboards/Machine/production.yml
deleted file mode 100644
index ca10b454fb0..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-- type: entity
-  parent: BaseMachineCircuitboard
-  id: AutodocCircuitboard
-  name: autodoc machine board
-  description: A machine printed circuit board for an autodoc.
-  components:
-  - type: MachineBoard
-    prototype: Autodoc
-    machinePartRequirements:
-      Manipulator: 4
-    stackRequirements:
-      Cable: 3
-      Steel: 10
-    tagRequirements:
-      BorgArm:
-        amount: 3
-        defaultPrototype: LeftArmBorg
-
-- type: entity
-  parent: AutodocCircuitboard
-  id: AutodocSyndieCircuitboard
-  suffix: Syndie
-  components:
-  - type: MachineBoard
-    prototype: AutodocSyndie
-
-# - type: entity
-#   parent: BaseMachineCircuitboard
-#   id: OperatingTableCircuitboard
-#   name: operating table machine board
-#   description: A machine printed circuit board for an operating table.
-#   components:
-#   - type: MachineBoard
-#     prototype: OperatingTable
-#     stackRequirements:
-#       Cable: 3
-#       Silver: 2
-#       Steel: 4
-
-- 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
-    machinePartRequirements:
-      MatterBin: 2
-      Manipulator: 2
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Misc/eggspider.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Misc/eggspider.yml
deleted file mode 100644
index b0cff6cd6db..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Misc/eggspider.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- type: entity
-  parent: EggSpider
-  id: EggSpiderFertilized
-  name: spider egg
-  description: Is it a gemstone? Is it an egg? It looks expensive.
-  components:
-  - type: Timer
-  - type: TimedSpawner
-    prototypes:
-    - MobGiantSpider
-    intervalSeconds: 60
-    minimumEntitiesSpawned: 1
-    maximumEntitiesSpawned: 1
-  - type: TimedDespawn 
-    lifetime: 61
-  - type: FactionException
-  - type: PettableFriend
-    successString: petting-success-spider-egg
-    failureString: petting-failure-spider-egg
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Misc/handcuffs.yml
deleted file mode 100644
index d905459de1b..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Misc/handcuffs.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: entity
-  name: wondercuffs
-  description: Made out of a metal more durable than anything Nanotrasen could dream of.
-  id: AbductorHandcuffs
-  parent: Handcuffs
-  components:
-  - type: Handcuff
-    cuffTime: 1.5
-    uncuffTime: 4.5
-    breakoutTime: 30
-    stunBonus: 1.0
-    cuffedRSI: _Shitmed/Objects/Misc/handcuffs.rsi
-    bodyIconState: body-overlay
-  - type: Sprite
-    sprite: _Shitmed/Objects/Misc/handcuffs.rsi
-    state: handcuff
-  - type: GuideHelp
-    guides:
-    - Abductors
-  - type: UseDelay
-    delay: 1.5
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Specific/Robotics/borg_modules.yml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/Projectiles/projectiles.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/Projectiles/projectiles.yml
deleted file mode 100644
index 0b0bd870e4f..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/Projectiles/projectiles.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-- type: entity
-  id: BaseBulletStarlight
-  name: BaseBullet
-  description: If you can see this you're probably dead!
-  abstract: true
-  components:
-  - type: Reflective
-  - type: FlyBySound
-  - type: Clickable
-  - type: Sprite
-    noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    layers:
-    - state: bullet
-      shader: unshaded
-  - type: Physics
-    bodyType: Dynamic
-    linearDamping: 0
-    angularDamping: 0
-  - type: Fixtures
-    fixtures:
-      projectile:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.1,-0.1,0.1,0.1"
-        hard: false
-        mask:
-        - Impassable
-        - BulletImpassable
-      fly-by: &flybyfixture
-        shape: !type:PhysShapeCircle
-          radius: 1.5
-        layer:
-        - Impassable
-        - MidImpassable
-        - HighImpassable
-        - LowImpassable
-        hard: False
-  - type: Projectile
-    impactEffect: BulletImpactEffect
-    damage:
-      types:
-        Piercing: 14
-    soundHit:
-      path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg
-  - type: TimedDespawn
-    lifetime: 10
-
-- type: entity
-  id: BulletDeclone
-  name: decloner bolt
-  parent: BaseBulletStarlight
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    layers:
-    - state: declone
-  - type: Projectile
-    damage:
-      types:
-        Radiation: 10
-        Cellular: 20
-        Shock: 10
-    soundHit:
-      collection: MeatLaserImpact
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
deleted file mode 100644
index 0346dbb42d8..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-- type: entity
-  parent: BaseWeaponBatterySmall
-  id: WeaponAlien
-  name: alien pistol
-  description: Is this a war crime? Probably.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Weapons/Guns/Battery/alien.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-unshaded-4
-      map: ["enum.GunVisualLayers.MagUnshaded"]
-      shader: unshaded
-  - type: ProjectileBatteryAmmoProvider
-    proto: BulletDisabler
-    fireCost: 50
-  - type: BatteryWeaponFireModes
-    fireModes:
-    - proto: BulletDisabler
-      fireCost: 50
-    - proto: BulletDeclone
-      fireCost: 100
-  - type: Battery
-    maxCharge: 500
-    startingCharge: 500
-  - type: MagazineVisuals
-    zeroVisible: true
-
-- type: entity
-  parent: [BaseWeaponBattery, BaseGunWieldable]
-  id: WeaponDecloner
-  name: decloner
-  description: Is this a war crime? Absolutely.
-  components:
-  - type: Clothing
-    sprite: _Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi
-  - type: Sprite
-    sprite: _Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-unshaded-4
-      map: ["enum.GunVisualLayers.MagUnshaded"]
-      shader: unshaded
-  - type: ProjectileBatteryAmmoProvider
-    proto: BulletDeclone
-    fireCost: 100
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Melee/silencer.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Melee/silencer.yml
deleted file mode 100644
index 8f71f6b74fd..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Melee/silencer.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-- type: entity
-  name: silencer
-  parent: BaseItem
-  id: Silencer
-  description: Tool for silencing humans.
-  components:
-  - type: Item
-    sprite: _Shitmed/Objects/Weapons/Melee/silencer.rsi
-    size: Small
-    storedRotation: -90
-  - type: Sprite
-    sprite: _Shitmed/Objects/Weapons/Melee/silencer.rsi
-    state: icon
-#  - type: RestrictByUserTag
-#    contains:
-#    - Abductor
-#    messages:
-#    - abductors-weapon-restricted-1
-#    - abductors-weapon-restricted-2
-#    - abductors-weapon-restricted-3
-#    - abductors-weapon-restricted-4
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    attackRate: 1
-    damage:
-      types:
-        Shock: 0
-    angle: 60
-    animation: WeaponArcThrust
-  - type: InjectOnHit
-    reagents:
-    - ReagentId: MuteToxin
-      Quantity: 5
-    limit: 10
diff --git a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Melee/wonderprod.yml b/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Melee/wonderprod.yml
deleted file mode 100644
index fd7721d2386..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Objects/Weapons/Melee/wonderprod.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-- type: entity
-  name: wonderprod
-  parent: BaseItem
-  id: Wonderprod
-  description: Universal tool of the abductor agent.
-  components:
-  - type: Item
-    sprite: _Shitmed/Objects/Weapons/Melee/wonderprod.rsi
-    size: Huge
-    storedRotation: -90
-  - type: Clothing
-    sprite: _Shitmed/Objects/Weapons/Melee/wonderprod.rsi
-    quickEquip: false
-    slots:
-    - Back
-    - suitStorage
-  - type: Sprite
-    sprite: _Shitmed/Objects/Weapons/Melee/wonderprod.rsi
-    state: icon
-  - type: GuideHelp
-    guides:
-    - Abductors
-#  - type: RestrictByUserTag
-#    contains:
-#    - Abductor
-#    messages:
-#    - abductors-weapon-restricted-1
-#    - abductors-weapon-restricted-2
-#    - abductors-weapon-restricted-3
-#    - abductors-weapon-restricted-4
-  - type: DisarmMalus
-  - type: ItemSwitch
-    state: stun
-    showLabel: true
-    states:
-      stun: !type:ItemSwitchState
-        verb: stun
-        sprite:
-          sprite: _Shitmed/Objects/Weapons/Melee/wonderprod.rsi
-          state: stun-icon
-        components:
-        - type: MeleeWeapon
-          wideAnimationRotation: -135
-          attackRate: 1.1
-          damage:
-            types:
-              Shock: 0
-          angle: 60
-          animation: WeaponArcThrust
-        - type: StaminaDamageOnHit
-          damage: 50
-          sound: /Audio/Weapons/Guns/Hits/taser_hit.ogg
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.250
-
-      cuffs: !type:ItemSwitchState
-        verb: cuffs
-        sprite:
-          sprite: _Shitmed/Objects/Weapons/Melee/wonderprod.rsi
-          state: cuffs-icon
-        components:
-        - type: MeleeWeapon
-          wideAnimationRotation: -135
-          attackRate: 1
-          damage:
-            types:
-              Shock: 0
-          angle: 60
-          animation: WeaponArcThrust
-        - type: CuffsOnHit
-          proto: Cablecuffs
-
-      sleep: !type:ItemSwitchState
-        verb: sleep
-        sprite:
-          sprite: _Shitmed/Objects/Weapons/Melee/wonderprod.rsi
-          state: sleep-icon
-        components:
-        - type: MeleeWeapon
-          wideAnimationRotation: -135
-          attackRate: 1
-          damage:
-            types:
-              Shock: 0
-          angle: 60
-          animation: WeaponArcThrust
-        - type: InjectOnHit
-          reagents:
-          - ReagentId: Nocturine
-            Quantity: 5
-          limit: 20
-          needsRestrain: true
-
-      damage: !type:ItemSwitchState
-        verb: damage
-        sprite:
-          sprite: _Shitmed/Objects/Weapons/Melee/wonderprod.rsi
-          state: damage-icon
-        components:
-        - type: MeleeWeapon
-          wideAnimationRotation: -135
-          attackRate: 0.75
-          angle: 60
-          animation: WeaponArcThrust
-          damage:
-            types:
-              Heat: 30
diff --git a/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/gizmo.yml b/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/gizmo.yml
deleted file mode 100644
index 75f09e17c2d..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/gizmo.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-- type: entity
-  id: AbductorGizmo
-  parent: BaseItem
-  name: gizmo
-  description: A device that inserts a nano tracker, which can be used to target a teleportation beam.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Misc/gizmo.rsi
-    state: icon
-  - type: Item
-    sprite: _Shitmed/Objects/Misc/gizmo.rsi
-  - type: RestrictByUserTag
-    contains:
-    - AbductorScientist
-    messages:
-    - abductors-gizmo-restricted
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    attackRate: 0.5
-    damage:
-      types:
-        Shock: 0
-    angle: 60
-    animation: WeaponArcThrust
-  - type: AbductorGizmo
-  - type: GuideHelp
-    guides:
-    - Abductors
diff --git a/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/surgery.yml b/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/surgery.yml
deleted file mode 100644
index 625cccb8b0a..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/surgery.yml
+++ /dev/null
@@ -1,135 +0,0 @@
-- type: entity
-  name: high-tech mechanical pinches
-  id: MechanicalPinchesAbductor
-  description: A highly advanced set of mechanical pinches, they seem to work like a hemostat and retractor.
-  parent: BaseToolSurgery
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi
-    state: abductor
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi
-    heldPrefix: abductor
-    storedRotation: 90
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 6.5
-        Heat: 1
-  - type: PhysicalComposition #Goobstation - Recycle update
-    materialComposition:
-      Steel: 150
-      Glass: 37
-      Silver: 37
-  - type: Hemostat
-    speed: 2
-  - type: Retractor
-    speed: 2
-  - type: Tweezers
-    speed: 2
-  - type: Tending
-    speed: 2
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech searing tool
-  description: A highly advanced cautery with an energy tip, it seems to also work as a drill.
-  id: SearingToolAbductor
-  parent: BaseToolSurgery
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/drill.rsi
-    state: abductor
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/drill.rsi
-    heldPrefix: abductor
-    storedRotation: 90
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/cautery1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/cautery2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Piercing: 10
-        Heat: 1
-  - type: PhysicalComposition #Goobstation - Recycle update
-    materialComposition:
-      Steel: 150
-      Glass: 37
-      Plasma: 37
-  - type: Drill
-    speed: 2
-  - type: Cautery
-    speed: 2
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech energy scalpel
-  description: A scalpel which uses an energy blade, it seems to also work as a saw.
-  id: EnergyScalpelAbductor
-  parent: BaseToolSurgery
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi
-    state: abductor
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi
-    heldPrefix: abductor
-    storedRotation: 90
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/scalpel2.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 10
-        Heat: 1
-  - type: PhysicalComposition #Goobstation - Recycle update
-    materialComposition:
-      Steel: 150
-      Glass: 37
-      Gold: 37
-  - type: Scalpel
-    speed: 2
-  - type: BoneSaw
-    speed: 2
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech bone manipulator
-  id: BoneManipulatorAbductor
-  description: A highly advanced tool, capable of mending bones.
-  parent: BaseToolSurgery
-  components:
-    - type: Sprite
-      sprite: _Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi
-      state: abductor
-    - type: Item
-      sprite: _Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi
-      heldPrefix: abductor
-      storedRotation: 90
-    - type: SurgeryTool
-      startSound:
-        path: /Audio/_Shitmed/Medical/Surgery/bone_setter.ogg
-    - type: BoneSetter
-      speed: 2
-    - type: BoneGel
-      speed: 2
-    - type: GuideHelp
-      guides:
-      - Abductors
diff --git a/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml b/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml
deleted file mode 100644
index ae4694c96bc..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml
+++ /dev/null
@@ -1,265 +0,0 @@
-# Abductor's Crowbar
-- type: entity
-  parent: Crowbar
-  id: CrowbarAbductor
-  name: high-tech crowbar
-  description: Made out of metal more durable than anything Nanotrasen could dream of.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Abductor/crowbar.rsi
-    state: abductor
-  - type: Tool
-    speedModifier: 2
-    qualities:
-      - Prying
-    useSound:
-      path: /Audio/Items/crowbar.ogg
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech wirecutter
-  parent: BaseItem
-  id: WirecutterAbductor
-  description: Cuts through wires like a hot knife through butter.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Abductor/wirecutters.rsi
-    state: abductor
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/wirecutter_drop.ogg
-  - type: Tag
-    tags:
-    - PlantSampleTaker
-    - Wirecutter
-  - type: MeleeWeapon
-    wideAnimationRotation: -90
-    damage:
-      types:
-        Piercing: 2
-    attackRate: 2
-    soundHit:
-      path: "/Audio/Items/wirecutter.ogg"
-  - type: Tool
-    qualities:
-      - Cutting
-    useSound:
-      path: /Audio/Items/wirecutter.ogg
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Abductor/wirecutters.rsi
-    storedRotation: -90
-  - type: ToolTileCompatible
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
-  - type: StaticPrice
-    price: 30
-  - type: Retractor
-    speed: 0.35
-  - type: Hemostat
-    speed: 0.6
-  - type: SurgeryTool
-    startSound:
-      path: /Audio/Items/wirecutter.ogg
-      params:
-        variation: 0.125
-    endSound:
-      path: /Audio/Items/wirecutter.ogg
-      params:
-        variation: 0.125
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech screwdriver
-  parent: BaseItem
-  id: ScrewdriverAbductor
-  description: More efficient than anything Nanotrasen could dream of. Not to be confused with a sonic screwdriver.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Abductor/screwdriver.rsi
-    state: abductor
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/screwdriver_drop.ogg
-  - type: Tag
-    tags:
-    - Screwdriver
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Abductor/screwdriver.rsi
-    storedRotation: -90
-  - type: MeleeWeapon
-    wideAnimationRotation: -90
-    attackRate: 1
-    damage:
-      types:
-        Piercing: 6
-    soundHit:
-      path: "/Audio/Weapons/bladeslice.ogg"
-  - type: Tool
-    qualities:
-      - Screwing
-    useSound:
-      collection: Screwdriver
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
-  - type: StaticPrice
-    price: 30
-  - type: Retractor
-    speed: 0.45
-  - type: Tending
-    speed: 0.65
-  - type: SurgeryTool
-    startSound:
-      collection: Screwdriver
-    endSound:
-      path: /Audio/_Shitmed/Medical/Surgery/retractor2.ogg
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech wrench
-  parent: Wrench
-  id: WrenchAbductor
-  description: Can take a bolt off in a single turn. Not intended for melee combat.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Abductor/wrench.rsi
-    state: abductor
-  - type: Item
-    sprite: _Shitmed/Objects/Specific/Abductor/wrench.rsi
-    storedRotation: 45
-    heldPrefix: abductor
-    storedSprite:
-      sprite: _Shitmed/Objects/Specific/Abductor/wrench.rsi
-      state: abductor
-  - type: Tool
-    speedModifier: 2
-    qualities:
-      - Anchoring
-    useSound:
-      path: /Audio/Items/ratchet.ogg
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech welding tool
-  parent: Welder
-  id: WelderAbductor
-  description: "A highly advanced welder capable of producing infinite fuel."
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Abductor/welder.rsi
-    state: abductor
-  - type: SolutionContainerManager
-    solutions:
-      Welder:
-        reagents:
-        - ReagentId: WeldingFuel
-          Quantity: 1000
-        maxVol: 1000
-  - type: PointLight
-    enabled: false
-    radius: 1.5
-    color: lightblue
-  - type: SolutionRegeneration
-    solution: Welder
-    generated:
-      reagents:
-      - ReagentId: WeldingFuel
-        Quantity: 10
-  - type: Tool
-    speedModifier: 2.0
-    useSound:
-      collection: Welder
-    qualities: Welding
-  - type: GuideHelp
-    guides:
-    - Abductors
-
-- type: entity
-  name: high-tech multitool
-  parent: BaseItem
-  id: MultitoolAbductor
-  description: A highly advanced hacking tool capable of viewing wire functionality. Can be used as Cryptographic sequencer in its alternate mode.
-  components:
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/multitool_drop.ogg
-  - type: Item
-    size: Small
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
-      Plastic: 100
-  - type: StaticPrice
-    price: 56
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Abductor/multitool.rsi
-    state: abductor
-    layers:
-      - state: abductor
-  - type: Clothing
-    sprite: _Shitmed/Objects/Specific/Abductor/multitool.rsi
-    quickEquip: false
-    slots:
-    - Belt
-  - type: GuideHelp
-    guides:
-    - Abductors
-  - type: UserInterface
-    interfaces:
-      enum.NetworkConfiguratorUiKey.List:
-        type: NetworkConfiguratorBoundUserInterface
-      enum.NetworkConfiguratorUiKey.Configure:
-        type: NetworkConfiguratorBoundUserInterface
-      enum.NetworkConfiguratorUiKey.Link:
-        type: NetworkConfiguratorBoundUserInterface
-  - type: Tag
-    tags:
-      - Multitool
-      - DoorElectronicsConfigurator
-      - ShowWires
-  - type: ItemSwitch
-    state: link
-    states:
-      link: !type:ItemSwitchState
-        verb: link
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Abductor/multitool.rsi
-          state: abductor
-        components:
-          - type: Tool
-            qualities:
-              - Pulsing
-          - type: NetworkConfigurator
-            showLabel: false
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.125
-            volume: -5
-
-      hijack: !type:ItemSwitchState
-        verb: hijack
-        sprite:
-          sprite: _Shitmed/Objects/Specific/Abductor/multitool.rsi
-          state: override-abductor
-        components:
-        - type: LimitedCharges
-          charges: 0
-        - type: AutoRecharge
-          rechargeDuration: 15
-        - type: Emag
-          emagType: Access
-        soundStateActivate:
-          collection: sparks
-          params:
-            variation: 0.125
-            volume: -5
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Computers/computers.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Computers/computers.yml
deleted file mode 100644
index d4461bc72d2..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Computers/computers.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-- type: entity
-  parent: BaseComputer
-  id: AbductorConsole
-  name: abductor console
-  description: A computer that is used for spying on the station.
-  components:
-  - type: AbductorConsole
-  - type: Sprite
-    sprite: _Shitmed/Structures/Machines/abductor_console.rsi
-    layers:
-    - map: ["console"]
-      state: console
-  - type: ActivatableUI
-    key: enum.AbductorConsoleUIKey.Key
-  - type: UserInterface
-    interfaces:
-     enum.AbductorConsoleUIKey.Key:
-        type: AbductorConsoleBui
-  - type: PointLight
-    enabled: true
-    radius: 1.5
-    energy: 1.6
-    color: "#FC0097"
-
-- type: entity
-  parent: ComputerComms
-  id: CentCommSectoralConsole
-  name: centcomm sectoral console
-  description: Use this to annoy captains of all stations at once.
-  components:
-    - type: AccessReader
-      access: [[ "Command" ]]
-    - type: CommunicationsConsole
-      title: comms-console-announcement-title-centcom
-      global: true
-
-- type: entity
-  parent: BaseComputer
-  id: AbductorHumanObservationConsole
-  name: human observation console
-  description: Use this to set teleporter destination or retrieve people marked by scientist tools. Also used for buying replacement gear and linking the agent's vest.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Structures/Machines/abductor_camera_console.rsi
-    layers:
-    - map: ["console"]
-      state: console
-  - type: AbductorHumanObservationConsole
-  - type: ActivatableUI
-    key: enum.AbductorCameraConsoleUIKey.Key
-  - type: UserInterface
-    interfaces:
-     enum.AbductorCameraConsoleUIKey.Key:
-        type: AbductorCameraConsoleBui
-  - type: PointLight
-    enabled: true
-    radius: 1.5
-    energy: 1.6
-    color: "#FC0097"
-
-- type: entity
-  parent:
-  - Incorporeal
-  - BaseMob
-  id: AbductorHumanObservationConsoleEye
-  name: abductor eye
-  description: The abductor's viewer.
-  categories: [ HideSpawnMenu ]
-  suffix: DO NOT MAP
-  components:
-  - type: NoFTL
-  - type: WarpPoint
-    follow: true
-  - type: Eye
-    pvsScale: 1.5
-  - type: Visibility
-    layer: 10
-  - type: Sprite
-    sprite: _Shitmed/Structures/Machines/abductor_camera_console.rsi
-    layers:
-    - state: eye
-      shader: unshaded
-  - type: Tag
-    tags:
-    - CantInteract
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Furniture/Tables/tables.yml
deleted file mode 100644
index e8b102c3926..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Furniture/Tables/tables.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: entity
-  id: AbductorOperatingTable
-  parent: OperatingTable
-  name: abductor operating table
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Structures/Furniture/Tables/abductor_optable.rsi
-    state: operating_table
-    noRot: true
-  - type: Icon
-    sprite: _Shitmed/Structures/Furniture/Tables/abductor_optable.rsi
-    state: operating_table
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/autodoc.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/autodoc.yml
deleted file mode 100644
index eca295c991e..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/autodoc.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-# Autodocs
-
-- type: entity
-  parent: [ConstructibleMachine, BaseMachinePowered]
-  id: Autodoc
-  name: Autodoc Mk.XIV
-  description: A programmable robotic surgeon capable of automatically operating on patients.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Structures/Machines/autodoc.rsi
-    layers:
-    - state: idle
-  - type: Hands
-  - type: HandsFill
-    hands:
-      multitool: OmnimedToolAutodoc
-      surgery_specific: null
-  - type: WiresPanel
-  - type: Wires
-    layoutId: Autodoc # do it, snip the safety wire :godo:
-    boardName: wires-board-name-autodoc
-  - type: Machine
-    board: AutodocCircuitboard
-  - type: Construction
-    graph: Machine
-    node: machine
-    containers:
-     - machine_board
-     - machine_parts
-     - storagebase
-  - type: EmptyOnMachineDeconstruct
-    containers:
-    - surgery_specific
-    - storagebase
-  - type: ContainerContainer
-    containers:
-      machine_board: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      machine_parts: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      storagebase: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-  - type: ApcPowerReceiver
-    powerLoad: 10000
-  - type: DeviceList
-  - type: DeviceNetwork
-    deviceNetId: Wired
-    receiveFrequencyId: BasicDevice
-  - type: DeviceLinkSink
-    ports:
-    - OperatingTableReceiver
-  - type: UserInterface
-    interfaces:
-      enum.AutodocUiKey.Key:
-        type: AutodocBoundUserInterface
-      enum.StorageUiKey.Key:
-        type: StorageBoundUserInterface
-      enum.WiresUiKey.Key:
-        type: WiresBoundUserInterface
-  - type: ActivatableUI
-    key: enum.AutodocUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: Autodoc
-  - type: Sanitized
-  - type: DoAfter # Required for it to do surgery
-  - type: TypingIndicator
-    proto: robot
-  - type: Speech
-    speechVerb: Robotic
-    speechSounds: Pai
-  - type: Storage
-    clickInsert: false # incredibly annoying
-    grid:
-    - 0,0,3,3
-  - type: SurgerySpeedModifier
-    speedModifier: 3 # on par with a surgeon using normal tools # WWDP surgery times
-  - type: GuideHelp
-    guides: [ Autodoc ]
-
-- type: entity
-  parent: Autodoc
-  id: AutodocSyndie
-  # TODO: make it valid
-  suffix: Syndie
-  components:
-  - type: Machine
-    board: AutodocSyndieCircuitboard
-  - type: SurgerySpeedModifier
-    speedModifier: 5 # as good as a surgeon using a multitool, nukies need it or something # WWDP surgery times
-
-# Autodoc tools
-
-- type: entity
-  parent: OmnimedTool
-  id: OmnimedToolAutodoc
-  suffix: Unremoveable
-  components:
-  - type: Unremoveable
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/lathe.yml
deleted file mode 100644
index 7df789d67ab..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/lathe.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-- type: entity
-  parent: BaseLathe
-  id: MedicalBiofabricator
-  name: medical biofabricator
-  description: Produces organs and other organic matter that can be surgically grafted onto patients with biomass.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/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
-    staticPacks:
-    - Biofabricatortatic
-  - type: EmagLatheRecipes
-    emagStaticPacks:
-    - SyndicateBiofabricatorStatic
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Specific/abductor_experimentator.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Specific/abductor_experimentator.yml
deleted file mode 100644
index c325992ab56..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Specific/abductor_experimentator.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-- type: entity
-  parent: BaseStructure
-  id: AbductorExperimentator
-  name: experimentator
-  description: A device that analyzes the result of the experiment and resets the subject to the place from where they were taken.
-  components:
-  - type: AbductorExperimentator
-  - type: Sprite
-    noRot: true
-    sprite: _Shitmed/Structures/abductor_experimentator.rsi
-    layers:
-    - state: experimentator_0
-      map: ["base"]
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
-  - type: DragInsertContainer
-    containerId: storage
-  - type: ExitContainerOnMove
-    containerId: storage
-  - type: ContainerContainer
-    containers:
-      storage: !type:ContainerSlot
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.AbductorExperimentatorVisuals.Full:
-        base:
-          True: { state: experimentator_1 }
-          False: { state: experimentator_0 }
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Specific/alien_pad.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Specific/alien_pad.yml
deleted file mode 100644
index 8a9d9c5e1e1..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Specific/alien_pad.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-- type: entity
-  id: AbductorAlienPad
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
-  name: alien pad
-  description: Beam in the inferior lifeforms and dig in.
-  components:
-  - type: AbductorAlienPad
-  - type: InteractionOutline
-  - type: Physics
-    bodyType: Static
-    canCollide: false
-  - type: Transform
-    anchored: true
-    noRot: true
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.00"
-        density: 190
-        mask:
-          - MachineMask
-  - type: Sprite
-    sprite: _Shitmed/Structures/abductor_alien_pad.rsi
-    drawdepth: FloorObjects
-    layers:
-    - state: offline
-      map: [ "enum.CargoTelepadLayers.Base" ]
-    - state: idle
-      map: [ "enum.CargoTelepadLayers.Beam" ]
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: Appearance
-  - type: CollideOnAnchor
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Tables/tables.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Tables/tables.yml
deleted file mode 100644
index acb0279b75b..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Tables/tables.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- type: entity
-  id: TableAbductor
-  parent: TableBase
-  name: alien table
-  description: Literally the sturdiest thing you have ever seen. # Peak. No changes needed.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Structures/Tables/abductor_table.rsi
-  - type: Icon
-    sprite: _Shitmed/Structures/Tables/abductor_table.rsi
-  - type: FootstepModifier
-    footstepSoundCollection:
-      collection: FootstepFloor
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Walls/walls.yml
deleted file mode 100644
index aac348e3c96..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Structures/Walls/walls.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-#shuttle walls
-- type: entity
-  id: WallAbductorDiagonal
-  name: shuttle wall
-  suffix: Diagonal
-  description: Keeps the air in and the bloodthirsty salvagers out.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wall
-  components:
-  - type: Transform
-    anchored: true
-  - type: Clickable
-  - type: Tag
-    tags:
-    - Wall
-  - type: Sprite
-    drawdepth: Walls
-    sprite: _Shitmed/Structures/Walls/abductor_diagonal.rsi
-    state: state0
-  - type: IconSmooth
-    mode: Diagonal
-    key: walls
-    base: state
-  - type: Icon
-    sprite: _Shitmed/Structures/Walls/abductor_diagonal.rsi
-    state: state0
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
-  - type: Physics
-    bodyType: Static
-  - type: Reflect
-    reflectProb: 1
-  - type: Pullable
-  - type: Airtight
-    noAirWhenFullyAirBlocked: false
-    airBlockedDirection:
-    - South
-    - East
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PolygonShape
-            vertices:
-            - "-0.5,-0.5"
-            - "0.5,0.5"
-            - "0.5,-0.5"
-        mask:
-        - FullTileMask
-        layer:
-        - WallLayer
-  - type: Construction
-    graph: Girder
-    node: diagonalshuttleWall
-
-- type: entity
-  parent: BaseWall
-  id: WallAbductor
-  name: shuttle wall
-  suffix: Reinforced, Exterior
-  description: Keeps the air in and the bloodthirsty salvagers out.
-  components:
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
-  - type: StaticPrice
-    price: 250
-  - type: RadiationBlocker
-    resistance: 5
-  - type: Sprite
-    sprite: _Shitmed/Structures/Walls/abductor.rsi
-  - type: Icon
-    sprite: _Shitmed/Structures/Walls/abductor.rsi
-    state: full
-  - type: Construction
-    graph: Girder
-    node: shuttleWall
-  - type: IconSmooth
-    key: walls
-    base: state
-  - type: Appearance
-  - type: Reflect
-    reflectProb: 1
diff --git a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgeries.yml b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgeries.yml
deleted file mode 100644
index a45e3a20fdd..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgeries.yml
+++ /dev/null
@@ -1,773 +0,0 @@
-- 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: SurgeryHasBodyCondition
-  - 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: 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: 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: SurgeryAttachHands
-  name: Attach Hands
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: hands
-    part: Hand
-
-- 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: 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: 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
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryAttachTail
-  name: Attach Tail
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepInsertFeature
-    - SurgeryStepSealWounds
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryPartRemovedCondition
-    connection: tail
-    part: Tail
-    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
-    slotId: brain
-
-- type: entity
-  parent: SurgeryRemoveBrain
-  id: SurgeryRemoveBrainTorso
-  name: Remove Brain
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryPartCondition
-    part: Torso
-
-- type: entity
-  parent: SurgeryRemoveBrainTorso
-  id: SurgeryRemovePosibrain
-  name: Remove Brain
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryOrganCondition
-    organ:
-    - type: BorgBrain
-    slotId: posibrain
-
-- 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
-    slotId: brain
-
-- type: entity
-  parent: SurgeryInsertBrain
-  id: SurgeryInsertBrainTorso
-  name: Insert Brain
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryPartCondition
-    part: Torso
-
-- type: entity
-  parent: SurgeryInsertBrainTorso
-  id: SurgeryInsertPosibrain
-  name: Insert Brain
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryOrganCondition
-    organ:
-    - type: BorgBrain
-    slotId: posibrain
-
-- type: entity
-  parent: SurgeryInsertBrainTorso
-  id: SurgeryInsertSlimeCore
-  name: Insert Brain
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryOrganCondition
-    slotId: core
-
-- 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
-    slotId: 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
-    slotId: heart
-
-- 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
-    slotId: 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
-    slotId: liver
-
-- 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
-    slotId: lungs
-
-- 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
-    slotId: lungs
-
-- 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
-    slotId: 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
-    slotId: stomach
-
-- 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
-    slotId: 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
-    slotId: eyes
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryLobotomize
-  name: Lobotomize
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepLobotomize
-    - SurgeryStepCloseIncision
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Brain
-    slotId: brain
-  - type: SurgeryOrganOnAddCondition
-    components:
-      brain:
-        - type: OhioAccent
-        - type: RatvarianLanguage
-        - type: Clumsy
-          gunShootFailDamage: # Placeholder values to be able to initialize the component
-            types:
-              Blunt: 0
-    inverse: true
-  - type: SurgeryPartCondition
-    part: Head
-
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryMendBrainTissue
-  name: Mend brain tissue
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenIncision
-    steps:
-    - SurgeryStepMendBrainTissue
-    - SurgeryStepCloseIncision
-  - type: SurgeryOrganCondition
-    organ:
-    - type: Brain
-    slotId: brain
-  - type: SurgeryOrganOnAddCondition
-    components:
-      brain:
-        - type: OhioAccent
-        - type: RatvarianLanguage
-        - type: Clumsy
-          gunShootFailDamage:
-            types:
-              Blunt: 0
-  - type: SurgeryPartCondition
-    part: Head
-
-# 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/_Shitmed/Entities/Surgery/surgery_steps.yml b/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml
deleted file mode 100644
index 7ae04b724ce..00000000000
--- a/Resources/Prototypes/_Shitmed/Entities/Surgery/surgery_steps.yml
+++ /dev/null
@@ -1,655 +0,0 @@
-- 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
-    duration: 10 # WWDP all durations are x5 longer, offset by SurgerySpeedModifier on professionals
-  - type: Sprite
-    sprite: _Shitmed/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
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.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
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi
-    state: retractor
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSawBones
-  name: Saw through bones
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: BoneSaw
-    add:
-    - type: RibcageSawed
-    duration: 20 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-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
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.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
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi
-    state: retractor
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepMendRibcage
-  name: Mend ribcage
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: BoneGel
-    remove:
-    - type: RibcageSawed
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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
-    duration: 30 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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
-    duration: 10 # WWDP
-  - type: SurgeryAffixPartStep
-  - type: Sprite
-    sprite: _Shitmed/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
-    duration: 20 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-saw
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepClampInternalBleeders
-  name: Clamp internal bleeders
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Hemostat
-    add:
-    - type: InternalBleedersClamped
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.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
-    duration: 40 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi
-    state: circular-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
-    duration: 15 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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: Tending
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryTendWoundsEffect
-    damage:
-      groups:
-        Brute: -10
-  - type: SurgeryRepeatableStep
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepRepairBurnTissue
-  name: Repair burnt tissue
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Tending
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryTendWoundsEffect
-    mainGroup: Burn
-    damage:
-      groups:
-        Burn: -10
-  - type: SurgeryRepeatableStep
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSealTendWound
-  name: Seal the wound
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Cautery
-    remove:
-    - type: IncisionOpen
-    duration: 10 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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
-    duration: 20 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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
-    duration: 20 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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: Tweezers
-    duration: 40 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryRemoveOrganStep
-  - type: SurgeryStepEmoteEffect
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepInsertOrgan
-  name: Add organ
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Organ
-    duration: 30 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/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: SurgeryStepInsertStomach
-  name: Add stomach
-  categories: [ HideSpawnMenu ]
-  # no effect its just for minmaxing metabolism
-
-- 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 ]
-
-- type: entity
-  parent: SurgeryStepInsertOrgan
-  id: SurgeryStepInsertHeart
-  name: Add heart
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgerySpecialDamageChangeEffect
-    damageType: Rot
-    isConsumable: true
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepSealOrganWound
-  name: Seal wounds
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Cautery
-    duration: 10 # WWDP
-  - type: SurgeryAffixOrganStep
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi
-    state: cautery
-  - type: SurgeryStepEmoteEffect
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Heat: -5
-    sleepModifier: 2
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepLobotomize
-  name: Lobotomize patient
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Drill
-    addOrganOnAdd:
-      brain:
-        - type: OhioAccent
-        - type: RatvarianLanguage
-        - type: Clumsy
-          gunShootFailDamage:
-            types:
-              Blunt: 5
-              Piercing: 4
-            groups:
-              Burn: 3
-    duration: 25 # WWDP
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/drill.rsi
-    state: drill
-  - type: SurgeryStepEmoteEffect
-  - type: SurgeryDamageChangeEffect
-    damage:
-      types:
-        Piercing: 10
-
-- type: entity
-  parent: SurgeryStepBase
-  id: SurgeryStepMendBrainTissue
-  name: Mend brain tissue
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SurgeryStep
-    tool:
-    - type: Hemostat
-    duration: 20 # WWDP
-    removeOrganOnAdd:
-      brain:
-        - type: OhioAccent
-        - type: RatvarianLanguage
-        - type: Clumsy
-          gunShootFailDamage:
-            types:
-              Blunt: 0
-  - type: Sprite
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi
-    state: hemostat
-  - type: SurgeryStepEmoteEffect
-
-# 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: _Shitmed/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: _Shitmed/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: _Shitmed/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: _Shitmed/Objects/Specific/Medical/Surgery/manipulation.rsi
-#    state: insertion
-
-#- type: entity
-#  parent: SurgeryStepBase
-#  id: SurgeryStepWingReconstruction
-#  name: Start wing reconstruction
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: SurgeryStep
-#    duration: 6 # On TG success chance is lower, so here the surgery slower
-#    tool:
-#    - type: Tending
-#  - type: ??? moth ops go here when wings can be destroyed
-#  - type: Sprite
-#    sprite: Interface/Emotes/chitter.png
diff --git a/Resources/Prototypes/_Shitmed/GameRules/events.yml b/Resources/Prototypes/_Shitmed/GameRules/events.yml
deleted file mode 100644
index 35cf6749419..00000000000
--- a/Resources/Prototypes/_Shitmed/GameRules/events.yml
+++ /dev/null
@@ -1,224 +0,0 @@
-- type: entity
-  parent: BaseGameRule
-  id: LoneAbductorSpawn
-  components:
-  - type: StationEvent
-    earliestStart: 15
-    reoccurrenceDelay: 45
-    weight: 7.5
-    minimumPlayers: 10
-    duration: 1
-  - type: RuleGrids
-  - type: LoadMapRule
-    mapPath: /Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle.yml # WD edit
-  - type: AntagObjectives
-    objectives:
-    - AbductObjective
-  - type: AntagLoadProfileRule
-    speciesOverride: Abductor
-    alwaysUseSpeciesOverride: true
-    allowProfileExtensions: false
-    allowAntagLoadouts: false
-  - type: AntagSelection
-    definitions:
-    - spawnerPrototype: LoneAbductorSpawner
-      min: 1
-      max: 1
-      pickPlayer: false
-      startingGear: LoneAbductorGear
-      briefing:
-        text: abductor-role-greeting
-        color: Green
-        sound: /Audio/_Shitmed/Misc/abductor.ogg
-      components:
-      - type: Abductor
-      - type: ActionGrant
-        actions:
-        - ActionReturnToShip
-      - type: GhostRole
-        name: abductor-lone-ghost-role-name
-        description: abductor-lone-ghost-role-desc
-        rules: abductors-ghost-role-rules
-        raffle:
-          settings: default
-        requirements:
-        - !type:CharacterOverallTimeRequirement
-          time: 18000 #5 hours
-        - !type:CharacterDepartmentTimeRequirement
-          department: Medical
-          time: 7200 #2 hours
-        - !type:CharacterDepartmentTimeRequirement
-          department: Security
-          time: 7200 #2 hours
-      - type: GhostTakeoverAvailable
-      - type: NpcFactionMember
-        factions:
-        - SimpleHostile
-      - type: RandomMetadata
-        nameSegments:
-        - AbductorScientistPrefix
-        - AbductorNames
-      - type: Tag
-        tags:
-        - Abductor
-        - AbductorScientist
-        - CanPilot
-        - FootstepSound
-        - DoorBumpOpener
-      - type: AbductorScientist
-      - type: SurgeryIgnoreClothing
-      - type: Sanitized
-      - type: SurgerySpeedModifier
-        speedModifier: 5 # WD EDIT: 1.5 -> 5
-      mindRoles:
-      - MindRoleLoneAbductor
-  - type: DynamicRuleCost # WD edit
-    cost: 15
-
-- type: entity
-  parent: BaseGameRule
-  id: AbductorVictim
-  components:
-  - type: AbductorVictimRule
-  - type: AntagSelection
-    definitions:
-    - mindRoles:
-      - MindRoleAbductorVictim
-      briefing:
-        text: abductor-victim-role-greeting
-        color: Red
-        sound: /Audio/_Shitmed/Misc/abducted.ogg
-  - type: AntagRandomObjectives
-    maxDifficulty: 1
-    sets:
-    - maxPicks: 1
-      groups: AbductorVictimObjectiveGroups
-
-- type: entity
-  parent: BaseGameRule
-  id: DuoAbductorSpawn
-  components:
-  - type: StationEvent
-    earliestStart: 15
-    reoccurrenceDelay: 45
-    weight: 7.5
-    minimumPlayers: 20
-    duration: 1
-  - type: RuleGrids
-  - type: LoadMapRule
-    mapPath: /Maps/_Shitmed/Shuttles/ShuttleEvent/duo_abductor_shuttle.yml
-  - type: AntagObjectives
-    objectives:
-    - AbductObjective
-  - type: AntagLoadProfileRule
-    speciesOverride: Abductor
-    alwaysUseSpeciesOverride: true
-    allowProfileExtensions: false
-    allowAntagLoadouts: false
-  - type: AntagSelection
-    definitions:
-    - spawnerPrototype: AbductorScientistSpawner
-      min: 1
-      max: 1
-      pickPlayer: false
-      startingGear: AbductorScientistGear
-      briefing:
-        text: abductor-role-greeting
-        color: Green
-        sound: /Audio/_Shitmed/Misc/abductor.ogg
-      components:
-      - type: Abductor
-      - type: Psionic
-        removable: false
-        roller: false
-      - type: InnatePsionicPowers
-        powersToAdd:
-        - TelepathyPower
-      - type: AbductorScientist
-      - type: SurgeryIgnoreClothing
-      - type: Sanitized
-      - type: SurgerySpeedModifier
-        speedModifier: 5 # WD EDIT: 1.5 -> 5
-      - type: ActionGrant
-        actions:
-        - ActionReturnToShip
-      - type: GhostRole
-        name: abductor-scientist-ghost-role-name
-        description: abductor-scientist-ghost-role-desc
-        rules: abductors-ghost-role-rules
-        raffle:
-          settings: default
-        requirements:
-        - !type:CharacterOverallTimeRequirement
-          time: 18000 #5 hours
-        - !type:CharacterDepartmentTimeRequirement
-          department: Medical
-          time: 10800 #3 hours
-      - type: GhostTakeoverAvailable
-      - type: NpcFactionMember
-        factions:
-        - SimpleHostile
-      - type: RandomMetadata
-        nameSegments:
-        - AbductorScientistPrefix
-        - AbductorNames
-      - type: Tag
-        tags:
-        - Abductor
-        - AbductorScientist
-        - CanPilot
-        - FootstepSound
-        - DoorBumpOpener
-      mindRoles:
-      - MindRoleLoneAbductor
-    - spawnerPrototype: AbductorAgentSpawner
-      min: 1
-      max: 1
-      pickPlayer: false
-      startingGear: AbductorAgentGear
-      briefing:
-        text: abductor-role-greeting
-        color: Green
-        sound: /Audio/_Shitmed/Misc/abductor.ogg
-      components:
-      - type: Abductor
-      - type: Psionic
-        removable: false
-        roller: false
-      - type: InnatePsionicPowers
-        powersToAdd:
-        - TelepathyPower
-      - type: ActionGrant
-        actions:
-        - ActionReturnToShip
-      - type: GhostRole
-        name: abductor-agent-ghost-role-name
-        description: abductor-agent-ghost-role-desc
-        rules: abductors-ghost-role-rules
-        raffle:
-          settings: default
-        requirements:
-        - !type:CharacterOverallTimeRequirement
-          time: 18000 #5 hours
-        - !type:CharacterDepartmentTimeRequirement
-          department: Security
-          time: 10800 #3 hours
-      - type: GhostTakeoverAvailable
-      - type: NpcFactionMember
-        factions:
-        - SimpleHostile
-      - type: RandomMetadata
-        nameSegments:
-        - AbductorAgentPrefix
-        - AbductorNames
-      - type: Tag
-        tags:
-        - Abductor
-        - CanPilot
-        - FootstepSound
-        - DoorBumpOpener
-      - type: AbductorScientist # Should be removed when we have proper teleportation system
-      mindRoles:
-      - MindRoleLoneAbductor
-  - type: DynamicRuleCost # WD edit
-    cost: 16
diff --git a/Resources/Prototypes/_Shitmed/Guidebook/antagonist.yml b/Resources/Prototypes/_Shitmed/Guidebook/antagonist.yml
deleted file mode 100644
index 3fc93637ea9..00000000000
--- a/Resources/Prototypes/_Shitmed/Guidebook/antagonist.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: guideEntry
-  id: Abductors
-  name: guide-entry-abductors
-  text: "/ServerInfo/_Shitmed/Guidebook/Antagonist/Abductors.xml"
diff --git a/Resources/Prototypes/_Shitmed/Guidebook/medical.yml b/Resources/Prototypes/_Shitmed/Guidebook/medical.yml
deleted file mode 100644
index 54fe6c283c9..00000000000
--- a/Resources/Prototypes/_Shitmed/Guidebook/medical.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- type: guideEntry
-  id: Surgery
-  name: guide-entry-surgery
-  text: "/ServerInfo/_Shitmed/Guidebook/Medical/Surgery.xml"
-  children:
-  - PartManipulation
-  - OrganManipulation
-  - UtilitySurgeries
-  - Autodoc
-
-- type: guideEntry
-  id: PartManipulation
-  name: guide-entry-partmanipulation
-  text: "/ServerInfo/_Shitmed/Guidebook/Medical/PartManipulation.xml"
-  filterEnabled: true
-
-- type: guideEntry
-  id: OrganManipulation
-  name: guide-entry-organmanipulation
-  text: "/ServerInfo/_Shitmed/Guidebook/Medical/OrganManipulation.xml"
-  filterEnabled: true
-
-- type: guideEntry
-  id: UtilitySurgeries
-  name: guide-entry-utilitysurgeries
-  text: "/ServerInfo/_Shitmed/Guidebook/Medical/UtilitySurgeries.xml"
-  filterEnabled: true
-
-- type: guideEntry
-  id: Autodoc
-  name: guide-entry-autodoc
-  text: "/ServerInfo/_Shitmed/Guidebook/Medical/Autodoc.xml"
diff --git a/Resources/Prototypes/_Shitmed/Objectives/ObjectiveGroups/abductor-victims.yml b/Resources/Prototypes/_Shitmed/Objectives/ObjectiveGroups/abductor-victims.yml
deleted file mode 100644
index ff155789bac..00000000000
--- a/Resources/Prototypes/_Shitmed/Objectives/ObjectiveGroups/abductor-victims.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-- type: weightedRandom
-  id: AbductorVictimObjectiveGroups
-  weights:
-    AbductorVictimObjectiveGroupHarmless: 0.75
-    AbductorVictimObjectiveGroupAnnoy: 0.20
-    AbductorVictimObjectiveGroupHarmful: 0.05
-
-- type: weightedRandom
-  id: AbductorVictimObjectiveGroupHarmless
-  weights:
-    AbductorVictimPaintObjective: 1
-    AbductorVictimPristine: 1
-    AbductorVictimCorpseCollector: 1
-    AbductorVictimBlingFloor: 1
-    AbductorVictimParaplegic: 1
-    AbductorVictimHungry: 1
-    AbductorVictimBlazeIt: 1
-    AbductorVictimVirtualInsanity: 1
-    AbductorVictimSocialExperiment: 1
-    AbductorVictimGame: 1
-    AbductorVictimSaveAnimals: 1
-    AbductorVictimMusic: 1
-    AbductorVictimNarrator: 1
-    AbductorVictimStalker: 1
-    AbductorVictimConspiracy: 1
-    AbductorVictimSixthsense: 1
-    AbductorVictimParty: 1
-    AbductorVictimDeadStationTheory: 1
-    AbductorVictimWeaknessOfMyFlesh: 1
-    AbductorVictimInstructor: 1
-    AbductorVictimActor: 1
-
-- type: weightedRandom
-  id: AbductorVictimObjectiveGroupAnnoy
-  weights:
-    AbductorVictimNations: 1
-    AbductorVictimPowerUnlimited: 1
-    AbductorVictimBuild: 1
-    AbductorVictimDefect: 1
-    AbductorVictimMonkeyTakeover: 1
-    AbductorVictimAverageFrontierPirate: 1
-    AbductorVictimNoClown: 1
-    AbductorVictimReplacePets: 1
-    AbductorVictimBald: 1
-
-- type: weightedRandom
-  id: AbductorVictimObjectiveGroupHarmful
-  weights:
-    AbductorVictimNoWalls: 1
-    AbductorVictimAbductception: 1
-    AbductorVictimNoOxygen: 1
-    AbductorVictimEscapeStation: 1
-    AbductorVictimNoCloning: 1
-    AbductorVictimStealWeapons: 1
-    AbductorVictimDismantleComputers: 1
-    AbductorVictimFinality: 1
-    # no heretics... yet
-    # AbductorVictimHeretic: 0.01
diff --git a/Resources/Prototypes/_Shitmed/Objectives/abductors.yml b/Resources/Prototypes/_Shitmed/Objectives/abductors.yml
deleted file mode 100644
index 7245883b123..00000000000
--- a/Resources/Prototypes/_Shitmed/Objectives/abductors.yml
+++ /dev/null
@@ -1,482 +0,0 @@
-- type: entity
-  abstract: true
-  parent: BaseObjective
-  id: BaseAbductorObjective
-  components:
-  - type: Objective
-    difficulty: 1.5
-    issuer: objective-issuer-abductors
-  - type: RoleRequirement
-    roles:
-      mindRoles:
-      - Abductor
-
-- type: entity
-  parent: BaseAbductorObjective
-  id: AbductObjective
-  components:
-  - type: Objective
-    icon:
-      sprite: _Shitmed/Mobs/Species/Misc/Dubious/organs.rsi
-      state: gland
-  - type: NumberObjective
-    min: 6
-    max: 9
-    title: objective-condition-abduct-title
-    description: objective-condition-abduct-description
-  - type: AbductCondition
-
-- type: entity
-  parent: BaseObjective
-  id: BaseAbductorVictimObjective
-  abstract: true
-  components:
-  - type: Objective
-    difficulty: 1
-    issuer: objective-issuer-voices
-  - type: RoleplayObjective
-  - type: RoleRequirement
-    roles:
-      mindRoles:
-      - AbductorVictim
-
-# Harmless Objectives
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimPaintObjective
-  name: Paint the station.
-  description: The station is hideous. You must color it all!
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Fun/crayons.rsi
-      state: rainbow
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimPristine
-  name: Ensure the station is pristine.
-  description: The CEO of Nanotrasen is coming! Ensure the station is in absolutely pristine condition.
-  components:
-  - type: Objective
-    icon:
-      sprite: Clothing/Head/Hats/comcap.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimBlingFloor
-  name: Replace the floor.
-  description: Replace all the floor tiles with wood, carpeting, grass or bling.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Tiles/tile.rsi
-      state: carpet-blue
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimCorpseCollector
-  name: Collect dead corpses.
-  description: Start a collection of corpses. Don't kill people to get these corpses.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
-      state: bag
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimParaplegic
-  name: Paraplegic.
-  description: Convince the crew that you are paraplegic.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
-      state: bag
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimHungry
-  name: Sate your hunger.
-  description: You are hungry. Eat as much food as you can find.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Consumable/Food/meat.rsi
-      state: plain-cooked
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimBlazeIt
-  name: Chemically improve your body.
-  description: Your body must be improved. Ingest as many drugs as you can.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Specific/Hydroponics/cannabis.rsi
-      state: produce
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimSocialExperiment
-  name: It's all a lie.
-  description: This is a secret social experiment conducted by Nanotrasen. Convince the crew that this is the truth.
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Wallmounts/camera.rsi
-      state: cameracase
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimVirtualInsanity
-  name: NOTHING IS REAL.
-  description: It's all an entirely virtual simulation within an underground vault. Convince the crew to escape the shackles of VR.
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Machines/computers.rsi
-      state: avionics-systems
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimGame
-  name: Chat is this real?
-  description: Convince the crew that we are in a game, without explicitly telling them we are in a game.
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Machines/arcade.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimSaveAnimals
-  name: Save the animals.
-  description: Nanotrasen is abusing the animals! Save as many as you can!
-  components:
-  - type: Objective
-    icon:
-      sprite: Mobs/Animals/monkey.rsi
-      state: full
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimMusic
-  name: Share your music.
-  description: You burn with passion for music. Share your vision. If anyone hates it, beat them on the head with your instrument!
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Fun/Instruments/guitar.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimStalker
-  name: Stalk the crew.
-  description: Someone hired you to compile dossiers on all important members of the crew. Be sure they don't know you're doing it.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Misc/bureaucracy.rsi
-      state: folder-colormap
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimConspiracy
-  name: The conspiracy.
-  description: The leaders of this station are hiding a grand, evil conspiracy. Only you can learn what it is, and expose it to the people!
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Wallmounts/camera.rsi
-      state: cameracase
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimNarrator
-  name: Narrate the story.
-  description: You're the narrator of this tale. Follow around the protagonists to tell their story.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Misc/books.rsi
-      state: book_icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimSixthsense
-  name: Are you really alive?
-  description: You died back there and went to heaven... or is it hell? No one here seems to know they're dead. Convince them, and maybe you can escape this limbo.
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Storage/Crates/coffin.rsi
-      state: base
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimParty
-  name: PARTY!
-  description: You NEED to throw a huge rager. Make it as awesome as possible so the whole crew comes... OR ELSE!
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Consumable/Drinks/beer.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimDeadStationTheory
-  name: Only one other person exists.
-  description: There is only one other person in existence, they are just really good at pretending to be multiple people.
-  components:
-  - type: Objective
-    icon:
-      sprite: Mobs/Species/Human/parts.rsi
-      state: full
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimWeaknessOfMyFlesh
-  name: The flesh is rotting.
-  description: Your flesh is rotting from your body. Fight the inevitable, and replace your tainted limbs with entirely new ones.
-  components:
-  - type: Objective
-    icon:
-      sprite: _Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi
-      state: scalpel
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimInstructor
-  name: Military instructor.
-  description: You are a military instructor. You must make sure the crew is in top shape for the war against the syndicate!
-  components:
-  - type: Objective
-    icon:
-      sprite: _Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi
-      state: scalpel
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimActor
-  name: Action movie.
-  description: You are in an action movie. You must say as many cheesy one-liners as possible.
-  components:
-  - type: Objective
-    icon:
-      sprite: Clothing/Eyes/Glasses/sunglasses.rsi
-      state: icon
-
-# Annoying Objectives
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimNations
-  name: Make your department prosper.
-  description: Ensure your department prospers over all else.
-  components:
-  - type: Objective
-    icon:
-      sprite: Clothing/Neck/Medals/gold.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimPowerUnlimited
-  name: Unlimited power.
-  description: Flood the station's powernet with as much electricity as you can.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Power/power_cells.rsi
-      state: antique
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimBuild
-  name: Expand the station.
-  description: The station is too tiny, and you're going to fix that.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Tools/rcd.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimDefect
-  name: Defect from the station.
-  description: Fuck the system! Defect from the station and start an independent colony in space, Mining Outpost or the derelict. Recruit crewmates if you can.
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Shuttles/gyroscope.rsi
-      state: base
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimMonkeyTakeover
-  name: Raise an army of monkeys.
-  description: OOK OOK AAH!!!
-  components:
-  - type: Objective
-    icon:
-      sprite: Mobs/Animals/monkey.rsi
-      state: full
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimAverageFrontierPirate
-  name: Steal shoes.
-  description: Steal as many shoes as you can.
-  components:
-  - type: Objective
-    icon:
-      sprite: Clothing/Shoes/color.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimNoClown
-  name: The clown is not funny.
-  description: The clown is not funny. You can do better! Take over their role and make the crew laugh!
-  components:
-  - type: Objective
-    icon:
-      sprite: Clothing/Mask/clown.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimReplacePets
-  name: Replace the pets.
-  description: All the pets around here suck. You need to make them cooler. Replace them with exotic beasts!
-  components:
-  - type: Objective
-    icon:
-      sprite: Mobs/Animals/snake.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimBald
-  name: Save people from the hair invasion.
-  description: There are alien parasites masquerading as people's hair. Save people from this invasion.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Tools/scissors.rsi
-      state: icon
-
-# Harmful Objectives
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimNoWalls
-  name: Break down the walls.
-  description: The crew must get to know one another better. Break down the walls inside the station!
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Walls/solid.rsi
-      state: rgeneric
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimAbductception
-  name: Take revenge.
-  description: You have been changed forever. Find the aliens that did this to you and give them a taste of their own medicine.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Weapons/Melee/baseball_bat.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimNoOxygen
-  name: OXYGEN IS KILLING EVERYONE.
-  description: The oxygen is killing them all and they don't even know it. Make sure no oxygen is on the station.
-  components:
-  - type: NotJobRequirement
-    job: AtmosphericTechnician # It would be too free for atmos techs :) CE is fair game though.
-  - type: Objective
-    icon:
-      sprite: Objects/Tanks/oxygen.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimEscapeStation
-  name: Escape the station.
-  description: You must escape the station! Get the shuttle called!
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Furniture/chairs.rsi
-      state: shuttle
-  - type: EscapeShuttleCondition
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimNoCloning
-  name: No cloning.
-  description: Don't allow anyone to be cloned.
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Machines/cloning.rsi
-      state: pod_g
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimStealWeapons
-  name: Steal weapons.
-  description: Steal as many weapons as you can fit on your person.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Weapons/Melee/baseball_bat.rsi
-      state: icon
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimDismantleComputers
-  name: Steal computers.
-  description: The 7G waves coming off from the computers are killing the crew and they dont know it! Dismantle them!
-  components:
-  - type: Objective
-    icon:
-      sprite: Structures/Machines/computers.rsi
-      state: avionics-systems
-
-- type: entity
-  parent: BaseAbductorVictimObjective
-  id: AbductorVictimFinality
-  name: No revival.
-  description: Death should be final and modern medicine disrupts the natural order. Don't allow anyone to be revived.
-  components:
-  - type: Objective
-    icon:
-      sprite: Objects/Specific/Medical/defib.rsi
-      state: icon
-
-# no heretics... yet
-# - type: entity
-#  parent: BaseAbductorVictimObjective
-#  id: AbductorVictimHeretic
-#  name: THE GATES HAVE OPENED MY MIND IS OPEN MY MIND IS OPEN MY MIND IS OPEN
-#  description: You see you see what they cannot you see the open door you seeE you SEeEe you SEe yOU seEee SHOW THEM ALL.
-#  components:
-#  - type: ForceHereticObjective
-#  - type: Objective
-#    icon:
-#      sprite: _Goobstation/Heretic/mansus_grasp.rsi
-#      state: icon
-
diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/electronics.yml
deleted file mode 100644
index db1e68280b5..00000000000
--- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/electronics.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- type: latheRecipe
-  id: AutodocCircuitboard
-  result: AutodocCircuitboard
-  category: Circuitry
-  completetime: 4
-  materials:
-     Steel: 100
-     Glass: 500
-     Gold: 100
-
-# - type: latheRecipe
-#   id: OperatingTableCircuitboard
-#   result: OperatingTableCircuitboard
-#   category: Circuitry
-#   completetime: 4
-#   materials:
-#      Steel: 100
-#      Glass: 500
-#      Gold: 100
diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/medical.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/medical.yml
deleted file mode 100644
index fc1665cbaed..00000000000
--- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/medical.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Shitmed Recipes
-
-- type: latheRecipe
-  id: BoneGel
-  result: BoneGel
-  completetime: 2
-  materials:
-    Plastic: 200
-    Plasma: 200
-
-- type: latheRecipe
-  id: MedicalCyberneticEyes
-  result: MedicalCyberneticEyes
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: EnergyScalpel
-  result: EnergyScalpel
-  completetime: 2
-  materials:
-    Steel: 600
-    Glass: 150
-    Gold: 150
-
-- type: latheRecipe
-  id: AdvancedRetractor
-  result: AdvancedRetractor
-  completetime: 2
-  materials:
-    Steel: 600
-    Glass: 150
-    Silver: 150
-
-- type: latheRecipe
-  id: EnergyCautery
-  result: EnergyCautery
-  completetime: 2
-  materials:
-    Steel: 600
-    Glass: 150
-    Plasma: 150
-
-- type: latheRecipe
-  id: OmnimedTool
-  result: OmnimedTool
-  completetime: 2
-  materials:
-    Steel: 1200
-    Glass: 300
-    Gold: 300
-    Silver: 300
-    Plasma: 300
diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/rehydrateable.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/rehydrateable.yml
deleted file mode 100644
index c5ce26b0038..00000000000
--- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/rehydrateable.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-- 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
-
-- type: latheRecipe
-  id: PizzaLeftArm
-  result: PizzaLeftArm
-  completetime: 30
-  materials:
-    Biomass: 5
-
-- type: latheRecipe
-  id: PizzaRightArm
-  result: PizzaRightArm
-  completetime: 30
-  materials:
-    Biomass: 5
-
-- type: latheRecipe
-  id: SynthHead
-  result: BioSynthHead
-  completetime: 60
-  materials:
-    Biomass: 30
-
-- type: latheRecipe
-  id: SynthTorso
-  result: MobSynthHuman
-  completetime: 120
-  materials:
-    Biomass: 60
-
-- type: latheRecipe
-  id: SpaceLungsAnimal
-  result: OrganSpaceAnimalLungs
-  completetime: 60
-  materials:
-    Biomass: 20
-
-- type: latheRecipe
-  id: SpaceHeartAnimal
-  result: OrganSpaceAnimalHeart
-  completetime: 60
-  materials:
-    Biomass: 20
-
-- type: latheRecipe
-  id: SpaceLungsDragon
-  result: OrganDragonLungs
-  completetime: 60
-  materials:
-    Biomass: 20
-
-- type: latheRecipe
-  id: SpaceEyesLaser
-  result: OrganLaserEyes
-  completetime: 60
-  materials:
-    Biomass: 20
-
-- type: latheRecipe
-  id: SpaceHeartCobra
-  result: OrganCobraHeart
-  completetime: 60
-  materials:
-    Biomass: 20
diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml
deleted file mode 100644
index 8481e62a713..00000000000
--- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml
+++ /dev/null
@@ -1,223 +0,0 @@
-- type: latheRecipe
-  abstract: true
-  id: BaseIPCLimbRecipe
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  abstract: true
-  id: BaseIPCOrganRecipe
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plasma: 100
-    Plastic: 100
-
-- type: latheRecipe
-  id: TorsoIPC
-  result: TorsoIPC
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 3000
-    Gold: 500
-    Plastic: 500
-    Plasma: 500
-
-# Generic
-
-- type: latheRecipe
-  id: LeftArmIPC
-  result: LeftArmIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: RightArmIPC
-  result: RightArmIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: LeftHandIPC
-  result: LeftHandIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: RightHandIPC
-  result: RightHandIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: LeftLegIPC
-  result: LeftLegIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: RightLegIPC
-  result: RightLegIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: LeftFootIPC
-  result: LeftFootIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: RightFootIPC
-  result: RightFootIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: HeadIPC
-  result: HeadIPC
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: OrganIPCEyes
-  result: OrganIPCEyes
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: OrganIPCPump
-  result: OrganIPCPump
-  category: Robotics
-  completetime: 2
-  materials:
-    Steel: 250
-    Plastic: 100
-    Glass: 250
-
-- type: latheRecipe
-  id: BorgModuleSurgery
-  result: BorgModuleSurgery
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 250
-    Glass: 250
-    Plastic: 250
-
-- type: latheRecipe
-  id: BorgModuleAdvancedSurgery
-  result: BorgModuleAdvancedSurgery
-  category: Robotics
-  completetime: 3
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 250
-    Gold: 50
-
-- type: latheRecipe
-  id: JawsOfLifeLeftArm
-  result: JawsOfLifeLeftArm
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: JawsOfLifeRightArm
-  result: JawsOfLifeRightArm
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: SpeedLeftLeg
-  result: SpeedLeftLeg
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: SpeedRightLeg
-  result: SpeedRightLeg
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
-
-- type: latheRecipe
-  id: BasicCyberneticEyes
-  result: BasicCyberneticEyes
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/security.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/security.yml
deleted file mode 100644
index 3367add7e91..00000000000
--- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/security.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: latheRecipe
-  id: SecurityCyberneticEyes
-  result: SecurityCyberneticEyes
-  category: Robotics
-  completetime: 5
-  materials:
-    Steel: 1000
-    Glass: 500
-    Plastic: 500
-    Gold: 300
-    Silver: 300
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml b/Resources/Prototypes/_Shitmed/Research/civilianservices.yml
deleted file mode 100644
index 98a7da253d0..00000000000
--- a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-# Tier 1
-
-# Tier 2
-
-- type: technology
-  id: AdvancedTreatment
-  name: research-technology-advanced-treatment
-  icon:
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi
-    state: e-scalpel-on
-  discipline: CivilianServices
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - BorgModuleAdvancedTreatment
-  - BorgModuleDefibrillator
-  - EnergyScalpel
-  - EnergyCautery
-  - AdvancedRetractor
-  - BorgModuleAdvancedSurgery
-
-- type: technology
-  id: CyberneticEnhancements
-  name: research-technology-cybernetic-enhancements
-  icon:
-    sprite: Mobs/Species/IPC/organs.rsi
-    state: eyes
-  discipline: CivilianServices
-  tier: 2
-  cost: 15000
-  recipeUnlocks:
-  - JawsOfLifeLeftArm
-  - JawsOfLifeRightArm
-  - SpeedLeftLeg
-  - SpeedRightLeg
-  - BasicCyberneticEyes
-  - SecurityCyberneticEyes
-  - MedicalCyberneticEyes
-
-- type: technology
-  id: Autodoc
-  name: research-technology-autodoc
-  icon:
-    sprite: _Shitmed/Structures/Machines/autodoc.rsi
-    state: idle
-  discipline: CivilianServices
-  tier: 2
-  cost: 10000
-  recipeUnlocks:
-  - AutodocCircuitboard
-
-# Tier 3
-
-- type: technology
-  id: HighEndSurgery
-  name: research-technology-high-end-surgery
-  icon:
-    sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi
-    state: omnimed
-  discipline: CivilianServices
-  tier: 3
-  cost: 10000
-  recipeUnlocks:
-  - OmnimedTool
-  softCapContribution: 1.2
diff --git a/Resources/Prototypes/_Shitmed/Roles/Antags/MindRoles/mind_roles.yml b/Resources/Prototypes/_Shitmed/Roles/Antags/MindRoles/mind_roles.yml
deleted file mode 100644
index 57dca436a81..00000000000
--- a/Resources/Prototypes/_Shitmed/Roles/Antags/MindRoles/mind_roles.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: entity
-  parent: BaseMindRoleAntag
-  id: MindRoleLoneAbductor
-  name: Lone Abductor Role
-  components:
-  - type: MindRole
-    exclusiveAntag: true
-    antagPrototype: LoneAbductorAntag
-  - type: Abductor
-
-- type: entity
-  parent: BaseMindRoleAntag
-  id: MindRoleAbductorVictim
-  name: Abductee Role
-  components:
-  - type: MindRole
-    antagPrototype: AbductorVictimAntag
-  - type: AbductorVictim
diff --git a/Resources/Prototypes/_Shitmed/Roles/Antags/abductor.yml b/Resources/Prototypes/_Shitmed/Roles/Antags/abductor.yml
deleted file mode 100644
index 9bd1c839f31..00000000000
--- a/Resources/Prototypes/_Shitmed/Roles/Antags/abductor.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: antag
-  id: LoneAbductorAntag
-  name: abductors-ghost-role-name
-  antagonist: true
-  objective: roles-antag-abductor-objective
-
-- type: antag
-  id: AbductorVictimAntag
-  name: abductor-victim-role-name
-  antagonist: true
-  objective: roles-antag-abductor-victim
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Species/abductor.yml b/Resources/Prototypes/_Shitmed/Species/abductor.yml
deleted file mode 100644
index e3db1673836..00000000000
--- a/Resources/Prototypes/_Shitmed/Species/abductor.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-- type: species
-  id: Abductor
-  name: species-name-abductor
-  roundStart: false
-  prototype: MobAbductor
-  # WD EDIT START
-  bodyTypes:
-  - AbductorNormal
-  # WD EDIT END
-  markingLimits: MobHumanMarkingLimits
-  dollPrototype: MobAbductorDummy
-  skinColoration: HumanToned
-  defaultSkinTone: "#BFC2C7"
-
-# WD EDIT START
-- type: bodyType
-  id: AbductorNormal
-  name: body-normal
-  # WD EDIT END
-  sprites:
-    Head: MobAbductorHead
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Chest: MobAbductorTorso
-    Eyes: MobAbductorEyes
-    LArm: MobAbductorLArm
-    RArm: MobAbductorRArm
-    LHand: MobAbductorLHand
-    RHand: MobAbductorRHand
-    LLeg: MobAbductorLLeg
-    RLeg: MobAbductorRLeg
-    LFoot: MobAbductorLFoot
-    RFoot: MobAbductorRFoot
-
-- type: humanoidBaseSprite
-  id: MobAbductorEyes
-  baseSprite:
-    sprite: Mobs/Customization/eyes.rsi
-    state: no_eyes
-
-- type: humanoidBaseSprite
-  id: MobAbductorHeadFemale
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobAbductorHeadMale
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobAbductorHead
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: head
-
-- type: humanoidBaseSprite
-  id: MobAbductorTorsoMale
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: torso
-
-- type: humanoidBaseSprite
-  id: MobAbductorTorsoFemale
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: torso
-
-- type: humanoidBaseSprite
-  id: MobAbductorTorso
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: torso
-
-- type: humanoidBaseSprite
-  id: MobAbductorLLeg
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobAbductorLHand
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobAbductorLArm
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobAbductorLFoot
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobAbductorRLeg
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobAbductorRHand
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobAbductorRArm
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobAbductorRFoot
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Abductor/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_Shitmed/Species/cybernetics.yml b/Resources/Prototypes/_Shitmed/Species/cybernetics.yml
deleted file mode 100644
index bfebbf116f8..00000000000
--- a/Resources/Prototypes/_Shitmed/Species/cybernetics.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLArm
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_arm-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRArm
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_arm-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLLeg
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_leg-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRLeg
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_leg-combined"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLHand
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_hand"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRHand
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_hand"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopLFoot
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_foot"
-
-- type: humanoidBaseSprite
-  id: MobCyberneticBishopRFoot
-  baseSprite:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_foot"
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/Species/kobold.yml b/Resources/Prototypes/_Shitmed/Species/kobold.yml
deleted file mode 100644
index c7caa8fc642..00000000000
--- a/Resources/Prototypes/_Shitmed/Species/kobold.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-- type: species
-  id: Kobold
-  name: species-name-kobold
-  roundStart: false # sad...
-  prototype: MobKobold
-  # WD EDIT START
-  bodyTypes:
-  - KoboldNormal
-  # WD EDIT END
-  dollPrototype: MobKoboldDummy
-  skinColoration: Hues
-  defaultSkinTone: "#9a7c5a"
-  markingLimits: MobKoboldMarkingLimits
-
-# WD EDIT START
-- type: bodyType
-  id: KoboldNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobKoboldHead
-    Chest: MobKoboldTorso
-    Tail: MobKoboldTail
-    Eyes: MobKoboldEyes
-    HeadTop: MobKoboldHorns
-    LArm: MobKoboldLArm
-    RArm: MobKoboldRArm
-    LHand: MobKoboldLHand
-    RHand: MobKoboldRHand
-    LLeg: MobKoboldLLeg
-    RLeg: MobKoboldRLeg
-    LFoot: MobKoboldLFoot
-    RFoot: MobKoboldRFoot
-
-- type: humanoidBaseSprite
-  id: MobKoboldAnyMarking
-
-- type: humanoidBaseSprite
-  id: MobKoboldMarkingMatchSkin
-  markingsMatchSkin: true
-
-- type: humanoidBaseSprite
-  id: MobKoboldHorns
-  matchSkin: false
-  baseSprite:
-    sprite: Mobs/Customization/reptilian_parts.rsi
-    state: horns_short
-
-- type: humanoidBaseSprite
-  id: MobKoboldHead
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldHeadMale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldHeadFemale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobKoboldTorso
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldTorsoMale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobKoboldTorsoFemale
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobKoboldLLeg
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobKoboldLArm
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobKoboldLHand
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobKoboldLFoot
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobKoboldRLeg
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobKoboldRArm
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobKoboldRHand
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobKoboldRFoot
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: r_foot
-
-- type: humanoidBaseSprite
-  id: MobKoboldTail
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: tail
-
-- type: humanoidBaseSprite
-  id: MobKoboldEyes
-  baseSprite:
-    sprite: Mobs/Animals/kobold.rsi
-    state: eyes
-
-- type: markingPoints
-  id: MobKoboldMarkingLimits
-  points:
-    Chest:
-      points: 1
-      required: false
diff --git a/Resources/Prototypes/_Shitmed/Species/misc.yml b/Resources/Prototypes/_Shitmed/Species/misc.yml
deleted file mode 100644
index 69954a502a8..00000000000
--- a/Resources/Prototypes/_Shitmed/Species/misc.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is moreso for any base parts from Shitmed that dont fall under any particular umbrella.
-- type: humanoidBaseSprite
-  id: MobPizzaLArm
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Misc/Pizza/parts.rsi
-    state: "l_arm"
-
-- type: humanoidBaseSprite
-  id: MobPizzaRArm
-  baseSprite:
-    sprite: _Shitmed/Mobs/Species/Misc/Pizza/parts.rsi
-    state: "r_arm"
diff --git a/Resources/Prototypes/_Shitmed/Species/monkey.yml b/Resources/Prototypes/_Shitmed/Species/monkey.yml
deleted file mode 100644
index 10b4b205e3b..00000000000
--- a/Resources/Prototypes/_Shitmed/Species/monkey.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-- type: species
-  id: Monkey
-  name: species-name-monkey
-  roundStart: false # sad...
-  prototype: MobMonkey
-  # WD EDIT START
-  bodyTypes:
-  - MonkeyNormal
-  # WD EDIT END
-  dollPrototype: MobMonkeyDummy
-  skinColoration: HumanToned
-  markingLimits: MobMonkeyMarkingLimits
-
-# WD EDIT START
-- type: bodyType
-  id: MonkeyNormal
-  name: body-normal
-# WD EDIT END
-  sprites:
-    Head: MobMonkeyHead
-    HeadTop: MobMonkeyAnyMarking
-    Chest: MobMonkeyTorso
-    Tail: MobMonkeyTail
-    Eyes: MobMonkeyEyes
-    LArm: MobMonkeyLArm
-    RArm: MobMonkeyRArm
-    LHand: MobMonkeyLHand
-    RHand: MobMonkeyRHand
-    LLeg: MobMonkeyLLeg
-    RLeg: MobMonkeyRLeg
-    LFoot: MobMonkeyLFoot
-    RFoot: MobMonkeyRFoot
-
-- type: humanoidBaseSprite
-  id: MobMonkeyAnyMarking
-
-- type: humanoidBaseSprite
-  id: MobMonkeyMarkingMatchSkin
-  markingsMatchSkin: true
-
-- type: humanoidBaseSprite
-  id: MobMonkeyHead
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyHeadMale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyHeadFemale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTorso
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTorsoMale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTorsoFemale
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLLeg
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLArm
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLHand
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobMonkeyLFoot
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRLeg
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRArm
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRHand
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobMonkeyRFoot
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: r_foot
-
-- type: humanoidBaseSprite
-  id: MobMonkeyTail
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: tail
-
-- type: humanoidBaseSprite
-  id: MobMonkeyEyes
-  baseSprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: eyes
-
-- type: markingPoints
-  id: MobMonkeyMarkingLimits
-  points:
-    HeadTop:
-      points: 1
-      required: false
-    Chest:
-      points: 1
-      required: false
diff --git a/Resources/Prototypes/_Shitmed/Tiles/abductor.yml b/Resources/Prototypes/_Shitmed/Tiles/abductor.yml
deleted file mode 100644
index 852cd771ea7..00000000000
--- a/Resources/Prototypes/_Shitmed/Tiles/abductor.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: tile
-  id: FloorAbductor
-  name: tiles-abductor-floor
-  sprite: /Textures/_Shitmed/Tiles/abductor_tile.png
-  isSubfloor: true
-  footstepSounds:
-    collection: FootstepAsteroid
-  heatCapacity: 10000
-  weather: true
-  indestructible: true
diff --git a/Resources/Prototypes/_Shitmed/Wires/layouts.yml b/Resources/Prototypes/_Shitmed/Wires/layouts.yml
deleted file mode 100644
index 8150dbed65a..00000000000
--- a/Resources/Prototypes/_Shitmed/Wires/layouts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: wireLayout
-  id: Autodoc
-  wires:
-  - !type:PowerWireAction
-  - !type:AutodocSafetyWireAction
diff --git a/Resources/Prototypes/_Shitmed/status_effects.yml b/Resources/Prototypes/_Shitmed/status_effects.yml
deleted file mode 100644
index 4cea663e8c8..00000000000
--- a/Resources/Prototypes/_Shitmed/status_effects.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-- type: statusEffect
-  id: BreathingImmunity
-  alwaysAllowed: true # Used by space animal lungs to work on anything
-
-- type: statusEffect
-  id: SpawnSpiderEggs
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: SpawnSlimes
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: SpawnEmp
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: SpawnSmoke
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: SpawnGravityWell
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: SpawnFlash
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: ExpelGas
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: ScrambleDnaEffect
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: ScrambleLocationEffect
-  alwaysAllowed: true
-
-- type: statusEffect
-  id: ActivateArtifactEffect
-  alwaysAllowed: true
\ No newline at end of file
diff --git a/Resources/Prototypes/_Shitmed/tags.yml b/Resources/Prototypes/_Shitmed/tags.yml
deleted file mode 100644
index 53a6ed41f2d..00000000000
--- a/Resources/Prototypes/_Shitmed/tags.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: Tag
-  id: Abductor
-
-- type: Tag
-  id: AbductorScientist
-
-- type: Tag
-  id: CantInteract
-
-- type: Tag
-  id: ShowWires
diff --git a/Resources/Prototypes/_SimpleStation/Entities/Mobs/Customization/IPCwings.yml b/Resources/Prototypes/_SimpleStation/Entities/Mobs/Customization/IPCwings.yml
index 16360d63047..1373971b698 100644
--- a/Resources/Prototypes/_SimpleStation/Entities/Mobs/Customization/IPCwings.yml
+++ b/Resources/Prototypes/_SimpleStation/Entities/Mobs/Customization/IPCwings.yml
@@ -1,8 +1,12 @@
 - type: marking
   id: WingsRobotic
-  bodyPart: Wings
   markingCategory: Wings
   speciesRestriction: [IPC]
   sprites:
     - sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi
       state: robotic
+      # WD EDIT START
+      layer: enum.BodyAppearanceLayer.Wings
+      bodyPart: Wings
+      replacementBodyPart: BodyPartWingsIPC
+      # WD EDIT END
diff --git a/Resources/Prototypes/_White/Alerts/alerts.yml b/Resources/Prototypes/_White/Alerts/alerts.yml
index 4384d2be84c..2c90e0aa24e 100644
--- a/Resources/Prototypes/_White/Alerts/alerts.yml
+++ b/Resources/Prototypes/_White/Alerts/alerts.yml
@@ -5,3 +5,32 @@
     state: buckler-icon
   name: alerts-blocked-name
   description: alerts-blocked-desc
+
+- type: alert
+  id: BodyStatus
+  icons:
+  - sprite: /Textures/_White/Interface/Alerts/body_status.rsi
+    state: chest_zero
+  alertViewEntity: AlertBodyStatusSpriteView
+  name: alerts-body-status-name
+  description: alerts-body-status-desc
+
+- type: entity
+  id: AlertBodyStatusSpriteView
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: /Textures/_White/Interface/Alerts/body_status.rsi
+    layers:
+    - map: [ "enum.AlertVisualLayers.Base" ]
+    - map: [ "enum.BodyStatusVisualLayers.Head" ]
+    - map: [ "enum.BodyStatusVisualLayers.Chest" ]
+    - map: [ "enum.BodyStatusVisualLayers.Groin" ]
+    - map: [ "enum.BodyStatusVisualLayers.LeftArm" ]
+    - map: [ "enum.BodyStatusVisualLayers.LeftHand" ]
+    - map: [ "enum.BodyStatusVisualLayers.RightArm" ]
+    - map: [ "enum.BodyStatusVisualLayers.RightHand" ]
+    - map: [ "enum.BodyStatusVisualLayers.LeftLeg" ]
+    - map: [ "enum.BodyStatusVisualLayers.LeftFoot" ]
+    - map: [ "enum.BodyStatusVisualLayers.RightLeg" ]
+    - map: [ "enum.BodyStatusVisualLayers.RightFoot" ]
diff --git a/Resources/Prototypes/_White/Body/NPCs/animal.yml b/Resources/Prototypes/_White/Body/NPCs/animal.yml
new file mode 100644
index 00000000000..b7b0efed896
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/animal.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: Animal
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachAnimal
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/bloodsucker.yml b/Resources/Prototypes/_White/Body/NPCs/bloodsucker.yml
new file mode 100644
index 00000000000..596671d3756
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/bloodsucker.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: Bloodsucker
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachBloodsucker
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverBloodsucker
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysBloodsucker
diff --git a/Resources/Prototypes/_White/Body/NPCs/friend_shaped.yml b/Resources/Prototypes/_White/Body/NPCs/friend_shaped.yml
new file mode 100644
index 00000000000..33ce0a8b69b
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/friend_shaped.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: FriendShaped
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachFriendShaped
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/kobold.yml b/Resources/Prototypes/_White/Body/NPCs/kobold.yml
new file mode 100644
index 00000000000..727cfb0cefd
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/kobold.yml
@@ -0,0 +1,87 @@
+- type: body
+  id: Kobold
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadKobold
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestKobold
+      connections:
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinKobold
+      connections:
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachReptilian
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+        appendix:
+          type: Appendix
+          startingOrgan: OrganAppendixHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmKobold
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmKobold
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandKobold
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandKobold
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegKobold
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegKobold
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootKobold
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootKobold
diff --git a/Resources/Prototypes/_White/Body/NPCs/monkey.yml b/Resources/Prototypes/_White/Body/NPCs/monkey.yml
new file mode 100644
index 00000000000..a7e1c5af78c
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/monkey.yml
@@ -0,0 +1,87 @@
+- type: body
+  id: Monkey
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadMonkey
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestMonkey
+      connections:
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinMonkey
+      connections:
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+        appendix:
+          type: Appendix
+          startingOrgan: OrganAppendixHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmMonkey
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmMonkey
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandMonkey
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandMonkey
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegMonkey
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegMonkey
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootMonkey
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootMonkey
diff --git a/Resources/Prototypes/_White/Body/NPCs/mothroach.yml b/Resources/Prototypes/_White/Body/NPCs/mothroach.yml
new file mode 100644
index 00000000000..9ac6cecac3e
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/mothroach.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: Mothroach
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachMoth
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/mouse.yml b/Resources/Prototypes/_White/Body/NPCs/mouse.yml
new file mode 100644
index 00000000000..70dcdb9f49d
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/mouse.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: Mouse
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachMouse
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/nymph.yml b/Resources/Prototypes/_White/Body/NPCs/nymph.yml
new file mode 100644
index 00000000000..f71fd2a51c2
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/nymph.yml
@@ -0,0 +1,59 @@
+- type: body
+  id: DionaNymphBrain
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainDiona
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachAnimal
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
+
+- type: body
+  id: DionaNymphStomach
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachDiona
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
+
+- type: body
+  id: DionaNymphLungs
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsDiona
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachAnimal
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/rat.yml b/Resources/Prototypes/_White/Body/NPCs/rat.yml
new file mode 100644
index 00000000000..3bf472e8c4a
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/rat.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: Rat
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsRat
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachRat
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/ruminant.yml b/Resources/Prototypes/_White/Body/NPCs/ruminant.yml
new file mode 100644
index 00000000000..b5fe78a3740
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/ruminant.yml
@@ -0,0 +1,21 @@
+- type: body
+  id: Ruminant
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachRuminant
+    stomach2:
+      type: Stomach
+      startingOrgan: OrganStomachRuminant
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/slime.yml b/Resources/Prototypes/_White/Body/NPCs/slime.yml
new file mode 100644
index 00000000000..856679d2f8a
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/slime.yml
@@ -0,0 +1,9 @@
+- type: body
+  id: SimpleSlime
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsSlime
diff --git a/Resources/Prototypes/_White/Body/NPCs/squackroach.yml b/Resources/Prototypes/_White/Body/NPCs/squackroach.yml
new file mode 100644
index 00000000000..b3308cf2a8b
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/squackroach.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: Squackroach
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsHarpy
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachAnimal
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/NPCs/vampiric.yml b/Resources/Prototypes/_White/Body/NPCs/vampiric.yml
new file mode 100644
index 00000000000..b9f9d223166
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/NPCs/vampiric.yml
@@ -0,0 +1,18 @@
+- type: body
+  id: Vampiric
+  organs:
+    heart:
+      type: Heart
+      startingOrgan: OrganHeartAnimal
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsAnimal
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachVampiric
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverAnimal
+    kidneys:
+      type: Kidneys
+      startingOrgan: OrganKidneysAnimal
diff --git a/Resources/Prototypes/_White/Body/Organs/Animal/xenomorph.yml b/Resources/Prototypes/_White/Body/Organs/Animal/xenomorph.yml
deleted file mode 100644
index a6367af424c..00000000000
--- a/Resources/Prototypes/_White/Body/Organs/Animal/xenomorph.yml
+++ /dev/null
@@ -1,224 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: BaseXenomorphOrgan
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Xenomorph/organs.rsi
-  - type: Organ
-  - type: Food
-  - type: Extractable
-    grindableSolutionName: organ
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: SulfuricAcid
-          Quantity: 10
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: UncookedAnimalProteins
-          Quantity: 3
-        - ReagentId: SulfuricAcid
-          Quantity: 2
-  - type: FlavorProfile
-    flavors:
-    - people
-  - type: Tag
-    tags:
-    - Meat
-
-- type: entity
-  parent: [BaseXenomorphOrgan, OrganHumanBrain]
-  id: OrganXenomorphBrain
-  name: xenomorph brain
-  description: We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      organ:
-        reagents:
-        - ReagentId: SulfuricAcid
-          Quantity: 10
-      food:
-        maxVol: 5
-        reagents:
-        - ReagentId: GreyMatter
-          Quantity: 5
-
-- type: entity
-  parent: [BaseXenomorphOrgan, OrganHumanEyes]
-  id: OrganXenomorphEyes
-  name: xenomorph eyes
-  description: It turned out they had them after all!
-
-- type: entity
-  parent: [BaseXenomorphOrgan, OrganHumanTongue]
-  id: OrganXenomorphTongue
-  name: xenomorph tongue
-  description: According to leading xenobiologists the evolutionary benefit of having a second mouth in your mouth is "that it looks badass".
-
-- type: entity
-  parent: [BaseXenomorphOrgan, OrganReptilianStomach]
-  id: OrganXenomorphStomach
-  name: xenomorph stomach
-  description: Its walls are capable of both significantly expanding and contracting with enormous force.
-
-- type: entity
-  parent: [BaseXenomorphOrgan, OrganHumanLiver]
-  id: OrganXenomorphLiver
-  name: xenomorph liver
-  description: A liver that used to belong to a killer alien, who knows what it used to eat.
-  components:
-  - type: Metabolizer
-    maxReagents: 10
-    metabolizerTypes: [Xenomorph]
-    groups:
-    - id: Poison
-      rateModifier: 1
-
-- type: entity
-  parent: BaseXenomorphOrgan
-  id: OrganXenomorphAcidGland
-  name: acid gland
-  description: A specialized tank with acid. The resulting corrosive mixture can melt most known materials.
-  components:
-  - type: Sprite
-    state: acid_gland
-  - type: Organ
-    slotId: acid_gland
-    onAdd:
-    - type: XenomorphAcid
-      damagePerSecond:
-        types:
-          Caustic: 20
-
-- type: entity
-  parent: BaseXenomorphOrgan
-  id: OrganXenomorphNeurotoxinGland
-  name: neurotoxin gland
-  description: A specialized tank with neurotoxin. Сonsists of many microscopic tubes filled with clear liquid.
-  components:
-  - type: Sprite
-    state: neurotoxin_gland
-  - type: Organ
-    slotId: neurotoxin_gland
-    onAdd:
-    - type: RechargeBasicEntityAmmo
-      rechargeCooldown: 0.75
-    - type: PlasmaAmmoProvider
-      fireCost: 55
-      proto: BulletNeurotoxin
-    - type: Gun
-      fireRate: 0.75
-      useKey: false
-      selectedMode: FullAuto
-      availableModes:
-      - FullAuto
-      soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg
-
-- type: entity
-  parent: BaseXenomorphOrgan
-  id: OrganXenomorphEggSack
-  name: egg sack
-  description: Designed to produce and store eggs containing facehuggers, the organ's enormous size allows the xenomorph queen to lay thousands of eggs in a short period of time.
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Xenomorph/organs.rsi
-    state: egg_sack
-  - type: Organ
-    slotId: egg_sack
-    # TODO: Organ should give egg spawn actions
-
-- type: entity
-  parent: BaseXenomorphOrgan
-  id: OrganXenomorphResinSpinner
-  name: resin spinner
-  description: Designed for the production and isolation of resin-like biopolymer.
-  components:
-  - type: Sprite
-    state: resin_spinner
-  - type: Organ
-    slotId: resin_spinner
-    # TODO: Organ should give construction actions
-
-- type: entity
-  parent: BaseXenomorphOrgan
-  id: OrganXenomorphHiveNode
-  name: hive node
-  description: The central organ of the xenomorphs, providing communication with the common mind.
-  components:
-  - type: Sprite
-    state: hive_node
-  - type: Organ
-    slotId: hive_node
-    # TODO: Organ should give XenoHivemind language and Xeno faction
-
-- type: entity
-  parent: BaseXenomorphOrgan
-  id: OrganXenomorphPlasmaVessel
-  name: plasma vessel
-  description: A reservoir containing concentrated and highly active plasma - the main source of energy and raw material for the xenomorph's biological weapons.
-  components:
-  - type: Sprite
-    state: plasma_vessel
-  - type: Organ
-    slotId: plasma_vessel
-    onAdd:
-    - type: PlasmaVessel
-    # TODO: Organ should give plant weeds and transfer plasma action
-
-- type: entity
-  parent: OrganXenomorphPlasmaVessel
-  id: OrganXenomorphPlasmaVesselLarge
-  name: large plasma vessel
-  components:
-  - type: Sprite
-    state: plasma_vessel_large
-  - type: Organ
-    onAdd:
-    - type: PlasmaVessel
-      maxPlasma: 500
-      plasma: 200
-      plasmaPerSecondOffWeed: 0.75
-      plasmaPerSecondOnWeed: 7.5
-
-- type: entity
-  parent: OrganXenomorphPlasmaVesselLarge
-  id: OrganXenomorphPlasmaVesselLargeQueen
-  components:
-  - type: Organ
-    onAdd:
-    - type: PlasmaVessel
-      maxPlasma: 500
-      plasma: 200
-      plasmaPerSecondOffWeed: 1
-      plasmaPerSecondOnWeed: 10
-
-- type: entity
-  parent: OrganXenomorphPlasmaVessel
-  id: OrganXenomorphPlasmaVesselSmall
-  name: small plasma vessel
-  components:
-  - type: Sprite
-    state: plasma_vessel_small
-  - type: Organ
-    onAdd:
-    - type: PlasmaVessel
-      maxPlasma: 150
-      plasma: 100
-      plasmaPerSecondOffWeed: 0.25
-      plasmaPerSecondOnWeed: 2.5
-
-- type: entity
-  parent: OrganXenomorphPlasmaVessel
-  id: OrganXenomorphPlasmaVesselTiny
-  name: tiny plasma vessel
-  components:
-  - type: Sprite
-    state: plasma_vessel_tiny
-  - type: Organ
-    onAdd:
-    - type: PlasmaVessel
-      maxPlasma: 100
diff --git a/Resources/Prototypes/_White/Body/Parts/prosthetic.yml b/Resources/Prototypes/_White/Body/Parts/prosthetic.yml
deleted file mode 100644
index 7ba81705fb6..00000000000
--- a/Resources/Prototypes/_White/Body/Parts/prosthetic.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-- type: entity
-  parent: RightLegCybernetic
-  id: MakeshiftRightLeg
-  name: Right leg prosthetic
-  description: Poorly made leg from what was nearby
-  components:
-  - type: MovementBodyPart
-    walkSpeed: 1.8
-    sprintSpeed: 2.25 #you cant sprint fast on this
-  - type: Construction
-    graph: MakeshiftRightLegGraph
-    node: makeshiftrightleg
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 300
-      Cloth: 300
-      Wood: 300
-      Copper: 300
-    chemicalComposition:
-      Iron: 36
-      Carbon: 4
-      Copper: 30
-      Fiber: 40
-
-- type: entity
-  parent: LeftLegCybernetic
-  id: MakeshiftLeftLeg
-  name: Left leg prosthetic
-  description: Poorly made leg from what was nearby
-  components:
-  - type: MovementBodyPart
-    walkSpeed: 1.8
-    sprintSpeed: 2.25 #you cant sprint fast on this
-  - type: Construction
-    graph: MakeshiftLeftLegGraph
-    node: makeshiftleftleg
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 300
-      Cloth: 300
-      Wood: 300
-      Copper: 300
-    chemicalComposition:
-      Iron: 36
-      Carbon: 4
-      Copper: 30
-      Fiber: 40
-
-- type: entity
-  parent: RightArmCybernetic
-  id: MakeshiftRightArm
-  name: Right arm prosthetic
-  description: Primitive mechanic manipulator. Looks dieselpank-y
-  components:
-  - type: Construction
-    graph: MakeshiftRightArmGraph
-    node: makeshiftrightarm
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 400
-      Cloth: 400
-      Copper: 250
-    chemicalComposition:
-      Iron: 54
-      Carbon: 6
-      Copper: 45
-      Fiber: 50
-
-- type: entity
-  parent: LeftArmCybernetic
-  id: MakeshiftLeftArm
-  name: Left arm prosthetic
-  description: Primitive mechanic manipulator. Looks dieselpank-y
-  components:
-  - type: Construction
-    graph: MakeshiftLeftArmGraph
-    node: makeshiftleftarm
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 400
-      Cloth: 300
-      Copper: 250
-    chemicalComposition:
-      Iron: 54
-      Carbon: 6
-      Copper: 45
-      Fiber: 50
diff --git a/Resources/Prototypes/_White/Body/Parts/resomi.yml b/Resources/Prototypes/_White/Body/Parts/resomi.yml
deleted file mode 100644
index f4ac1dfb980..00000000000
--- a/Resources/Prototypes/_White/Body/Parts/resomi.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-- type: entity
-  id: PartResomi
-  parent: [BaseItem, BasePart]
-  name: "resomi body part"
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 3
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: TorsoResomi
-  name: "resomi torso"
-  parent: [PartHuman, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "torso_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 10
-      - ReagentId: Blood
-        Quantity: 20
-
-
-- type: entity
-  id: HeadResomi
-  name: "resomi head"
-  parent: [BaseHead, PartHuman]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "head_m"
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: Fat
-        Quantity: 5
-      - ReagentId: Blood
-        Quantity: 10
-
-- type: entity
-  id: LeftArmResomi
-  name: "left resomi arm"
-  parent: [PartHuman, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "l_arm"
-
-- type: entity
-  id: RightArmResomi
-  name: "right resomi arm"
-  parent: [PartHuman, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "r_arm"
-
-- type: entity
-  id: LeftHandResomi
-  name: "left resomi hand"
-  parent: [PartHuman, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "l_hand"
-
-- type: entity
-  id: RightHandResomi
-  name: "right resomi hand"
-  parent: [PartHuman, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "r_hand"
-
-- type: entity
-  id: LeftLegResomi
-  name: "left resomi leg"
-  parent: [PartHuman, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "l_leg"
-
-- type: entity
-  id: RightLegResomi
-  name: "right resomi leg"
-  parent: [PartHuman, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "r_leg"
-
-- type: entity
-  id: LeftFootResomi
-  name: "left resomi foot"
-  parent: [PartHuman, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "l_foot"
-
-- type: entity
-  id: RightFootResomi
-  name: "right resomi foot"
-  parent: [PartHuman, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: "r_foot"
diff --git a/Resources/Prototypes/_White/Body/Parts/xenomorph.yml b/Resources/Prototypes/_White/Body/Parts/xenomorph.yml
deleted file mode 100644
index 00fc6369bdb..00000000000
--- a/Resources/Prototypes/_White/Body/Parts/xenomorph.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-# TODO: Add descriptions (many)
-# TODO: Sprite
-- type: entity
-  id: PartXenomorph
-  parent: BasePart
-  name: xenomorph body part
-  abstract: true
-  components:
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: SulfuricAcid
-        Quantity: 3
-      - ReagentId: FluorosulfuricAcid
-        Quantity: 10
-
-- type: entity
-  id: TorsoXenomorph
-  name: xenomorph torso
-  parent: [PartXenomorph, BaseTorso]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: torso_m
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: SulfuricAcid
-        Quantity: 10
-      - ReagentId: FluorosulfuricAcid
-        Quantity: 20
-
-- type: entity
-  id: HeadXenomorph
-  name: xenomorph head
-  parent: [PartXenomorph, BaseHead]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: head_m
-  - type: Extractable
-    juiceSolution:
-      reagents:
-      - ReagentId: SulfuricAcid
-        Quantity: 5
-      - ReagentId: FluorosulfuricAcid
-        Quantity: 10
-
-- type: entity
-  id: LeftArmXenomorph
-  name: left xenomorph arm
-  parent: [PartXenomorph, BaseLeftArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_arm
-
-- type: entity
-  id: RightArmXenomorph
-  name: right xenomorph arm
-  parent: [PartXenomorph, BaseRightArm]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_arm
-
-- type: entity
-  id: LeftHandXenomorph
-  name: left xenomorph hand
-  parent: [PartXenomorph, BaseLeftHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_hand
-
-- type: entity
-  id: RightHandXenomorph
-  name: right xenomorph hand
-  parent: [PartXenomorph, BaseRightHand]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_hand
-
-- type: entity
-  id: LeftLegXenomorph
-  name: left xenomorph leg
-  parent: [PartXenomorph, BaseLeftLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_leg
-
-- type: entity
-  id: RightLegXenomorph
-  name: right xenomorph leg
-  parent: [PartXenomorph, BaseRightLeg]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_leg
-
-- type: entity
-  id: LeftFootXenomorph
-  name: left xenomorph foot
-  parent: [PartXenomorph, BaseLeftFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: l_foot
-
-- type: entity
-  id: RightFootXenomorph
-  name: right xenomorph foot
-  parent: [PartXenomorph, BaseRightFoot]
-  components:
-  - type: Sprite
-    sprite: Mobs/Species/Human/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/drone.yml b/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/drone.yml
deleted file mode 100644
index 6c71e5ec798..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/drone.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-- type: body
-  id: XenomorphDrone
-  name: xenomorph drone
-  root: torso
-  slots:
-    head:
-      part: HeadXenomorph
-      connections:
-      - torso
-      organs:
-        brain: OrganXenomorphBrain
-        eyes: OrganXenomorphEyes
-        hive_node: OrganXenomorphHiveNode
-        resin_spinner: OrganXenomorphResinSpinner
-        acid_gland: OrganXenomorphAcidGland
-    torso:
-      part: TorsoXenomorph
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        stomach: OrganXenomorphStomach
-        liver: OrganXenomorphLiver
-        plasma_vessel: OrganXenomorphPlasmaVesselLarge
-    right arm:
-      part: RightArmXenomorph
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmXenomorph
-      connections:
-      - left hand
-    right hand:
-      part: RightHandXenomorph
-    left hand:
-      part: LeftHandXenomorph
-    right leg:
-      part: RightLegXenomorph
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegXenomorph
-      connections:
-      - left foot
-    right foot:
-      part: RightFootXenomorph
-    left foot:
-      part: LeftFootXenomorph
diff --git a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/hunter.yml b/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/hunter.yml
deleted file mode 100644
index d0ac5b4bde1..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/hunter.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- type: body
-  id: XenomorphHunter
-  name: xenomorph hunter
-  root: torso
-  slots:
-    head:
-      part: HeadXenomorph
-      connections:
-      - torso
-      organs:
-        brain: OrganXenomorphBrain
-        eyes: OrganXenomorphEyes
-        hive_node: OrganXenomorphHiveNode
-    torso:
-      part: TorsoXenomorph
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        stomach: OrganXenomorphStomach
-        liver: OrganXenomorphLiver
-        plasma_vessel: OrganXenomorphPlasmaVesselSmall
-    right arm:
-      part: RightArmXenomorph
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmXenomorph
-      connections:
-      - left hand
-    right hand:
-      part: RightHandXenomorph
-    left hand:
-      part: LeftHandXenomorph
-    right leg:
-      part: RightLegXenomorph
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegXenomorph
-      connections:
-      - left foot
-    right foot:
-      part: RightFootXenomorph
-    left foot:
-      part: LeftFootXenomorph
diff --git a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/larva.yml b/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/larva.yml
deleted file mode 100644
index dcf2c858d94..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/larva.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: body
-  id: XenomorphLarva
-  name: xenomorph larva
-  root: torso
-  slots:
-    head:
-      part: HeadXenomorph
-      connections:
-      - torso
-      organs:
-        brain: OrganXenomorphBrain
-        eyes: OrganXenomorphEyes
-        hive_node: OrganXenomorphHiveNode
-    torso:
-      part: TorsoXenomorph
-      connections:
-      - head
-      organs:
-        liver: OrganXenomorphLiver
-        plasma_vessel: OrganXenomorphPlasmaVesselTiny
diff --git a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/maid.yml b/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/maid.yml
deleted file mode 100644
index a125e821953..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/maid.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- type: body
-  id: XenomorphMaid
-  name: xenomorph maid
-  root: torso
-  slots:
-    head:
-      part: HeadXenomorph
-      connections:
-      - torso
-      organs:
-        brain: OrganXenomorphBrain
-        eyes: OrganXenomorphEyes
-        hive_node: OrganXenomorphHiveNode
-    torso:
-      part: TorsoXenomorph
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        stomach: OrganXenomorphStomach
-        liver: OrganXenomorphLiver
-        plasma_vessel: OrganXenomorphPlasmaVessel
-    right arm:
-      part: RightArmXenomorph
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmXenomorph
-      connections:
-      - left hand
-    right hand:
-      part: RightHandXenomorph
-    left hand:
-      part: LeftHandXenomorph
-    right leg:
-      part: RightLegXenomorph
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegXenomorph
-      connections:
-      - left foot
-    right foot:
-      part: RightFootXenomorph
-    left foot:
-      part: LeftFootXenomorph
diff --git a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/praetorian.yml b/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/praetorian.yml
deleted file mode 100644
index 31c2e5202df..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/praetorian.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-- type: body
-  id: XenomorphPraetorian
-  name: xenomorph praetorian
-  root: torso
-  slots:
-    head:
-      part: HeadXenomorph
-      connections:
-      - torso
-      organs:
-        brain: OrganXenomorphBrain
-        eyes: OrganXenomorphEyes
-        hive_node: OrganXenomorphHiveNode
-        resin_spinner: OrganXenomorphResinSpinner
-        neurotoxin_gland: OrganXenomorphNeurotoxinGland
-        acid_gland: OrganXenomorphAcidGland
-    torso:
-      part: TorsoXenomorph
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        stomach: OrganXenomorphStomach
-        liver: OrganXenomorphLiver
-        plasma_vessel: OrganXenomorphPlasmaVesselLarge
-    right arm:
-      part: RightArmXenomorph
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmXenomorph
-      connections:
-      - left hand
-    right hand:
-      part: RightHandXenomorph
-    left hand:
-      part: LeftHandXenomorph
-    right leg:
-      part: RightLegXenomorph
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegXenomorph
-      connections:
-      - left foot
-    right foot:
-      part: RightFootXenomorph
-    left foot:
-      part: LeftFootXenomorph
diff --git a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/queen.yml b/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/queen.yml
deleted file mode 100644
index 0624ef099af..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/queen.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-- type: body
-  id: XenomorphQueen
-  name: xenomorph queen
-  root: torso
-  slots:
-    head:
-      part: HeadXenomorph
-      connections:
-      - torso
-      organs:
-        brain: OrganXenomorphBrain
-        eyes: OrganXenomorphEyes
-        hive_node: OrganXenomorphHiveNode
-        resin_spinner: OrganXenomorphResinSpinner
-        neurotoxin_gland: OrganXenomorphNeurotoxinGland
-        acid_gland: OrganXenomorphAcidGland
-    torso:
-      part: TorsoXenomorph
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        stomach: OrganXenomorphStomach
-        liver: OrganXenomorphLiver
-        plasma_vessel: OrganXenomorphPlasmaVesselLargeQueen
-        egg_sack: OrganXenomorphEggSack
-    right arm:
-      part: RightArmXenomorph
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmXenomorph
-      connections:
-      - left hand
-    right hand:
-      part: RightHandXenomorph
-    left hand:
-      part: LeftHandXenomorph
-    right leg:
-      part: RightLegXenomorph
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegXenomorph
-      connections:
-      - left foot
-    right foot:
-      part: RightFootXenomorph
-    left foot:
-      part: LeftFootXenomorph
diff --git a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/sentinel.yml b/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/sentinel.yml
deleted file mode 100644
index d9761860352..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/Animal/Xenomorph/sentinel.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-- type: body
-  id: XenomorphSentinel
-  name: xenomorph sentinel
-  root: torso
-  slots:
-    head:
-      part: HeadXenomorph
-      connections:
-      - torso
-      organs:
-        brain: OrganXenomorphBrain
-        eyes: OrganXenomorphEyes
-        hive_node: OrganXenomorphHiveNode
-        neurotoxin_gland: OrganXenomorphNeurotoxinGland
-        acid_gland: OrganXenomorphAcidGland
-    torso:
-      part: TorsoXenomorph
-      connections:
-      - right arm
-      - left arm
-      - right leg
-      - left leg
-      - head
-      organs:
-        stomach: OrganXenomorphStomach
-        liver: OrganXenomorphLiver
-        plasma_vessel: OrganXenomorphPlasmaVessel
-    right arm:
-      part: RightArmXenomorph
-      connections:
-      - right hand
-    left arm:
-      part: LeftArmXenomorph
-      connections:
-      - left hand
-    right hand:
-      part: RightHandXenomorph
-    left hand:
-      part: LeftHandXenomorph
-    right leg:
-      part: RightLegXenomorph
-      connections:
-      - right foot
-    left leg:
-      part: LeftLegXenomorph
-      connections:
-      - left foot
-    right foot:
-      part: RightFootXenomorph
-    left foot:
-      part: LeftFootXenomorph
diff --git a/Resources/Prototypes/_White/Body/Prototypes/resomi.yml b/Resources/Prototypes/_White/Body/Prototypes/resomi.yml
deleted file mode 100644
index e05f759162c..00000000000
--- a/Resources/Prototypes/_White/Body/Prototypes/resomi.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- type: body
-  id: Resomi
-  name: "resomi"
-  root: torso
-  slots:
-    head:
-      part: HeadResomi
-      connections:
-      - torso
-      organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
-    torso:
-      part: TorsoResomi
-      connections:
-      - right_arm
-      - left_arm
-      - right_leg
-      - left_leg
-      organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
-    right_arm:
-      part: RightArmResomi
-      connections:
-      - right_hand
-    left_arm:
-      part: LeftArmResomi
-      connections:
-      - left_hand
-    right_hand:
-      part: RightHandResomi
-    left_hand:
-      part: LeftHandResomi
-    right_leg:
-      part: RightLegResomi
-      connections:
-      - right_foot
-    left_leg:
-      part: LeftLegResomi
-      connections:
-      - left_foot
-    right_foot:
-      part: RightFootResomi
-    left_foot:
-      part: LeftFootResomi
diff --git a/Resources/Prototypes/_White/Body/Species/arachne.yml b/Resources/Prototypes/_White/Body/Species/arachne.yml
new file mode 100644
index 00000000000..8775865627a
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/arachne.yml
@@ -0,0 +1,106 @@
+- type: body
+  id: Arachne
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadHuman
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesArachne
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestHuman
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinHuman
+      connections:
+      - thorax
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachArachne
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmHuman
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmHuman
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandHuman
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandHuman
+    thorax:
+      type: Groin
+      startingBodyPart: BodyPartGroinArachne
+      connections:
+      - left_leg_fore
+      - left_leg_second
+      - left_leg_third
+      - left_leg_hind
+      - right_leg_fore
+      - right_leg_second
+      - right_leg_third
+      - right_leg_hind
+    left_leg_fore:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegArachne
+    left_leg_second:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegArachne
+    left_leg_third:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegArachne
+    left_leg_hind:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegArachne
+    right_leg_fore:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegArachne
+    right_leg_second:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegArachne
+    right_leg_third:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegArachne
+    right_leg_hind:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegArachne
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/arachnid.yml b/Resources/Prototypes/_White/Body/Species/arachnid.yml
new file mode 100644
index 00000000000..8664b8a0615
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/arachnid.yml
@@ -0,0 +1,92 @@
+- type: body
+  id: Arachnid
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadArachnid
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesArachnid
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueArachnid
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestArachnid
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartArachnid
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsArachnid
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinArachnid
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachArachnid
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverArachnid
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysArachnid
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmArachnid
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmArachnid
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandArachnid
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandArachnid
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegArachnid
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegArachnid
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootArachnid
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootArachnid
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailArachnid
+    wings:
+      type: Wings
+      startingBodyPart: BodyPartWingsArachnid
diff --git a/Resources/Prototypes/_White/Body/Species/chitinid.yml b/Resources/Prototypes/_White/Body/Species/chitinid.yml
new file mode 100644
index 00000000000..2c9e54fd517
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/chitinid.yml
@@ -0,0 +1,91 @@
+- type: body
+  id: Chitinid
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadChitinid
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestChitinid
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinChitinid
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverChitinid
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysAnimal
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmChitinid
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmChitinid
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandChitinid
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandChitinid
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegChitinid
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegChitinid
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootChitinid
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootChitinid
+    tail:
+      type: Tail
+    wings:
+      type: Wings
+      startingBodyPart: BodyPartWingsChitinid
diff --git a/Resources/Prototypes/_White/Body/Species/diona.yml b/Resources/Prototypes/_White/Body/Species/diona.yml
new file mode 100644
index 00000000000..01f5c97b1a0
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/diona.yml
@@ -0,0 +1,71 @@
+- type: body
+  id: Diona
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadDiona
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainDionaNymph
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsDiona
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesDiona
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestDiona
+      connections:
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachDionaNymph
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsDionaNymph
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinDiona
+      connections:
+      - right_leg
+      - left_leg
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmDiona
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmDiona
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandDiona
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandDiona
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegDiona
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegDiona
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootDiona
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootDiona
diff --git a/Resources/Prototypes/_White/Body/Species/dwarf.yml b/Resources/Prototypes/_White/Body/Species/dwarf.yml
new file mode 100644
index 00000000000..f125ed7e168
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/dwarf.yml
@@ -0,0 +1,93 @@
+- type: body
+  id: Dwarf
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadHuman
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestHuman
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinHuman
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachDwarf
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverDwarf
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+        appendix:
+          type: Appendix
+          startingOrgan: OrganAppendixHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmHuman
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmHuman
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandHuman
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandHuman
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegHuman
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegHuman
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootHuman
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootHuman
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/felinid.yml b/Resources/Prototypes/_White/Body/Species/felinid.yml
new file mode 100644
index 00000000000..bba2f3b2b76
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/felinid.yml
@@ -0,0 +1,91 @@
+- type: body
+  id: Felinid
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadHuman
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestHuman
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartAnimal
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinHuman
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachVulpkanin
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverAnimal
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysAnimal
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmHuman
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmHuman
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandHuman
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandHuman
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegHuman
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegHuman
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootHuman
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootHuman
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailFelinid
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/gingerbread.yml b/Resources/Prototypes/_White/Body/Species/gingerbread.yml
new file mode 100644
index 00000000000..33658dc20ad
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/gingerbread.yml
@@ -0,0 +1,93 @@
+- type: body
+  id: Gingerbread
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadGingerbread
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesGingerbread
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestGingerbread
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinGingerbread
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+        appendix:
+          type: Appendix
+          startingOrgan: OrganAppendixHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmGingerbread
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmGingerbread
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandGingerbread
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandGingerbread
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegGingerbread
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegGingerbread
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootGingerbread
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootGingerbread
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/harpy.yml b/Resources/Prototypes/_White/Body/Species/harpy.yml
new file mode 100644
index 00000000000..670998c7fae
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/harpy.yml
@@ -0,0 +1,88 @@
+- type: body
+  id: Harpy
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadHarpy
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestHarpy
+      connections:
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHarpy
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinHarpy
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachAnimal
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverAnimal
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysAnimal
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmHarpy
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmHarpy
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandHarpy
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandHarpy
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegHarpy
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegHarpy
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootHarpy
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootHarpy
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailHarpy
diff --git a/Resources/Prototypes/_White/Body/Species/human.yml b/Resources/Prototypes/_White/Body/Species/human.yml
new file mode 100644
index 00000000000..31407ab55ef
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/human.yml
@@ -0,0 +1,137 @@
+- type: body
+  id: Human
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadHuman
+      connections:
+      - chest
+      bones:
+        skull:
+          type: Сranium
+          startingBone: BoneSkullHuman
+          organs:
+            brain:
+              type: Brain
+              startingOrgan: OrganBrainHuman
+            ears:
+              type: Ears
+              startingOrgan: OrganEarsHuman
+            eyes:
+              type: Eyes
+              startingOrgan: OrganEyesHuman
+            tongue:
+              type: Tongue
+              startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestHuman
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      bones:
+        rib_cage:
+          type: Thorax
+          startingBone: BoneRibCageHuman
+          organs:
+            heart:
+              type: Heart
+              startingOrgan: OrganHeartHuman
+            lungs:
+              type: Lungs
+              startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinHuman
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      bones:
+        pelvis:
+          type: Coxae
+          startingBone: BonePelvisHuman
+          organs:
+            stomach:
+              type: Stomach
+              startingOrgan: OrganStomachHuman
+            liver:
+              type: Liver
+              startingOrgan: OrganLiverHuman
+            kidneys:
+              type: Kidneys
+              startingOrgan: OrganKidneysHuman
+            appendix:
+              type: Appendix
+              startingOrgan: OrganAppendixHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmHuman
+      connections:
+      - left_hand
+      bones:
+        left_arm:
+          type: LeftAntebrachium
+          startingBone: BoneLeftArmHuman
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmHuman
+      connections:
+      - right_hand
+      bones:
+        right_arm:
+          type: RightAntebrachium
+          startingBone: BoneRightArmHuman
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandHuman
+      bones:
+        left_hand:
+          type: LeftManus
+          startingBone: BoneLeftHandHuman
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandHuman
+      bones:
+        right_hand:
+          type: RightManus
+          startingBone: BoneRightHandHuman
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegHuman
+      connections:
+      - left_foot
+      bones:
+        left_leg:
+          type: LeftCrus
+          startingBone: BoneLeftLegHuman
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegHuman
+      connections:
+      - right_foot
+      bones:
+        right_leg:
+          type: RightCrus
+          startingBone: BoneRightLegHuman
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootHuman
+      bones:
+        left_foot:
+          type: LeftPedis
+          startingBone: BoneLeftFootHuman
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootHuman
+      bones:
+        right_foot:
+          type: RightPedis
+          startingBone: BoneRightFootHuman
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/ipc.yml b/Resources/Prototypes/_White/Body/Species/ipc.yml
new file mode 100644
index 00000000000..eff401f8308
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/ipc.yml
@@ -0,0 +1,78 @@
+- type: body
+  id: IPC
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadIPC
+      connections:
+      - chest
+      organs:
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsIPC
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesIPC
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueIPC
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestIPC
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        eyes:
+          type: Heart
+          startingOrgan: OrganHeartIPC
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinIPC
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: PositronicBrain
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmIPC
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmIPC
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandIPC
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandIPC
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegIPC
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegIPC
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootIPC
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootIPC
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/moth.yml b/Resources/Prototypes/_White/Body/Species/moth.yml
new file mode 100644
index 00000000000..9d90c02ebca
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/moth.yml
@@ -0,0 +1,91 @@
+- type: body
+  id: Moth
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadMoth
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesMoth
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestMoth
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinMoth
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachMoth
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmMoth
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmMoth
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandMoth
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandMoth
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegMoth
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegMoth
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootMoth
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootMoth
+    tail:
+      type: Tail
+    wings:
+      type: Wings
+      startingBodyPart: BodyPartWingsMoth
diff --git a/Resources/Prototypes/_White/Body/Species/plasmaman.yml b/Resources/Prototypes/_White/Body/Species/plasmaman.yml
new file mode 100644
index 00000000000..6301897d803
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/plasmaman.yml
@@ -0,0 +1,87 @@
+- type: body
+  id: Plasmaman
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadPlasmaman
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainPlasmaman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesPlasmaman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTonguePlasmaman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestPlasmaman
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartPlasmaman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsPlasmaman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinPlasmaman
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachPlasmaman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverPlasmaman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysPlasmaman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmPlasmaman
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmPlasmaman
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandPlasmaman
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandPlasmaman
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegPlasmaman
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegPlasmaman
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootPlasmaman
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootPlasmaman
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/reptilian.yml b/Resources/Prototypes/_White/Body/Species/reptilian.yml
new file mode 100644
index 00000000000..04cfa73264a
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/reptilian.yml
@@ -0,0 +1,94 @@
+- type: body
+  id: Reptilian
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadReptilian
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestReptilian
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinReptilian
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachReptilian
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+        appendix:
+          type: Appendix
+          startingOrgan: OrganAppendixHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmReptilian
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmReptilian
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandReptilian
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandReptilian
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegReptilian
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegReptilian
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootReptilian
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootReptilian
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailReptilian
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/resomi.yml b/Resources/Prototypes/_White/Body/Species/resomi.yml
new file mode 100644
index 00000000000..8a1eecd3040
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/resomi.yml
@@ -0,0 +1,91 @@
+- type: body
+  id: Resomi
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadResomi
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestResomi
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinResomi
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmResomi
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmResomi
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandResomi
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandResomi
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegResomi
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegResomi
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootResomi
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootResomi
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailResomi
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/shadow.yml b/Resources/Prototypes/_White/Body/Species/shadow.yml
new file mode 100644
index 00000000000..286ba0f790e
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/shadow.yml
@@ -0,0 +1,90 @@
+- type: body
+  id: Shadow
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadShadow
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestShadow
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinShadow
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmShadow
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmShadow
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandShadow
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandShadow
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegShadow
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegShadow
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootShadow
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootShadow
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/shadowkin.yml b/Resources/Prototypes/_White/Body/Species/shadowkin.yml
new file mode 100644
index 00000000000..53a6c8abf06
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/shadowkin.yml
@@ -0,0 +1,94 @@
+- type: body
+  id: Shadowkin
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadShadowkin
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainShadowkin
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsShadowkin
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesShadowkin
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueShadowkin
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestShadowkin
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartShadowkin
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsShadowkin
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinShadowkin
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachShadowkin
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverShadowkin
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysShadowkin
+        appendix:
+          type: Appendix
+          startingOrgan: OrganAppendixShadowkin
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmShadowkin
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmShadowkin
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandShadowkin
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandShadowkin
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegShadowkin
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegShadowkin
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootShadowkin
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootShadowkin
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailShadowkin
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/shadowling.yml b/Resources/Prototypes/_White/Body/Species/shadowling.yml
new file mode 100644
index 00000000000..ad1707d813d
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/shadowling.yml
@@ -0,0 +1,90 @@
+- type: body
+  id: Shadowling
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadShadowling
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestShadowling
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinShadowling
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmShadowling
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmShadowling
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandShadowling
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandShadowling
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegShadowling
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegShadowling
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootShadowling
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootShadowling
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/skeleton.yml b/Resources/Prototypes/_White/Body/Species/skeleton.yml
new file mode 100644
index 00000000000..7f9cbbe9fa3
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/skeleton.yml
@@ -0,0 +1,60 @@
+- type: body
+  id: Skeleton
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadSkeleton
+      connections:
+      - chest
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestSkeleton
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinSkeleton
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmSkeleton
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmSkeleton
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandSkeleton
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandSkeleton
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegSkeleton
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegSkeleton
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootSkeleton
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootSkeleton
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/slime.yml b/Resources/Prototypes/_White/Body/Species/slime.yml
new file mode 100644
index 00000000000..d70c167e1b7
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/slime.yml
@@ -0,0 +1,68 @@
+- type: body
+  id: Slime
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadSlime
+      connections:
+      - chest
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestSlime
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsSlime
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinSlime
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        core:
+          type: Core
+          startingOrgan: OrganCoreSlime
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmSlime
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmSlime
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandSlime
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandSlime
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegSlime
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegSlime
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootSlime
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootSlime
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/tajaran.yml b/Resources/Prototypes/_White/Body/Species/tajaran.yml
new file mode 100644
index 00000000000..60317cd81a3
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/tajaran.yml
@@ -0,0 +1,91 @@
+- type: body
+  id: Tajaran
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadTajaran
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestTajaran
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartAnimal
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinTajaran
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachVulpkanin
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmTajaran
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmTajaran
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandTajaran
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandTajaran
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegTajaran
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegTajaran
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootTajaran
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootTajaran
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailTajaran
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/thaven.yml b/Resources/Prototypes/_White/Body/Species/thaven.yml
new file mode 100644
index 00000000000..a307e5cdf0e
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/thaven.yml
@@ -0,0 +1,90 @@
+- type: body
+  id: Thaven
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadThaven
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainThaven
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestThaven
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinThaven
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmThaven
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmThaven
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandThaven
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandThaven
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegThaven
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegThaven
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootThaven
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootThaven
+    tail:
+      type: Tail
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Species/vox.yml b/Resources/Prototypes/_White/Body/Species/vox.yml
new file mode 100644
index 00000000000..c3fecba553c
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/vox.yml
@@ -0,0 +1,88 @@
+- type: body
+  id: Vox
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadVox
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesVox
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestVox
+      connections:
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartHuman
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsVox
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinVox
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachHuman
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverHuman
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmVox
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmVox
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandVox
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandVox
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegVox
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegVox
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootVox
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootVox
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailVox
diff --git a/Resources/Prototypes/_White/Body/Species/vulpkanin.yml b/Resources/Prototypes/_White/Body/Species/vulpkanin.yml
new file mode 100644
index 00000000000..9e5f1ec85a1
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/vulpkanin.yml
@@ -0,0 +1,92 @@
+- type: body
+  id: Vulpkanin
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadVulpkanin
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestVulpkanin
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartAnimal
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinVulpkanin
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachVulpkanin
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverAnimal
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysAnimal
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmVulpkanin
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmVulpkanin
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandVulpkanin
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandVulpkanin
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegVulpkanin
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegVulpkanin
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootVulpkanin
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootVulpkanin
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailVulpkanin
+    wings:
+      type: Wings
+
diff --git a/Resources/Prototypes/_White/Body/Species/xelthia.yml b/Resources/Prototypes/_White/Body/Species/xelthia.yml
new file mode 100644
index 00000000000..5ebf1582590
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Species/xelthia.yml
@@ -0,0 +1,91 @@
+- type: body
+  id: Xelthia
+  root: chest
+  bodyParts:
+    head:
+      type: Head
+      startingBodyPart: BodyPartHeadXelthia
+      connections:
+      - chest
+      organs:
+        brain:
+          type: Brain
+          startingOrgan: OrganBrainHuman
+        ears:
+          type: Ears
+          startingOrgan: OrganEarsHuman
+        eyes:
+          type: Eyes
+          startingOrgan: OrganEyesHuman
+        tongue:
+          type: Tongue
+          startingOrgan: OrganTongueHuman
+    chest:
+      type: Chest
+      startingBodyPart: BodyPartChestXelthia
+      connections:
+      - wings
+      - right_arm
+      - left_arm
+      - groin
+      organs:
+        heart:
+          type: Heart
+          startingOrgan: OrganHeartAnimal
+        lungs:
+          type: Lungs
+          startingOrgan: OrganLungsHuman
+    groin:
+      type: Groin
+      startingBodyPart: BodyPartGroinXelthia
+      connections:
+      - tail
+      - right_leg
+      - left_leg
+      organs:
+        stomach:
+          type: Stomach
+          startingOrgan: OrganStomachXelthia
+        liver:
+          type: Liver
+          startingOrgan: OrganLiverAnimal
+        kidneys:
+          type: Kidneys
+          startingOrgan: OrganKidneysHuman
+    left_arm:
+      type: LeftArm
+      startingBodyPart: BodyPartLeftArmXelthia
+      connections:
+      - left_hand
+    right_arm:
+      type: RightArm
+      startingBodyPart: BodyPartRightArmXelthia
+      connections:
+      - right_hand
+    left_hand:
+      type: LeftHand
+      startingBodyPart: BodyPartLeftHandXelthia
+    right_hand:
+      type: RightHand
+      startingBodyPart: BodyPartRightHandXelthia
+    left_leg:
+      type: LeftLeg
+      startingBodyPart: BodyPartLeftLegXelthia
+      connections:
+      - left_foot
+    right_leg:
+      type: RightLeg
+      startingBodyPart: BodyPartRightLegXelthia
+      connections:
+      - right_foot
+    left_foot:
+      type: LeftFoot
+      startingBodyPart: BodyPartLeftFootXelthia
+    right_foot:
+      type: RightFoot
+      startingBodyPart: BodyPartRightFootXelthia
+    tail:
+      type: Tail
+      startingBodyPart: BodyPartTailXelthia
+    wings:
+      type: Wings
diff --git a/Resources/Prototypes/_White/Body/Xenomorph/drone.yml b/Resources/Prototypes/_White/Body/Xenomorph/drone.yml
new file mode 100644
index 00000000000..2a46ea0f080
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Xenomorph/drone.yml
@@ -0,0 +1,30 @@
+- type: body
+  id: XenomorphDrone
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainXenomorph
+    eyes:
+      type: Eyes
+      startingOrgan: OrganEyesXenomorph
+    tongue:
+      type: Tongue
+      startingOrgan: OrganTongueXenomorph
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsLargeXenomorph
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachXenomorph
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverXenomorph
+    acid_gland:
+      type: Gland
+      startingOrgan: OrganGlandAcidXenomorph
+    hive_node:
+      type: Specific
+      startingOrgan: OrganHiveNodeXenomorph
+    resin_spinner:
+      type: Specific
+      startingOrgan: OrganResinSpinnerXenomorph
diff --git a/Resources/Prototypes/_White/Body/Xenomorph/hunter.yml b/Resources/Prototypes/_White/Body/Xenomorph/hunter.yml
new file mode 100644
index 00000000000..763ea99bb54
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Xenomorph/hunter.yml
@@ -0,0 +1,24 @@
+- type: body
+  id: XenomorphHunter
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainXenomorph
+    eyes:
+      type: Eyes
+      startingOrgan: OrganEyesXenomorph
+    tongue:
+      type: Tongue
+      startingOrgan: OrganTongueXenomorph
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsSmallXenomorph
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachXenomorph
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverXenomorph
+    hive_node:
+      type: Specific
+      startingOrgan: OrganHiveNodeXenomorph
diff --git a/Resources/Prototypes/_White/Body/Xenomorph/larva.yml b/Resources/Prototypes/_White/Body/Xenomorph/larva.yml
new file mode 100644
index 00000000000..d7bbace75fb
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Xenomorph/larva.yml
@@ -0,0 +1,24 @@
+- type: body
+  id: XenomorphLarva
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainXenomorph
+    eyes:
+      type: Eyes
+      startingOrgan: OrganEyesXenomorph
+    tongue:
+      type: Tongue
+      startingOrgan: OrganTongueXenomorph
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsTinyXenomorph
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachXenomorph
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverXenomorph
+    hive_node:
+      type: Specific
+      startingOrgan: OrganHiveNodeXenomorph
diff --git a/Resources/Prototypes/_White/Body/Xenomorph/maid.yml b/Resources/Prototypes/_White/Body/Xenomorph/maid.yml
new file mode 100644
index 00000000000..a68e35c81ac
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Xenomorph/maid.yml
@@ -0,0 +1,24 @@
+- type: body
+  id: XenomorphMaid
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainXenomorph
+    eyes:
+      type: Eyes
+      startingOrgan: OrganEyesXenomorph
+    tongue:
+      type: Tongue
+      startingOrgan: OrganTongueXenomorph
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsXenomorph
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachXenomorph
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverXenomorph
+    hive_node:
+      type: Specific
+      startingOrgan: OrganHiveNodeXenomorph
diff --git a/Resources/Prototypes/_White/Body/Xenomorph/praetorian.yml b/Resources/Prototypes/_White/Body/Xenomorph/praetorian.yml
new file mode 100644
index 00000000000..42c96184536
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Xenomorph/praetorian.yml
@@ -0,0 +1,33 @@
+- type: body
+  id: XenomorphPraetorian
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainXenomorph
+    eyes:
+      type: Eyes
+      startingOrgan: OrganEyesXenomorph
+    tongue:
+      type: Tongue
+      startingOrgan: OrganTongueXenomorph
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsLargeXenomorph
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachXenomorph
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverXenomorph
+    acid_gland:
+      type: Gland
+      startingOrgan: OrganGlandAcidXenomorph
+    neurotoxin_gland:
+      type: Gland
+      startingOrgan: OrganGlandNeurotoxinXenomorph
+    hive_node:
+      type: Specific
+      startingOrgan: OrganHiveNodeXenomorph
+    resin_spinner:
+      type: Specific
+      startingOrgan: OrganResinSpinnerXenomorph
diff --git a/Resources/Prototypes/_White/Body/Xenomorph/queen.yml b/Resources/Prototypes/_White/Body/Xenomorph/queen.yml
new file mode 100644
index 00000000000..229a99b4471
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Xenomorph/queen.yml
@@ -0,0 +1,36 @@
+- type: body
+  id: XenomorphQueen
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainXenomorph
+    eyes:
+      type: Eyes
+      startingOrgan: OrganEyesXenomorph
+    tongue:
+      type: Tongue
+      startingOrgan: OrganTongueXenomorph
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsLargeQueenXenomorph
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachXenomorph
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverXenomorph
+    acid_gland:
+      type: Gland
+      startingOrgan: OrganGlandAcidXenomorph
+    neurotoxin_gland:
+      type: Gland
+      startingOrgan: OrganGlandNeurotoxinXenomorph
+    egg_sack:
+      type: Specific
+      startingOrgan: OrganEggSackXenomorph
+    hive_node:
+      type: Specific
+      startingOrgan: OrganHiveNodeXenomorph
+    resin_spinner:
+      type: Specific
+      startingOrgan: OrganResinSpinnerXenomorph
diff --git a/Resources/Prototypes/_White/Body/Xenomorph/sentinel.yml b/Resources/Prototypes/_White/Body/Xenomorph/sentinel.yml
new file mode 100644
index 00000000000..3ee96b7b3dc
--- /dev/null
+++ b/Resources/Prototypes/_White/Body/Xenomorph/sentinel.yml
@@ -0,0 +1,30 @@
+- type: body
+  id: XenomorphSentinel
+  organs:
+    brain:
+      type: Brain
+      startingOrgan: OrganBrainXenomorph
+    eyes:
+      type: Eyes
+      startingOrgan: OrganEyesXenomorph
+    tongue:
+      type: Tongue
+      startingOrgan: OrganTongueXenomorph
+    lungs:
+      type: Lungs
+      startingOrgan: OrganLungsXenomorph
+    stomach:
+      type: Stomach
+      startingOrgan: OrganStomachXenomorph
+    liver:
+      type: Liver
+      startingOrgan: OrganLiverXenomorph
+    acid_gland:
+      type: Gland
+      startingOrgan: OrganGlandAcidXenomorph
+    neurotoxin_gland:
+      type: Gland
+      startingOrgan: OrganGlandNeurotoxinXenomorph
+    hive_node:
+      type: Specific
+      startingOrgan: OrganHiveNodeXenomorph
diff --git a/Resources/Prototypes/_White/BodyType/body_types.yml b/Resources/Prototypes/_White/BodyType/body_types.yml
new file mode 100644
index 00000000000..9b104b9ed7c
--- /dev/null
+++ b/Resources/Prototypes/_White/BodyType/body_types.yml
@@ -0,0 +1,9 @@
+- type: bodyType
+  id: Normal
+  name: body-normal
+
+- type: bodyType
+  id: Slim
+  name: body-slim
+  sexRestrictions:
+  - Male
diff --git a/Resources/Prototypes/_White/Chemistry/metabolism_stages.yml b/Resources/Prototypes/_White/Chemistry/metabolism_stages.yml
new file mode 100644
index 00000000000..37200dceab7
--- /dev/null
+++ b/Resources/Prototypes/_White/Chemistry/metabolism_stages.yml
@@ -0,0 +1,24 @@
+# Animal metabolism stages
+
+- type: metabolismStage
+  id: Respiration
+  name: metabolism-stage-respiration
+
+- type: metabolismStage
+  id: Digestion
+  name: metabolism-stage-digestion
+
+- type: metabolismStage
+  id: Absorption
+  name: metabolism-stage-absorption
+
+- type: metabolismStage
+  id: Excretion
+  name: metabolism-stage-excretion
+
+# Dummy for the guide
+
+- type: metabolismStage
+  id: PlantMetabolisms
+  name: metabolism-stage-plant
+
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Cyborgs/borg.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Cyborgs/borg.yml
new file mode 100644
index 00000000000..a9e101f3690
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Cyborgs/borg.yml
@@ -0,0 +1,114 @@
+- type: entity
+  id: BaseBodyPartBorg
+  parent: BaseBodyPart
+  abstract: true
+  name: borg body part
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+  - type: BodyPartAppearance
+    sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 25
+  - type: GuideHelp
+    guides:
+    - Cyborgs
+    - Robotics
+  - type: Tag
+    tags:
+    - Trash
+
+# Head
+- type: entity
+  id: BodyPartHeadBorg
+  parent: [BaseBodyPartHead, BaseBodyPartBorg]
+  name: borg head
+  components:
+  - type: Sprite
+    state: borg_head
+  - type: BodyPartAppearance
+    state: borg_head
+  - type: Tag
+    tags:
+    - Trash
+    - BorgHead
+
+# Torso
+- type: entity
+  id: BodyPartTorsoBorg
+  parent: [BaseBodyPartTorso, BaseBodyPartBorg]
+  name: borg torso
+  components:
+  - type: Sprite
+    state: borg_chest
+  - type: BodyPartAppearance
+    state: borg_chest
+  - type: Tag
+    tags:
+    - Trash
+    - BorgTorso
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmBorg
+  parent: [BaseBodyPartLeftArm, BaseBodyPartBorg]
+  name: borg left arm
+  components:
+  - type: Sprite
+    state: borg_l_arm
+  - type: BodyPartAppearance
+    state: borg_l_arm
+  - type: Tag
+    tags:
+    - Trash
+    - BorgArm
+    - BorgLArm
+
+- type: entity
+  id: BodyPartRightArmBorg
+  parent: [BaseBodyPartRightArm, BaseBodyPartBorg]
+  name: borg right arm
+  components:
+  - type: Sprite
+    state: borg_r_arm
+  - type: BodyPartAppearance
+    state: borg_r_arm
+  - type: Tag
+    tags:
+    - Trash
+    - BorgArm
+    - BorgRArm
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegBorg
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartBorg]
+  name: borg left leg
+  components:
+  - type: Sprite
+    state: borg_l_leg
+  - type: BodyPartAppearance
+    state: borg_l_leg
+  - type: Tag
+    tags:
+    - Trash
+    - BorgLeg
+    - BorgLLeg
+
+- type: entity
+  id: BodyPartRightLegBorg
+  parent: [BaseBodyPartRightLeg, BaseBodyPartBorg]
+  name: borg right leg
+  components:
+  - type: Sprite
+    state: borg_r_leg
+  - type: BodyPartAppearance
+    state: borg_r_leg
+  - type: Tag
+    tags:
+    - Trash
+    - BorgLeg
+    - BorgRLeg
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/NPCs/kobold.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/NPCs/kobold.yml
new file mode 100644
index 00000000000..e6717e61271
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/NPCs/kobold.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartKobold
+  parent: BaseBodyPart
+  abstract: true
+  name: kobold body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Animals/kobold.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Animals/kobold.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadKobold
+  parent: [BaseBodyPartHead, BaseBodyPartKobold]
+  name: kobold head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestKobold
+  parent: [BaseBodyPartChest, BaseBodyPartKobold]
+  name: kobold chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinKobold
+  parent: [BaseBodyPartGroin, BaseBodyPartKobold]
+  name: kobold groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmKobold
+  parent: [BaseBodyPartLeftArm, BaseBodyPartKobold]
+  name: kobold left arm
+
+- type: entity
+  id: BodyPartRightArmKobold
+  parent: [BaseBodyPartRightArm, BaseBodyPartKobold]
+  name: kobold right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandKobold
+  parent: [BaseBodyPartLeftHand, BaseBodyPartKobold]
+  name: kobold left hand
+
+- type: entity
+  id: BodyPartRightHandKobold
+  parent: [BaseBodyPartRightHand, BaseBodyPartKobold]
+  name: kobold right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegKobold
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartKobold]
+  name: kobold left leg
+
+- type: entity
+  id: BodyPartRightLegKobold
+  parent: [BaseBodyPartRightLeg, BaseBodyPartKobold]
+  name: kobold right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootKobold
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartKobold]
+  name: kobold left foot
+
+- type: entity
+  id: BodyPartRightFootKobold
+  parent: [BaseBodyPartRightFoot, BaseBodyPartKobold]
+  name: kobold right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/NPCs/monkey.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/NPCs/monkey.yml
new file mode 100644
index 00000000000..8bfc260ce09
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/NPCs/monkey.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartMonkey
+  parent: BaseBodyPart
+  abstract: true
+  name: monkey body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Animals/monkey.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Animals/monkey.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadMonkey
+  parent: [BaseBodyPartHead, BaseBodyPartMonkey]
+  name: monkey head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestMonkey
+  parent: [BaseBodyPartChest, BaseBodyPartMonkey]
+  name: monkey chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinMonkey
+  parent: [BaseBodyPartGroin, BaseBodyPartMonkey]
+  name: monkey groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmMonkey
+  parent: [BaseBodyPartLeftArm, BaseBodyPartMonkey]
+  name: monkey left arm
+
+- type: entity
+  id: BodyPartRightArmMonkey
+  parent: [BaseBodyPartRightArm, BaseBodyPartMonkey]
+  name: monkey right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandMonkey
+  parent: [BaseBodyPartLeftHand, BaseBodyPartMonkey]
+  name: monkey left hand
+
+- type: entity
+  id: BodyPartRightHandMonkey
+  parent: [BaseBodyPartRightHand, BaseBodyPartMonkey]
+  name: monkey right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegMonkey
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartMonkey]
+  name: monkey left leg
+
+- type: entity
+  id: BodyPartRightLegMonkey
+  parent: [BaseBodyPartRightLeg, BaseBodyPartMonkey]
+  name: monkey right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootMonkey
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartMonkey]
+  name: monkey left foot
+
+- type: entity
+  id: BodyPartRightFootMonkey
+  parent: [BaseBodyPartRightFoot, BaseBodyPartMonkey]
+  name: monkey right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/arachne.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/arachne.yml
new file mode 100644
index 00000000000..8c819ce200c
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/arachne.yml
@@ -0,0 +1,63 @@
+- type: entity
+  id: BaseBodyPartArachne
+  parent: BaseBodyPart
+  abstract: true
+  name: arachne body part
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: DemonsBlood
+        Quantity: 10
+
+# Groin
+- type: entity
+  id: BodyPartGroinArachne
+  parent: [BaseBodyPartGroin, BaseBodyPartArachne]
+  name: arachne thorax
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/arachne.rsi
+    state: spider_body # placeholder sprite
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Arachnid/parts.rsi
+    state: spider_body # placeholder sprite
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegArachne
+  parent: BaseBodyPartArachne
+  name: arachne left leg
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/meat.rsi # placeholder sprite
+    state: spiderleg
+  - type: Icon
+    sprite: Objects/Consumable/Food/meat.rsi
+    state: spiderleg
+  - type: BodyPart
+    bodyPartType: FullLeftLeg
+
+- type: entity
+  id: BodyPartRightLegArachne
+  parent: BaseBodyPartArachne
+  name: arachne right leg
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/meat.rsi # placeholder sprite
+    state: spiderleg
+  - type: Icon
+    sprite: Objects/Consumable/Food/meat.rsi
+    state: spiderleg
+  - type: BodyPart
+    bodyPartType: FullRightLeg
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/arachnid.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/arachnid.yml
new file mode 100644
index 00000000000..a0818f869b3
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/arachnid.yml
@@ -0,0 +1,135 @@
+- type: entity
+  id: BaseBodyPartArachnid
+  parent: BaseBodyPart
+  abstract: true
+  name: arachnid body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Arachnid/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Arachnid/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: CopperBlood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadArachnid
+  parent: [BaseBodyPartHead, BaseBodyPartArachnid]
+  name: arachnid head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: CopperBlood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestArachnid
+  parent: [BaseBodyPartChest, BaseBodyPartArachnid]
+  name: arachnid chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: CopperBlood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinArachnid
+  parent: [BaseBodyPartGroin, BaseBodyPartArachnid]
+  name: arachnid groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmArachnid
+  parent: [BaseBodyPartLeftArm, BaseBodyPartArachnid]
+  name: arachnid left arm
+
+- type: entity
+  id: BodyPartRightArmArachnid
+  parent: [BaseBodyPartRightArm, BaseBodyPartArachnid]
+  name: arachnid right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandArachnid
+  parent: [BaseBodyPartLeftHand, BaseBodyPartArachnid]
+  name: arachnid left hand
+
+- type: entity
+  id: BodyPartRightHandArachnid
+  parent: [BaseBodyPartRightHand, BaseBodyPartArachnid]
+  name: arachnid right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegArachnid
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartArachnid]
+  name: arachnid left leg
+
+- type: entity
+  id: BodyPartRightLegArachnid
+  parent: [BaseBodyPartRightLeg, BaseBodyPartArachnid]
+  name: arachnid right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootArachnid
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartArachnid]
+  name: arachnid left foot
+
+- type: entity
+  id: BodyPartRightFootArachnid
+  parent: [BaseBodyPartRightFoot, BaseBodyPartArachnid]
+  name: arachnid right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailArachnid
+  parent: [BaseBodyPartTail, BaseBodyPartArachnid]
+  name: arachnid tail
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: long_groin
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: long_groin
+
+# Wings
+
+- type: entity
+  id: BodyPartWingsArachnid
+  parent: [BaseBodyPartWings, BaseBodyPartArachnid]
+  name: arachnid wings
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: long_chest
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/Arachnid/appendages.rsi
+    state: long_chest
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/chitinid.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/chitinid.yml
new file mode 100644
index 00000000000..c3d12c4dfef
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/chitinid.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartChitinid
+  parent: BaseBodyPart
+  abstract: true
+  name: chitinid body part
+  components:
+  - type: Sprite
+    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
+  - type: BodyPartAppearance
+    sprite: DeltaV/Mobs/Species/Chitinid/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadChitinid
+  parent: [BaseBodyPartHead, BaseBodyPartChitinid]
+  name: chitinid head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestChitinid
+  parent: [BaseBodyPartChest, BaseBodyPartChitinid]
+  name: chitinid chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinChitinid
+  parent: [BaseBodyPartGroin, BaseBodyPartChitinid]
+  name: chitinid groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmChitinid
+  parent: [BaseBodyPartLeftArm, BaseBodyPartChitinid]
+  name: chitinid left arm
+
+- type: entity
+  id: BodyPartRightArmChitinid
+  parent: [BaseBodyPartRightArm, BaseBodyPartChitinid]
+  name: chitinid right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandChitinid
+  parent: [BaseBodyPartLeftHand, BaseBodyPartChitinid]
+  name: chitinid left hand
+
+- type: entity
+  id: BodyPartRightHandChitinid
+  parent: [BaseBodyPartRightHand, BaseBodyPartChitinid]
+  name: chitinid right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegChitinid
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartChitinid]
+  name: chitinid left leg
+
+- type: entity
+  id: BodyPartRightLegChitinid
+  parent: [BaseBodyPartRightLeg, BaseBodyPartChitinid]
+  name: chitinid right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootChitinid
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartChitinid]
+  name: chitinid left foot
+
+- type: entity
+  id: BodyPartRightFootChitinid
+  parent: [BaseBodyPartRightFoot, BaseBodyPartChitinid]
+  name: chitinid right foot
+
+# Wings
+
+- type: entity
+  id: BodyPartWingsChitinid
+  parent: [BaseBodyPartWings, BaseBodyPartChitinid]
+  name: chitinid wings
+  components:
+  - type: Sprite
+    sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
+    state: default
+  - type: BodyPartAppearance
+    sprite: DeltaV/Mobs/Customization/Chitinid/chitinid_wings.rsi
+    state: default
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/diona.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/diona.yml
new file mode 100644
index 00000000000..87d836a37af
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/diona.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartDiona
+  parent: BaseBodyPart
+  abstract: true
+  name: diona body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Diona/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Diona/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadDiona
+  parent: [BaseBodyPartHead, BaseBodyPartDiona]
+  name: diona head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestDiona
+  parent: [BaseBodyPartChest, BaseBodyPartDiona]
+  name: diona chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinDiona
+  parent: [BaseBodyPartGroin, BaseBodyPartDiona]
+  name: diona groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmDiona
+  parent: [BaseBodyPartLeftArm, BaseBodyPartDiona]
+  name: diona left arm
+
+- type: entity
+  id: BodyPartRightArmDiona
+  parent: [BaseBodyPartRightArm, BaseBodyPartDiona]
+  name: diona right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandDiona
+  parent: [BaseBodyPartLeftHand, BaseBodyPartDiona]
+  name: diona left hand
+
+- type: entity
+  id: BodyPartRightHandDiona
+  parent: [BaseBodyPartRightHand, BaseBodyPartDiona]
+  name: diona right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegDiona
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartDiona]
+  name: diona left leg
+
+- type: entity
+  id: BodyPartRightLegDiona
+  parent: [BaseBodyPartRightLeg, BaseBodyPartDiona]
+  name: diona right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootDiona
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartDiona]
+  name: diona left foot
+
+- type: entity
+  id: BodyPartRightFootDiona
+  parent: [BaseBodyPartRightFoot, BaseBodyPartDiona]
+  name: diona right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/felenid.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/felenid.yml
new file mode 100644
index 00000000000..1ed82d501e9
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/felenid.yml
@@ -0,0 +1,13 @@
+# Tail
+
+- type: entity
+  id: BodyPartTailFelinid
+  parent: [BaseBodyPartTail, BaseBodyPartHuman]
+  name: felinid tail
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/cat_parts.rsi
+    state: tail_cat
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/cat_parts.rsi
+    state: tail_cat
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/gingerbread.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/gingerbread.yml
new file mode 100644
index 00000000000..b17e2a2e218
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/gingerbread.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartGingerbread
+  parent: BaseBodyPart
+  abstract: true
+  name: gingerbread body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Gingerbread/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Gingerbread/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 3
+      - ReagentId: Sugar
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadGingerbread
+  parent: [BaseBodyPartHead, BaseBodyPartGingerbread]
+  name: gingerbread head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 5
+      - ReagentId: Sugar
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestGingerbread
+  parent: [BaseBodyPartChest, BaseBodyPartGingerbread]
+  name: gingerbread chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 10
+      - ReagentId: Sugar
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinGingerbread
+  parent: [BaseBodyPartGroin, BaseBodyPartGingerbread]
+  name: gingerbread groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 10
+      - ReagentId: Sugar
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmGingerbread
+  parent: [BaseBodyPartLeftArm, BaseBodyPartGingerbread]
+  name: gingerbread left arm
+
+- type: entity
+  id: BodyPartRightArmGingerbread
+  parent: [BaseBodyPartRightArm, BaseBodyPartGingerbread]
+  name: gingerbread right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandGingerbread
+  parent: [BaseBodyPartLeftHand, BaseBodyPartGingerbread]
+  name: gingerbread left hand
+
+- type: entity
+  id: BodyPartRightHandGingerbread
+  parent: [BaseBodyPartRightHand, BaseBodyPartGingerbread]
+  name: gingerbread right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegGingerbread
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartGingerbread]
+  name: gingerbread left leg
+
+- type: entity
+  id: BodyPartRightLegGingerbread
+  parent: [BaseBodyPartRightLeg, BaseBodyPartGingerbread]
+  name: gingerbread right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootGingerbread
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartGingerbread]
+  name: gingerbread left foot
+
+- type: entity
+  id: BodyPartRightFootGingerbread
+  parent: [BaseBodyPartRightFoot, BaseBodyPartGingerbread]
+  name: gingerbread right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/harpy.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/harpy.yml
new file mode 100644
index 00000000000..c7637082056
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/harpy.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartHarpy
+  parent: BaseBodyPart
+  abstract: true
+  name: harpy body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Harpy/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Harpy/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadHarpy
+  parent: [BaseBodyPartHead, BaseBodyPartHarpy]
+  name: harpy head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestHarpy
+  parent: [BaseBodyPartChest, BaseBodyPartHarpy]
+  name: harpy chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinHarpy
+  parent: [BaseBodyPartGroin, BaseBodyPartHarpy]
+  name: harpy groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmHarpy
+  parent: [BaseBodyPartLeftArm, BaseBodyPartHarpy]
+  name: harpy left arm
+
+- type: entity
+  id: BodyPartRightArmHarpy
+  parent: [BaseBodyPartRightArm, BaseBodyPartHarpy]
+  name: harpy right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandHarpy
+  parent: [BaseBodyPartLeftHand, BaseBodyPartHarpy]
+  name: harpy left hand
+
+- type: entity
+  id: BodyPartRightHandHarpy
+  parent: [BaseBodyPartRightHand, BaseBodyPartHarpy]
+  name: harpy right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegHarpy
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartHarpy]
+  name: harpy left leg
+
+- type: entity
+  id: BodyPartRightLegHarpy
+  parent: [BaseBodyPartRightLeg, BaseBodyPartHarpy]
+  name: harpy right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootHarpy
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartHarpy]
+  name: harpy left foot
+
+- type: entity
+  id: BodyPartRightFootHarpy
+  parent: [BaseBodyPartRightFoot, BaseBodyPartHarpy]
+  name: harpy right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailHarpy
+  parent: [BaseBodyPartTail, BaseBodyPartHarpy]
+  name: harpy tail
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+    state: phoenix_tail
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+    state: phoenix_tail
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/human.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/human.yml
new file mode 100644
index 00000000000..f1a122b7586
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/human.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartHuman
+  parent: BaseBodyPart
+  abstract: true
+  name: human body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Human/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadHuman
+  parent: [BaseBodyPartHead, BaseBodyPartHuman]
+  name: human head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestHuman
+  parent: [BaseBodyPartChest, BaseBodyPartHuman]
+  name: human chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinHuman
+  parent: [BaseBodyPartGroin, BaseBodyPartHuman]
+  name: human groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmHuman
+  parent: [BaseBodyPartLeftArm, BaseBodyPartHuman]
+  name: human left arm
+
+- type: entity
+  id: BodyPartRightArmHuman
+  parent: [BaseBodyPartRightArm, BaseBodyPartHuman]
+  name: human right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandHuman
+  parent: [BaseBodyPartLeftHand, BaseBodyPartHuman]
+  name: human left hand
+
+- type: entity
+  id: BodyPartRightHandHuman
+  parent: [BaseBodyPartRightHand, BaseBodyPartHuman]
+  name: human right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegHuman
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartHuman]
+  name: human left leg
+
+- type: entity
+  id: BodyPartRightLegHuman
+  parent: [BaseBodyPartRightLeg, BaseBodyPartHuman]
+  name: human right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootHuman
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartHuman]
+  name: human left foot
+
+- type: entity
+  id: BodyPartRightFootHuman
+  parent: [BaseBodyPartRightFoot, BaseBodyPartHuman]
+  name: human right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/ipc.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/ipc.yml
new file mode 100644
index 00000000000..a1b6fde3a5a
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/ipc.yml
@@ -0,0 +1,90 @@
+- type: entity
+  id: BaseBodyPartIPC
+  parent: BaseBodyPart
+  abstract: true
+  name: ipc body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/IPC/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/IPC/parts.rsi
+
+# Head
+- type: entity
+  id: BodyPartHeadIPC
+  parent: [BaseBodyPartHead, BaseBodyPartIPC]
+  name: ipc head
+
+# Chest
+- type: entity
+  id: BodyPartChestIPC
+  parent: [BaseBodyPartChest, BaseBodyPartIPC]
+  name: ipc chest
+
+# Groin
+- type: entity
+  id: BodyPartGroinIPC
+  parent: [BaseBodyPartGroin, BaseBodyPartIPC]
+  name: ipc groin
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmIPC
+  parent: [BaseBodyPartLeftArm, BaseBodyPartIPC]
+  name: ipc left arm
+
+- type: entity
+  id: BodyPartRightArmIPC
+  parent: [BaseBodyPartRightArm, BaseBodyPartIPC]
+  name: ipc right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandIPC
+  parent: [BaseBodyPartLeftHand, BaseBodyPartIPC]
+  name: ipc left hand
+
+- type: entity
+  id: BodyPartRightHandIPC
+  parent: [BaseBodyPartRightHand, BaseBodyPartIPC]
+  name: ipc right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegIPC
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartIPC]
+  name: ipc left leg
+
+- type: entity
+  id: BodyPartRightLegIPC
+  parent: [BaseBodyPartRightLeg, BaseBodyPartIPC]
+  name: ipc right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootIPC
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartIPC]
+  name: ipc left foot
+
+- type: entity
+  id: BodyPartRightFootIPC
+  parent: [BaseBodyPartRightFoot, BaseBodyPartIPC]
+  name: ipc right foot
+
+# Wings
+
+- type: entity
+  id: BodyPartWingsIPC
+  parent: [BaseBodyPartWings, BaseBodyPartIPC]
+  name: ipc wings
+  components:
+  - type: Sprite
+    sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi
+    state: robotic
+  - type: BodyPartAppearance
+    sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi
+    state: robotic
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/moth.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/moth.yml
new file mode 100644
index 00000000000..a6149fb249a
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/moth.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartMoth
+  parent: BaseBodyPart
+  abstract: true
+  name: moth body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Moth/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Moth/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadMoth
+  parent: [BaseBodyPartHead, BaseBodyPartMoth]
+  name: moth head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestMoth
+  parent: [BaseBodyPartChest, BaseBodyPartMoth]
+  name: moth chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinMoth
+  parent: [BaseBodyPartGroin, BaseBodyPartMoth]
+  name: moth groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmMoth
+  parent: [BaseBodyPartLeftArm, BaseBodyPartMoth]
+  name: moth left arm
+
+- type: entity
+  id: BodyPartRightArmMoth
+  parent: [BaseBodyPartRightArm, BaseBodyPartMoth]
+  name: moth right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandMoth
+  parent: [BaseBodyPartLeftHand, BaseBodyPartMoth]
+  name: moth left hand
+
+- type: entity
+  id: BodyPartRightHandMoth
+  parent: [BaseBodyPartRightHand, BaseBodyPartMoth]
+  name: moth right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegMoth
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartMoth]
+  name: moth left leg
+
+- type: entity
+  id: BodyPartRightLegMoth
+  parent: [BaseBodyPartRightLeg, BaseBodyPartMoth]
+  name: moth right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootMoth
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartMoth]
+  name: moth left foot
+
+- type: entity
+  id: BodyPartRightFootMoth
+  parent: [BaseBodyPartRightFoot, BaseBodyPartMoth]
+  name: moth right foot
+
+# Wings
+
+- type: entity
+  id: BodyPartWingsMoth
+  parent: [BaseBodyPartWings, BaseBodyPartMoth]
+  name: moth wings
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/Moth/moth_wings.rsi
+    state: default
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/Moth/moth_wings.rsi
+    state: default
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/plasmaman.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/plasmaman.yml
new file mode 100644
index 00000000000..376c315a557
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/plasmaman.yml
@@ -0,0 +1,159 @@
+- type: entity
+  id: BaseBodyPartPlasmaman
+  parent: BaseBodyPart
+  abstract: true
+  name: plasmaman body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Plasmaman/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Plasmaman/parts.rsi
+  - type: Butcherable
+    butcheringType: Knife
+    butcherDelay: 4.0
+    spawned:
+    - id: SheetPlasma1
+      amount: 1
+  - type: IgniteFromGasPart
+    gas: Oxygen
+
+# Head
+- type: entity
+  id: BodyPartHeadPlasmaman
+  parent: [BaseBodyPartHead, BaseBodyPartPlasmaman]
+  name: plasmaman head
+  components:
+  - type: Butcherable
+    butcherDelay: 5.0
+  - type: IgniteFromGasPart
+    fireStacks: 0.02
+
+# Chest
+- type: entity
+  id: BodyPartChestPlasmaman
+  parent: [BaseBodyPartChest, BaseBodyPartPlasmaman]
+  name: plasmaman chest
+  components:
+  - type: Butcherable
+    butcherDelay: 6.0
+    spawned:
+    - id: SheetPlasma1
+      amount: 3
+  - type: IgniteFromGasPart
+    fireStacks: 0.06
+
+# Groin
+- type: entity
+  id: BodyPartGroinPlasmaman
+  parent: [BaseBodyPartGroin, BaseBodyPartPlasmaman]
+  name: plasmaman groin
+  components:
+  - type: Butcherable
+    butcherDelay: 6.0
+    spawned:
+    - id: SheetPlasma1
+      amount: 3
+  - type: IgniteFromGasPart
+    fireStacks: 0.06
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmPlasmaman
+  parent: [BaseBodyPartLeftArm, BaseBodyPartPlasmaman]
+  name: plasmaman left arm
+  components:
+  - type: IgniteFromGasPart
+    fireStacks: 0.02
+
+- type: entity
+  id: BodyPartRightArmPlasmaman
+  parent: [BaseBodyPartRightArm, BaseBodyPartPlasmaman]
+  name: plasmaman right arm
+  components:
+  - type: IgniteFromGasPart
+    fireStacks: 0.02
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandPlasmaman
+  parent: [BaseBodyPartLeftHand, BaseBodyPartPlasmaman]
+  name: plasmaman left hand
+  components:
+  - type: Butcherable
+    butcherDelay: 3.0
+  - type: IgniteFromGasPart
+    fireStacks: 0.01
+
+- type: entity
+  id: BodyPartRightHandPlasmaman
+  parent: [BaseBodyPartRightHand, BaseBodyPartPlasmaman]
+  name: plasmaman right hand
+  components:
+  - type: Butcherable
+    butcherDelay: 3.0
+  - type: IgniteFromGasPart
+    fireStacks: 0.01
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegPlasmaman
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartPlasmaman]
+  name: plasmaman left leg
+  components:
+  - type: IgniteFromGasPart
+    fireStacks: 0.02
+
+- type: entity
+  id: BodyPartRightLegPlasmaman
+  parent: [BaseBodyPartRightLeg, BaseBodyPartPlasmaman]
+  name: plasmaman right leg
+  components:
+  - type: IgniteFromGasPart
+    fireStacks: 0.02
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootPlasmaman
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartPlasmaman]
+  name: plasmaman left foot
+  components:
+  - type: Butcherable
+    butcherDelay: 3.0
+  - type: IgniteFromGasPart
+    fireStacks: 0.01
+
+- type: entity
+  id: BodyPartRightFootPlasmaman
+  parent: [BaseBodyPartRightFoot, BaseBodyPartPlasmaman]
+  name: plasmaman right foot
+  components:
+  - type: Butcherable
+    butcherDelay: 3.0
+  - type: IgniteFromGasPart
+    fireStacks: 0.01
+
+# Wings
+
+- type: entity
+  id: BodyPartWingsPlasmaman
+  parent: [BaseBodyPartWings, BaseBodyPartPlasmaman]
+  name: plasmaman wings
+  components:
+  - type: Sprite
+    sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi
+    state: skeleton
+  - type: BodyPartAppearance
+    sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi
+    state: skeleton
+  - type: Butcherable
+    butcherDelay: 6.0
+    spawned:
+    - id: SheetPlasma1
+      amount: 3
+  - type: IgniteFromGasPart
+    fireStacks: 0.06
+
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/reptilian.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/reptilian.yml
new file mode 100644
index 00000000000..e21e1e7945f
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/reptilian.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartReptilian
+  parent: BaseBodyPart
+  abstract: true
+  name: reptilian body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Reptilian/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Reptilian/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadReptilian
+  parent: [BaseBodyPartHead, BaseBodyPartReptilian]
+  name: reptilian head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestReptilian
+  parent: [BaseBodyPartChest, BaseBodyPartReptilian]
+  name: reptilian chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinReptilian
+  parent: [BaseBodyPartGroin, BaseBodyPartReptilian]
+  name: reptilian groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmReptilian
+  parent: [BaseBodyPartLeftArm, BaseBodyPartReptilian]
+  name: reptilian left arm
+
+- type: entity
+  id: BodyPartRightArmReptilian
+  parent: [BaseBodyPartRightArm, BaseBodyPartReptilian]
+  name: reptilian right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandReptilian
+  parent: [BaseBodyPartLeftHand, BaseBodyPartReptilian]
+  name: reptilian left hand
+
+- type: entity
+  id: BodyPartRightHandReptilian
+  parent: [BaseBodyPartRightHand, BaseBodyPartReptilian]
+  name: reptilian right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegReptilian
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartReptilian]
+  name: reptilian left leg
+
+- type: entity
+  id: BodyPartRightLegReptilian
+  parent: [BaseBodyPartRightLeg, BaseBodyPartReptilian]
+  name: reptilian right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootReptilian
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartReptilian]
+  name: reptilian left foot
+
+- type: entity
+  id: BodyPartRightFootReptilian
+  parent: [BaseBodyPartRightFoot, BaseBodyPartReptilian]
+  name: reptilian right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailReptilian
+  parent: [BaseBodyPartTail, BaseBodyPartReptilian]
+  name: reptilian tail
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/reptilian_parts.rsi
+    state: tail_smooth
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/reptilian_parts.rsi
+    state: tail_smooth
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/resomi.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/resomi.yml
new file mode 100644
index 00000000000..756ab3b2c5c
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/resomi.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartResomi
+  parent: BaseBodyPart
+  abstract: true
+  name: resomi body part
+  components:
+  - type: Sprite
+    sprite: _White/Mobs/Species/Resomi/parts.rsi
+  - type: BodyPartAppearance
+    sprite: _White/Mobs/Species/Resomi/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadResomi
+  parent: [BaseBodyPartHead, BaseBodyPartResomi]
+  name: resomi head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestResomi
+  parent: [BaseBodyPartChest, BaseBodyPartResomi]
+  name: resomi chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinResomi
+  parent: [BaseBodyPartGroin, BaseBodyPartResomi]
+  name: resomi groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmResomi
+  parent: [BaseBodyPartLeftArm, BaseBodyPartResomi]
+  name: resomi left arm
+
+- type: entity
+  id: BodyPartRightArmResomi
+  parent: [BaseBodyPartRightArm, BaseBodyPartResomi]
+  name: resomi right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandResomi
+  parent: [BaseBodyPartLeftHand, BaseBodyPartResomi]
+  name: resomi left hand
+
+- type: entity
+  id: BodyPartRightHandResomi
+  parent: [BaseBodyPartRightHand, BaseBodyPartResomi]
+  name: resomi right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegResomi
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartResomi]
+  name: resomi left leg
+
+- type: entity
+  id: BodyPartRightLegResomi
+  parent: [BaseBodyPartRightLeg, BaseBodyPartResomi]
+  name: resomi right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootResomi
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartResomi]
+  name: resomi left foot
+
+- type: entity
+  id: BodyPartRightFootResomi
+  parent: [BaseBodyPartRightFoot, BaseBodyPartResomi]
+  name: resomi right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailResomi
+  parent: [BaseBodyPartTail, BaseBodyPartResomi]
+  name: resomi tail
+  components:
+  - type: Sprite
+    sprite: _White/Mobs/Customization/resomi_parts.rsi
+    state: tail
+  - type: BodyPartAppearance
+    sprite: _White/Mobs/Customization/resomi_parts.rsi
+    state: tail
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadow.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadow.yml
new file mode 100644
index 00000000000..e8bbdd9937d
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadow.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartShadow
+  parent: BaseBodyPart
+  abstract: true
+  name: shadow body part
+  components:
+  - type: Sprite
+    sprite: _EE/Mobs/Species/Shadow/parts.rsi
+  - type: BodyPartAppearance
+    sprite: _EE/Mobs/Species/Shadow/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 3
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadShadow
+  parent: [BaseBodyPartHead, BaseBodyPartShadow]
+  name: shadow head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 5
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestShadow
+  parent: [BaseBodyPartChest, BaseBodyPartShadow]
+  name: shadow chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 10
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinShadow
+  parent: [BaseBodyPartGroin, BaseBodyPartShadow]
+  name: shadow groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 10
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmShadow
+  parent: [BaseBodyPartLeftArm, BaseBodyPartShadow]
+  name: shadow left arm
+
+- type: entity
+  id: BodyPartRightArmShadow
+  parent: [BaseBodyPartRightArm, BaseBodyPartShadow]
+  name: shadow right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandShadow
+  parent: [BaseBodyPartLeftHand, BaseBodyPartShadow]
+  name: shadow left hand
+
+- type: entity
+  id: BodyPartRightHandShadow
+  parent: [BaseBodyPartRightHand, BaseBodyPartShadow]
+  name: shadow right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegShadow
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartShadow]
+  name: shadow left leg
+
+- type: entity
+  id: BodyPartRightLegShadow
+  parent: [BaseBodyPartRightLeg, BaseBodyPartShadow]
+  name: shadow right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootShadow
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartShadow]
+  name: shadow left foot
+
+- type: entity
+  id: BodyPartRightFootShadow
+  parent: [BaseBodyPartRightFoot, BaseBodyPartShadow]
+  name: shadow right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadowkin.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadowkin.yml
new file mode 100644
index 00000000000..5f18f07ceac
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadowkin.yml
@@ -0,0 +1,90 @@
+- type: entity
+  id: BaseBodyPartShadowkin
+  parent: BaseBodyPart
+  abstract: true
+  name: shadowkin body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Shadowkin/parts.rsi
+
+# Head
+- type: entity
+  id: BodyPartHeadShadowkin
+  parent: [BaseBodyPartHead, BaseBodyPartShadowkin]
+  name: shadowkin head
+
+# Chest
+- type: entity
+  id: BodyPartChestShadowkin
+  parent: [BaseBodyPartChest, BaseBodyPartShadowkin]
+  name: shadowkin chest
+
+# Groin
+- type: entity
+  id: BodyPartGroinShadowkin
+  parent: [BaseBodyPartGroin, BaseBodyPartShadowkin]
+  name: shadowkin groin
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmShadowkin
+  parent: [BaseBodyPartLeftArm, BaseBodyPartShadowkin]
+  name: shadowkin left arm
+
+- type: entity
+  id: BodyPartRightArmShadowkin
+  parent: [BaseBodyPartRightArm, BaseBodyPartShadowkin]
+  name: shadowkin right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandShadowkin
+  parent: [BaseBodyPartLeftHand, BaseBodyPartShadowkin]
+  name: shadowkin left hand
+
+- type: entity
+  id: BodyPartRightHandShadowkin
+  parent: [BaseBodyPartRightHand, BaseBodyPartShadowkin]
+  name: shadowkin right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegShadowkin
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartShadowkin]
+  name: shadowkin left leg
+
+- type: entity
+  id: BodyPartRightLegShadowkin
+  parent: [BaseBodyPartRightLeg, BaseBodyPartShadowkin]
+  name: shadowkin right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootShadowkin
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartShadowkin]
+  name: shadowkin left foot
+
+- type: entity
+  id: BodyPartRightFootShadowkin
+  parent: [BaseBodyPartRightFoot, BaseBodyPartShadowkin]
+  name: shadowkin right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailShadowkin
+  parent: [BaseBodyPartTail, BaseBodyPartShadowkin]
+  name: shadowkin tail
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/Shadowkin/tails64x32.rsi
+    state: shadowkin
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/Shadowkin/tails64x32.rsi
+    state: shadowkin
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadowling.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadowling.yml
new file mode 100644
index 00000000000..1edb3088003
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/shadowling.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartShadowling
+  parent: BaseBodyPart
+  abstract: true
+  name: shadowling body part
+  components:
+  - type: Sprite
+    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
+  - type: BodyPartAppearance
+    sprite: _EE/Mobs/Species/Shadowling/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 3
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadShadowling
+  parent: [BaseBodyPartHead, BaseBodyPartShadowling]
+  name: shadowling head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 5
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestShadowling
+  parent: [BaseBodyPartChest, BaseBodyPartShadowling]
+  name: shadowling chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 10
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinShadowling
+  parent: [BaseBodyPartGroin, BaseBodyPartShadowling]
+  name: shadowling groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Nutriment
+        Quantity: 10
+      - ReagentId: FluorosulfuricAcid
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmShadowling
+  parent: [BaseBodyPartLeftArm, BaseBodyPartShadowling]
+  name: shadowling left arm
+
+- type: entity
+  id: BodyPartRightArmShadowling
+  parent: [BaseBodyPartRightArm, BaseBodyPartShadowling]
+  name: shadowling right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandShadowling
+  parent: [BaseBodyPartLeftHand, BaseBodyPartShadowling]
+  name: shadowling left hand
+
+- type: entity
+  id: BodyPartRightHandShadowling
+  parent: [BaseBodyPartRightHand, BaseBodyPartShadowling]
+  name: shadowling right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegShadowling
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartShadowling]
+  name: shadowling left leg
+
+- type: entity
+  id: BodyPartRightLegShadowling
+  parent: [BaseBodyPartRightLeg, BaseBodyPartShadowling]
+  name: shadowling right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootShadowling
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartShadowling]
+  name: shadowling left foot
+
+- type: entity
+  id: BodyPartRightFootShadowling
+  parent: [BaseBodyPartRightFoot, BaseBodyPartShadowling]
+  name: shadowling right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/skeleton.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/skeleton.yml
new file mode 100644
index 00000000000..5d57c7b7067
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/skeleton.yml
@@ -0,0 +1,101 @@
+- type: entity
+  id: BaseBodyPartSkeleton
+  parent: BaseBodyPart
+  abstract: true
+  name: skeleton body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Skeleton/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Skeleton/parts.rsi
+
+# Head
+- type: entity
+  id: BodyPartHeadSkeleton
+  parent: [BaseBodyPartHead, BaseBodyPartSkeleton]
+  name: skeleton head
+  components:
+  - type: Input
+    context: "human"
+  - type: Speech
+    speechVerb: Skeleton
+  - type: SkeletonAccent
+  - type: Actions
+  - type: Vocal
+    sounds:
+      Male: Skeleton
+      Female: Skeleton
+      Unsexed: Skeleton
+  - type: Emoting
+  - type: Grammar
+    attributes:
+      proper: true
+  - type: Examiner
+  - type: DoAfter
+  - type: MobState
+    allowedStates:
+    - Alive
+  - type: Tag
+    tags:
+    - MindTransferTarget
+    - Head
+
+# Chest
+- type: entity
+  id: BodyPartChestSkeleton
+  parent: [BaseBodyPartChest, BaseBodyPartSkeleton]
+  name: skeleton chest
+
+# Groin
+- type: entity
+  id: BodyPartGroinSkeleton
+  parent: [BaseBodyPartGroin, BaseBodyPartSkeleton]
+  name: skeleton groin
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmSkeleton
+  parent: [BaseBodyPartLeftArm, BaseBodyPartSkeleton]
+  name: skeleton left arm
+
+- type: entity
+  id: BodyPartRightArmSkeleton
+  parent: [BaseBodyPartRightArm, BaseBodyPartSkeleton]
+  name: skeleton right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandSkeleton
+  parent: [BaseBodyPartLeftHand, BaseBodyPartSkeleton]
+  name: skeleton left hand
+
+- type: entity
+  id: BodyPartRightHandSkeleton
+  parent: [BaseBodyPartRightHand, BaseBodyPartSkeleton]
+  name: skeleton right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegSkeleton
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartSkeleton]
+  name: skeleton left leg
+
+- type: entity
+  id: BodyPartRightLegSkeleton
+  parent: [BaseBodyPartRightLeg, BaseBodyPartSkeleton]
+  name: skeleton right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootSkeleton
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartSkeleton]
+  name: skeleton left foot
+
+- type: entity
+  id: BodyPartRightFootSkeleton
+  parent: [BaseBodyPartRightFoot, BaseBodyPartSkeleton]
+  name: skeleton right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/slime.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/slime.yml
new file mode 100644
index 00000000000..4ed709784f2
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/slime.yml
@@ -0,0 +1,76 @@
+- type: entity
+  id: BaseBodyPartSlime
+  parent: BaseBodyPart
+  abstract: true
+  name: slime body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Slime/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Slime/parts.rsi
+
+# Head
+- type: entity
+  id: BodyPartHeadSlime
+  parent: [BaseBodyPartHead, BaseBodyPartSlime]
+  name: slime head
+
+# Chest
+- type: entity
+  id: BodyPartChestSlime
+  parent: [BaseBodyPartChest, BaseBodyPartSlime]
+  name: slime chest
+
+# Groin
+- type: entity
+  id: BodyPartGroinSlime
+  parent: [BaseBodyPartGroin, BaseBodyPartSlime]
+  name: slime groin
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmSlime
+  parent: [BaseBodyPartLeftArm, BaseBodyPartSlime]
+  name: slime left arm
+
+- type: entity
+  id: BodyPartRightArmSlime
+  parent: [BaseBodyPartRightArm, BaseBodyPartSlime]
+  name: slime right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandSlime
+  parent: [BaseBodyPartLeftHand, BaseBodyPartSlime]
+  name: slime left hand
+
+- type: entity
+  id: BodyPartRightHandSlime
+  parent: [BaseBodyPartRightHand, BaseBodyPartSlime]
+  name: slime right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegSlime
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartSlime]
+  name: slime left leg
+
+- type: entity
+  id: BodyPartRightLegSlime
+  parent: [BaseBodyPartRightLeg, BaseBodyPartSlime]
+  name: slime right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootSlime
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartSlime]
+  name: slime left foot
+
+- type: entity
+  id: BodyPartRightFootSlime
+  parent: [BaseBodyPartRightFoot, BaseBodyPartSlime]
+  name: slime right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/tajaran.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/tajaran.yml
new file mode 100644
index 00000000000..1269e59f83c
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/tajaran.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartTajaran
+  parent: BaseBodyPart
+  abstract: true
+  name: tajaran body part
+  components:
+  - type: Sprite
+    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
+  - type: BodyPartAppearance
+    sprite: _EE/Mobs/Species/Tajaran/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadTajaran
+  parent: [BaseBodyPartHead, BaseBodyPartTajaran]
+  name: tajaran head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestTajaran
+  parent: [BaseBodyPartChest, BaseBodyPartTajaran]
+  name: tajaran chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinTajaran
+  parent: [BaseBodyPartGroin, BaseBodyPartTajaran]
+  name: tajaran groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmTajaran
+  parent: [BaseBodyPartLeftArm, BaseBodyPartTajaran]
+  name: tajaran left arm
+
+- type: entity
+  id: BodyPartRightArmTajaran
+  parent: [BaseBodyPartRightArm, BaseBodyPartTajaran]
+  name: tajaran right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandTajaran
+  parent: [BaseBodyPartLeftHand, BaseBodyPartTajaran]
+  name: tajaran left hand
+
+- type: entity
+  id: BodyPartRightHandTajaran
+  parent: [BaseBodyPartRightHand, BaseBodyPartTajaran]
+  name: tajaran right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegTajaran
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartTajaran]
+  name: tajaran left leg
+
+- type: entity
+  id: BodyPartRightLegTajaran
+  parent: [BaseBodyPartRightLeg, BaseBodyPartTajaran]
+  name: tajaran right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootTajaran
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartTajaran]
+  name: tajaran left foot
+
+- type: entity
+  id: BodyPartRightFootTajaran
+  parent: [BaseBodyPartRightFoot, BaseBodyPartTajaran]
+  name: tajaran right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailTajaran
+  parent: [BaseBodyPartTail, BaseBodyPartTajaran]
+  name: tajaran tail
+  components:
+  - type: Sprite
+    sprite: _EE/Mobs/Customization/Tajaran/tails.rsi
+    state: tail
+  - type: BodyPartAppearance
+    sprite: _EE/Mobs/Customization/Tajaran/tails.rsi
+    state: tail
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/thaven.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/thaven.yml
new file mode 100644
index 00000000000..14371fcdbcf
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/thaven.yml
@@ -0,0 +1,107 @@
+- type: entity
+  id: BaseBodyPartThaven
+  parent: BaseBodyPart
+  abstract: true
+  name: thaven body part
+  components:
+  - type: Sprite
+    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
+  - type: BodyPartAppearance
+    sprite: _Impstation/Mobs/Species/Thaven/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadThaven
+  parent: [BaseBodyPartHead, BaseBodyPartThaven]
+  name: thaven head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestThaven
+  parent: [BaseBodyPartChest, BaseBodyPartThaven]
+  name: thaven chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinThaven
+  parent: [BaseBodyPartGroin, BaseBodyPartThaven]
+  name: thaven groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmThaven
+  parent: [BaseBodyPartLeftArm, BaseBodyPartThaven]
+  name: thaven left arm
+
+- type: entity
+  id: BodyPartRightArmThaven
+  parent: [BaseBodyPartRightArm, BaseBodyPartThaven]
+  name: thaven right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandThaven
+  parent: [BaseBodyPartLeftHand, BaseBodyPartThaven]
+  name: thaven left hand
+
+- type: entity
+  id: BodyPartRightHandThaven
+  parent: [BaseBodyPartRightHand, BaseBodyPartThaven]
+  name: thaven right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegThaven
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartThaven]
+  name: thaven left leg
+
+- type: entity
+  id: BodyPartRightLegThaven
+  parent: [BaseBodyPartRightLeg, BaseBodyPartThaven]
+  name: thaven right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootThaven
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartThaven]
+  name: thaven left foot
+
+- type: entity
+  id: BodyPartRightFootThaven
+  parent: [BaseBodyPartRightFoot, BaseBodyPartThaven]
+  name: thaven right foot
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/vox.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/vox.yml
new file mode 100644
index 00000000000..fbb79d26b4e
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/vox.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartVox
+  parent: BaseBodyPart
+  abstract: true
+  name: vox body part
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/parts.rsi
+  - type: BodyPartAppearance
+    sprite: Mobs/Species/Vox/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadVox
+  parent: [BaseBodyPartHead, BaseBodyPartVox]
+  name: vox head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestVox
+  parent: [BaseBodyPartChest, BaseBodyPartVox]
+  name: vox chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinVox
+  parent: [BaseBodyPartGroin, BaseBodyPartVox]
+  name: vox groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmVox
+  parent: [BaseBodyPartLeftArm, BaseBodyPartVox]
+  name: vox left arm
+
+- type: entity
+  id: BodyPartRightArmVox
+  parent: [BaseBodyPartRightArm, BaseBodyPartVox]
+  name: vox right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandVox
+  parent: [BaseBodyPartLeftHand, BaseBodyPartVox]
+  name: vox left hand
+
+- type: entity
+  id: BodyPartRightHandVox
+  parent: [BaseBodyPartRightHand, BaseBodyPartVox]
+  name: vox right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegVox
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartVox]
+  name: vox left leg
+
+- type: entity
+  id: BodyPartRightLegVox
+  parent: [BaseBodyPartRightLeg, BaseBodyPartVox]
+  name: vox right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootVox
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartVox]
+  name: vox left foot
+
+- type: entity
+  id: BodyPartRightFootVox
+  parent: [BaseBodyPartRightFoot, BaseBodyPartVox]
+  name: vox right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailVox
+  parent: [BaseBodyPartTail, BaseBodyPartVox]
+  name: vox tail
+  components:
+  - type: Sprite
+    sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_stenciled
+  - type: BodyPartAppearance
+    sprite: Mobs/Customization/vox_parts.rsi
+    state: tail_stenciled
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/vulpkanin.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/vulpkanin.yml
new file mode 100644
index 00000000000..4580bec90ae
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/vulpkanin.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartVulpkanin
+  parent: BaseBodyPart
+  abstract: true
+  name: vulpkanin body part
+  components:
+  - type: Sprite
+    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
+  - type: BodyPartAppearance
+    sprite: DeltaV/Mobs/Species/Vulpkanin/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadVulpkanin
+  parent: [BaseBodyPartHead, BaseBodyPartVulpkanin]
+  name: vulpkanin head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestVulpkanin
+  parent: [BaseBodyPartChest, BaseBodyPartVulpkanin]
+  name: vulpkanin chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinVulpkanin
+  parent: [BaseBodyPartGroin, BaseBodyPartVulpkanin]
+  name: vulpkanin groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmVulpkanin
+  parent: [BaseBodyPartLeftArm, BaseBodyPartVulpkanin]
+  name: vulpkanin left arm
+
+- type: entity
+  id: BodyPartRightArmVulpkanin
+  parent: [BaseBodyPartRightArm, BaseBodyPartVulpkanin]
+  name: vulpkanin right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandVulpkanin
+  parent: [BaseBodyPartLeftHand, BaseBodyPartVulpkanin]
+  name: vulpkanin left hand
+
+- type: entity
+  id: BodyPartRightHandVulpkanin
+  parent: [BaseBodyPartRightHand, BaseBodyPartVulpkanin]
+  name: vulpkanin right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegVulpkanin
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartVulpkanin]
+  name: vulpkanin left leg
+
+- type: entity
+  id: BodyPartRightLegVulpkanin
+  parent: [BaseBodyPartRightLeg, BaseBodyPartVulpkanin]
+  name: vulpkanin right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootVulpkanin
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartVulpkanin]
+  name: vulpkanin left foot
+
+- type: entity
+  id: BodyPartRightFootVulpkanin
+  parent: [BaseBodyPartRightFoot, BaseBodyPartVulpkanin]
+  name: vulpkanin right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailVulpkanin
+  parent: [BaseBodyPartTail, BaseBodyPartVulpkanin]
+  name: vulpkanin tail
+  components:
+  - type: Sprite
+    sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
+    state: vulp
+  - type: BodyPartAppearance
+    sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
+    state: vulp
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/xelthia.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/xelthia.yml
new file mode 100644
index 00000000000..a80d3c3be98
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/Species/xelthia.yml
@@ -0,0 +1,121 @@
+- type: entity
+  id: BaseBodyPartXelthia
+  parent: BaseBodyPart
+  abstract: true
+  name: xelthia body part
+  components:
+  - type: Sprite
+    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
+  - type: BodyPartAppearance
+    sprite: _EE/Mobs/Species/Xelthia/parts.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 3
+      - ReagentId: Blood
+        Quantity: 10
+
+# Head
+- type: entity
+  id: BodyPartHeadXelthia
+  parent: [BaseBodyPartHead, BaseBodyPartXelthia]
+  name: xelthia head
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 5
+      - ReagentId: Blood
+        Quantity: 10
+
+# Chest
+- type: entity
+  id: BodyPartChestXelthia
+  parent: [BaseBodyPartChest, BaseBodyPartXelthia]
+  name: xelthia chest
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Groin
+- type: entity
+  id: BodyPartGroinXelthia
+  parent: [BaseBodyPartGroin, BaseBodyPartXelthia]
+  name: xelthia groin
+  components:
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: Fat
+        Quantity: 10
+      - ReagentId: Blood
+        Quantity: 20
+
+# Arms
+
+- type: entity
+  id: BodyPartLeftArmXelthia
+  parent: [BaseBodyPartLeftArm, BaseBodyPartXelthia]
+  name: xelthia left arm
+
+- type: entity
+  id: BodyPartRightArmXelthia
+  parent: [BaseBodyPartRightArm, BaseBodyPartXelthia]
+  name: xelthia right arm
+
+# Hand
+
+- type: entity
+  id: BodyPartLeftHandXelthia
+  parent: [BaseBodyPartLeftHand, BaseBodyPartXelthia]
+  name: xelthia left hand
+
+- type: entity
+  id: BodyPartRightHandXelthia
+  parent: [BaseBodyPartRightHand, BaseBodyPartXelthia]
+  name: xelthia right hand
+
+# Leg
+
+- type: entity
+  id: BodyPartLeftLegXelthia
+  parent: [BaseBodyPartLeftLeg, BaseBodyPartXelthia]
+  name: xelthia left leg
+
+- type: entity
+  id: BodyPartRightLegXelthia
+  parent: [BaseBodyPartRightLeg, BaseBodyPartXelthia]
+  name: xelthia right leg
+
+# Foot
+
+- type: entity
+  id: BodyPartLeftFootXelthia
+  parent: [BaseBodyPartLeftFoot, BaseBodyPartXelthia]
+  name: xelthia left foot
+
+- type: entity
+  id: BodyPartRightFootXelthia
+  parent: [BaseBodyPartRightFoot, BaseBodyPartXelthia]
+  name: xelthia right foot
+
+# Tail
+
+- type: entity
+  id: BodyPartTailXelthia
+  parent: [BaseBodyPartTail, BaseBodyPartXelthia]
+  name: xelthia tail
+  components:
+  - type: Sprite
+    sprite: _EE/Mobs/Customization/xelthia_parts.rsi
+    state: tail_normal
+  - type: BodyPartAppearance
+    sprite: _EE/Mobs/Customization/xelthia_parts.rsi
+    state: tail_normal
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/base.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/base.yml
new file mode 100644
index 00000000000..f7e22054427
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/base.yml
@@ -0,0 +1,373 @@
+- type: entity
+  id: BaseBodyPart
+  parent: BaseItem
+  abstract: true
+  name: body part
+  components:
+  - type: BodyPart
+  - type: Damageable
+  - type: WoundableBodyPart
+  - type: PainfulBodyPart
+  - type: BleedingBodyPart
+
+- type: entity
+  id: BaseAmputatableBodyPart
+  abstract: true
+  components:
+  - type: AmputatableBodyPart
+    wound: WoundScarAmputation
+    supportedDamageType:
+      Slash: 1
+      Blunt: 0.3
+    chanceThresholds:
+      0: 0
+      40: 0.1
+      60: 0.4
+      90: 0.7
+      100: 1
+    boneMultiplierThresholds:
+      Whole: 0.3
+      Damaged: 0.6
+      Cracked: 1
+      Broken: 1.2
+  - type: GibbableBodyPart
+    wound: WoundScarAmputation
+    supportedDamageType:
+      Blunt: 1
+      Slash: 0.3
+    chanceThresholds:
+      0: 0
+      40: 0.1
+      70: 0.4
+      110: 0.7
+      150: 1
+    boneMultiplierThresholds:
+      Whole: 0.2
+      Damaged: 0.5
+      Cracked: 0.8
+      Broken: 1
+  - type: Gibbable
+
+# Head
+- type: entity
+  id: BaseBodyPartHead
+  parent: [BaseBodyPart, BaseAmputatableBodyPart]
+  abstract: true
+  name: head
+  components:
+  - type: Sprite
+    state: head
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.Head
+    state: head
+  - type: BodyPart
+    bodyPartType: Head
+  - type: Input
+    context: "ghost"
+  - type: Tag
+    tags:
+    - Head
+
+# Torso
+- type: entity
+  id: BaseBodyPartTorso
+  parent: BaseBodyPart
+  abstract: true
+  name: torso
+  components:
+  - type: Sprite
+    state: torso
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.Chest
+    state: torso
+  - type: BodyPart
+    bodyPartType: Torso
+
+# Chest
+- type: entity
+  id: BaseBodyPartChest
+  parent: BaseBodyPart
+  abstract: true
+  name: chest
+  components:
+  - type: Sprite
+    state: chest
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.Chest
+    state: chest
+  - type: BodyPart
+    bodyPartType: Chest
+
+# Groin
+- type: entity
+  id: BaseBodyPartGroin
+  parent: BaseBodyPart
+  abstract: true
+  name: groin
+  components:
+  - type: Sprite
+    state: groin
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.Groin
+    state: groin
+  - type: BodyPart
+    bodyPartType: Groin
+
+# Arms
+
+- type: entity
+  id: BaseBodyPartArm
+  parent: [BaseBodyPart, BaseAmputatableBodyPart]
+  abstract: true
+  name: arm
+  components:
+  - type: Sprite
+    state: arm
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftArm
+    state: arm
+  - type: BodyPart
+    bodyPartType: Arm
+
+- type: entity
+  id: BaseBodyPartLeftArm
+  parent: BaseBodyPartArm
+  abstract: true
+  name: left arm
+  components:
+  - type: Sprite
+    state: l_arm
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftArm
+    state: l_arm
+  - type: BodyPart
+    bodyPartType: LeftArm
+
+- type: entity
+  id: BaseBodyPartMiddleArm
+  parent: BaseBodyPartArm
+  abstract: true
+  name: middle arm
+  components:
+  - type: Sprite
+    state: m_arm
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftArm
+    state: m_arm
+  - type: BodyPart
+    bodyPartType: MiddleArm
+
+- type: entity
+  id: BaseBodyPartRightArm
+  parent: BaseBodyPartArm
+  abstract: true
+  name: right arm
+  components:
+  - type: Sprite
+    state: r_arm
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.RightArm
+    state: r_arm
+  - type: BodyPart
+    bodyPartType: RightArm
+
+# Hand
+
+- type: entity
+  id: BaseBodyPartHand
+  parent: [BaseBodyPart, BaseAmputatableBodyPart]
+  abstract: true
+  name: hand
+  components:
+  - type: Sprite
+    state: hand
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftHand
+    state: hand
+  - type: BodyPart
+    bodyPartType: Hand
+
+- type: entity
+  id: BaseBodyPartLeftHand
+  parent: BaseBodyPartHand
+  abstract: true
+  name: left hand
+  components:
+  - type: Sprite
+    state: l_hand
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftHand
+    state: l_hand
+  - type: BodyPart
+    bodyPartType: LeftHand
+
+- type: entity
+  id: BaseBodyPartMiddleHand
+  parent: BaseBodyPartHand
+  abstract: true
+  name: middle hand
+  components:
+  - type: Sprite
+    state: m_hand
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftHand
+    state: m_hand
+  - type: BodyPart
+    bodyPartType: MiddleHand
+
+- type: entity
+  id: BaseBodyPartRightHand
+  parent: BaseBodyPartHand
+  abstract: true
+  name: right hand
+  components:
+  - type: Sprite
+    state: r_hand
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.RightHand
+    state: r_hand
+  - type: BodyPart
+    bodyPartType: RightHand
+
+# Leg
+
+- type: entity
+  id: BaseBodyPartLeg
+  parent: [BaseBodyPart, BaseAmputatableBodyPart]
+  abstract: true
+  name: leg
+  components:
+  - type: Sprite
+    state: leg
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    state: leg
+  - type: BodyPart
+    bodyPartType: Leg
+  - type: MovementBodyPart
+
+- type: entity
+  id: BaseBodyPartLeftLeg
+  parent: BaseBodyPartLeg
+  abstract: true
+  name: left leg
+  components:
+  - type: Sprite
+    state: l_leg
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    state: l_leg
+  - type: BodyPart
+    bodyPartType: LeftLeg
+
+- type: entity
+  id: BaseBodyPartMiddleLeg
+  parent: BaseBodyPartLeg
+  abstract: true
+  name: middle leg
+  components:
+  - type: Sprite
+    state: m_leg
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftLeg
+    state: m_leg
+  - type: BodyPart
+    bodyPartType: MiddleLeg
+
+- type: entity
+  id: BaseBodyPartRightLeg
+  parent: BaseBodyPartLeg
+  abstract: true
+  name: right leg
+  components:
+  - type: Sprite
+    state: r_leg
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.RightLeg
+    state: r_leg
+  - type: BodyPart
+    bodyPartType: RightLeg
+
+# Foot
+
+- type: entity
+  id: BaseBodyPartFoot
+  parent: [BaseBodyPart, BaseAmputatableBodyPart]
+  abstract: true
+  name: foot
+  components:
+  - type: Sprite
+    state: foot
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    state: foot
+  - type: BodyPart
+    bodyPartType: Foot
+
+- type: entity
+  id: BaseBodyPartLeftFoot
+  parent: BaseBodyPartFoot
+  abstract: true
+  name: left foot
+  components:
+  - type: Sprite
+    state: l_foot
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    state: l_foot
+  - type: BodyPart
+    bodyPartType: LeftFoot
+
+- type: entity
+  id: BaseBodyPartMiddleFoot
+  parent: BaseBodyPartFoot
+  abstract: true
+  name: middle foot
+  components:
+  - type: Sprite
+    state: m_foot
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    state: m_foot
+  - type: BodyPart
+    bodyPartType: MiddleFoot
+
+- type: entity
+  id: BaseBodyPartRightFoot
+  parent: BaseBodyPartFoot
+  abstract: true
+  name: right foot
+  components:
+  - type: Sprite
+    state: r_foot
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.RightFoot
+    state: r_foot
+  - type: BodyPart
+    bodyPartType: RightFoot
+
+# Tail
+
+- type: entity
+  id: BaseBodyPartTail
+  parent: [BaseBodyPart, BaseAmputatableBodyPart]
+  abstract: true
+  name: tail
+  components:
+  - type: BodyPart
+    bodyPartType: Tail
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.Tail
+
+# Wings
+
+- type: entity
+  id: BaseBodyPartWings
+  parent: [BaseBodyPart, BaseAmputatableBodyPart]
+  abstract: true
+  name: wings
+  components:
+  - type: BodyPart
+    bodyPartType: Wings
+  - type: BodyPartAppearance
+    layer: enum.BodyAppearanceLayer.Wings
diff --git a/Resources/Prototypes/_White/Entities/Body/BodyParts/prosthetic.yml b/Resources/Prototypes/_White/Entities/Body/BodyParts/prosthetic.yml
new file mode 100644
index 00000000000..e3a97a3c4ff
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/BodyParts/prosthetic.yml
@@ -0,0 +1,87 @@
+# - type: entity
+#   parent: RightLegCybernetic
+#   id: MakeshiftRightLeg
+#   name: Right leg prosthetic
+#   description: Poorly made leg from what was nearby
+#   components:
+#   - type: MovementBodyPart
+#     walkSpeed: 1.8
+#     sprintSpeed: 2.25 #you cant sprint fast on this
+#   - type: Construction
+#     graph: MakeshiftRightLegGraph
+#     node: makeshiftrightleg
+#   - type: PhysicalComposition
+#     materialComposition:
+#       Steel: 300
+#       Cloth: 300
+#       Wood: 300
+#       Copper: 300
+#     chemicalComposition:
+#       Iron: 36
+#       Carbon: 4
+#       Copper: 30
+#       Fiber: 40
+
+# - type: entity
+#   parent: LeftLegCybernetic
+#   id: MakeshiftLeftLeg
+#   name: Left leg prosthetic
+#   description: Poorly made leg from what was nearby
+#   components:
+#   - type: MovementBodyPart
+#     walkSpeed: 1.8
+#     sprintSpeed: 2.25 #you cant sprint fast on this
+#   - type: Construction
+#     graph: MakeshiftLeftLegGraph
+#     node: makeshiftleftleg
+#   - type: PhysicalComposition
+#     materialComposition:
+#       Steel: 300
+#       Cloth: 300
+#       Wood: 300
+#       Copper: 300
+#     chemicalComposition:
+#       Iron: 36
+#       Carbon: 4
+#       Copper: 30
+#       Fiber: 40
+
+# - type: entity
+#   parent: RightArmCybernetic
+#   id: MakeshiftRightArm
+#   name: Right arm prosthetic
+#   description: Primitive mechanic manipulator. Looks dieselpank-y
+#   components:
+#   - type: Construction
+#     graph: MakeshiftRightArmGraph
+#     node: makeshiftrightarm
+#   - type: PhysicalComposition
+#     materialComposition:
+#       Steel: 400
+#       Cloth: 400
+#       Copper: 250
+#     chemicalComposition:
+#       Iron: 54
+#       Carbon: 6
+#       Copper: 45
+#       Fiber: 50
+
+# - type: entity
+#   parent: LeftArmCybernetic
+#   id: MakeshiftLeftArm
+#   name: Left arm prosthetic
+#   description: Primitive mechanic manipulator. Looks dieselpank-y
+#   components:
+#   - type: Construction
+#     graph: MakeshiftLeftArmGraph
+#     node: makeshiftleftarm
+#   - type: PhysicalComposition
+#     materialComposition:
+#       Steel: 400
+#       Cloth: 300
+#       Copper: 250
+#     chemicalComposition:
+#       Iron: 54
+#       Carbon: 6
+#       Copper: 45
+#       Fiber: 50
diff --git a/Resources/Prototypes/_White/Entities/Body/Bones/Species/human.yml b/Resources/Prototypes/_White/Entities/Body/Bones/Species/human.yml
new file mode 100644
index 00000000000..36425e08593
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Bones/Species/human.yml
@@ -0,0 +1,70 @@
+- type: entity
+  id: BaseBodyBoneHuman
+  parent: BaseBone
+  abstract: true
+  name: human bone
+  components:
+  - type: Sprite
+    sprite: _White/Body/Bone/human.rsi
+
+# Skull / Сranium
+- type: entity
+  id: BoneSkullHuman
+  parent: [BaseBoneSkull, BaseBodyBoneHuman]
+  name: human skull
+
+# Rib Cage / Thorax
+- type: entity
+  id: BoneRibCageHuman
+  parent: [BaseBoneRibCage, BaseBodyBoneHuman]
+  name: human rib cage
+
+# Pelvis / Coxae
+- type: entity
+  id: BonePelvisHuman
+  parent: [BaseBonePelvis, BaseBodyBoneHuman]
+  name: human pelvis
+
+# Arm Bone / Antebrachium
+- type: entity
+  id: BoneLeftArmHuman
+  parent: [BaseBoneLeftArm, BaseBodyBoneHuman]
+  name: human left arm bone
+
+- type: entity
+  id: BoneRightArmHuman
+  parent: [BaseBoneRightArm, BaseBodyBoneHuman]
+  name: human right arm bone
+
+# Hand Bone / Manus
+- type: entity
+  id: BoneLeftHandHuman
+  parent: [BaseBoneLeftHand, BaseBodyBoneHuman]
+  name: human left hand bone
+
+- type: entity
+  id: BoneRightHandHuman
+  parent: [BaseBoneRightHand, BaseBodyBoneHuman]
+  name: human right hand bone
+
+# Leg Bone / Crus
+- type: entity
+  id: BoneLeftLegHuman
+  parent: [BaseBoneLeftLeg, BaseBodyBoneHuman]
+  name: human left leg bone
+
+- type: entity
+  id: BoneRightLegHuman
+  parent: [BaseBoneRightLeg, BaseBodyBoneHuman]
+  name: human right leg bone
+
+# Foot Bone / Pedis
+- type: entity
+  id: BoneLeftFootHuman
+  parent: [BaseBoneLeftFoot, BaseBodyBoneHuman]
+  name: human left foot bone
+
+- type: entity
+  id: BoneRightFootHuman
+  parent: [BaseBoneRightFoot, BaseBodyBoneHuman]
+  name: human right foot bone
diff --git a/Resources/Prototypes/_White/Entities/Body/Bones/base.yml b/Resources/Prototypes/_White/Entities/Body/Bones/base.yml
new file mode 100644
index 00000000000..da682876bbf
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Bones/base.yml
@@ -0,0 +1,321 @@
+- type: entity
+  id: BaseBone
+  parent: BaseItem
+  abstract: true
+  name: bone
+  components:
+  - type: Bone
+  - type: WoundableBone
+    supportedDamageType:
+    - Blunt
+    - Slash
+    - Piercing
+
+# Skull / Сranium
+- type: entity
+  id: BaseBoneSkull
+  parent: BaseBone
+  abstract: true
+  name: skull
+  components:
+  - type: Sprite
+    state: skull
+  - type: Bone
+    boneType: Сranium
+  - type: WoundableBone
+    health: 125
+    maximumHealth: 125
+    boneStatusThresholds:
+      125: Whole
+      100: Damaged
+      60: Cracked
+      35: Broken
+    strengthThresholds:
+      Whole: 10
+      Damaged: 7
+      Cracked: 5
+      Broken: 0
+
+# Rib Cage / Thorax
+- type: entity
+  id: BaseBoneRibCage
+  parent: BaseBone
+  abstract: true
+  name: rib cage
+  components:
+  - type: Sprite
+    state: rib_cage
+  - type: Bone
+    boneType: Thorax
+  - type: WoundableBone
+    health: 72
+    maximumHealth: 72
+    boneStatusThresholds:
+      72: Whole
+      55: Damaged
+      30: Cracked
+      14: Broken
+    strengthThresholds:
+      Whole: 15
+      Damaged: 7
+      Cracked: 5
+      Broken: 0
+
+# Pelvis / Coxae
+- type: entity
+  id: BaseBonePelvis
+  parent: BaseBone
+  abstract: true
+  name: pelvis
+  components:
+  - type: Sprite
+    state: pelvis
+  - type: Bone
+    boneType: Coxae
+  - type: WoundableBone
+    health: 60
+    maximumHealth: 60
+    boneStatusThresholds:
+      60: Whole
+      45: Damaged
+      25: Cracked
+      15: Broken
+    strengthThresholds:
+      Whole: 15
+      Damaged: 10
+      Cracked: 5
+      Broken: 0
+  - type: BloodGenerator
+
+# Arm Bone / Antebrachium
+- type: entity
+  id: BaseBoneArm
+  parent: BaseBone
+  abstract: true
+  name: arm bone
+  components:
+  - type: Sprite
+    state: arm
+  - type: Bone
+    boneType: Antebrachium
+  - type: WoundableBone
+    health: 45
+    maximumHealth: 45
+    boneStatusThresholds:
+      45: Whole
+      35: Damaged
+      25: Cracked
+      10: Broken
+    strengthThresholds:
+      Whole: 10
+      Damaged: 7
+      Cracked: 5
+      Broken: 0
+  - type: BloodGenerator
+
+- type: entity
+  id: BaseBoneLeftArm
+  parent: BaseBoneArm
+  abstract: true
+  name: left arm bone
+  components:
+  - type: Sprite
+    state: left_arm
+  - type: Bone
+    boneType: LeftAntebrachium
+
+- type: entity
+  id: BaseBoneMiddleArm
+  parent: BaseBoneArm
+  abstract: true
+  name: middle arm bone
+  components:
+  - type: Sprite
+    state: middle_arm
+  - type: Bone
+    boneType: MiddleAntebrachium
+
+- type: entity
+  id: BaseBoneRightArm
+  parent: BaseBoneArm
+  abstract: true
+  name: right arm bone
+  components:
+  - type: Sprite
+    state: right_arm
+  - type: Bone
+    boneType: RightAntebrachium
+
+# Hand Bone / Manus
+- type: entity
+  id: BaseBoneHand
+  parent: BaseBone
+  abstract: true
+  name: hand bone
+  components:
+  - type: Sprite
+    state: hand
+  - type: Bone
+    boneType: Manus
+  - type: WoundableBone
+    health: 30
+    maximumHealth: 30
+    boneStatusThresholds:
+      30: Whole
+      23: Damaged
+      15: Cracked
+      7: Broken
+    strengthThresholds:
+      Whole: 5
+      Damaged: 3
+      Cracked: 1
+      Broken: 0
+
+- type: entity
+  id: BaseBoneLeftHand
+  parent: BaseBoneHand
+  abstract: true
+  name: left hand bone
+  components:
+  - type: Sprite
+    state: left_hand
+  - type: Bone
+    boneType: LeftManus
+
+- type: entity
+  id: BaseBoneMiddleHand
+  parent: BaseBoneHand
+  abstract: true
+  name: middle hand bone
+  components:
+  - type: Sprite
+    state: middle_hand
+  - type: Bone
+    boneType: MiddleManus
+
+- type: entity
+  id: BaseBoneRightHand
+  parent: BaseBoneHand
+  abstract: true
+  name: right hand bone
+  components:
+  - type: Sprite
+    state: right_hand
+  - type: Bone
+    boneType: RightManus
+
+# Leg Bone / Crus
+- type: entity
+  id: BaseBoneLeg
+  parent: BaseBone
+  abstract: true
+  name: leg bone
+  components:
+  - type: Sprite
+    state: leg
+  - type: Bone
+    boneType: Crus
+  - type: WoundableBone
+    health: 45
+    maximumHealth: 45
+    boneStatusThresholds:
+      45: Whole
+      35: Damaged
+      25: Cracked
+      10: Broken
+    strengthThresholds:
+      Whole: 10
+      Damaged: 7
+      Cracked: 5
+      Broken: 0
+
+- type: entity
+  id: BaseBoneLeftLeg
+  parent: BaseBoneLeg
+  abstract: true
+  name: left leg bone
+  components:
+  - type: Sprite
+    state: left_leg
+  - type: Bone
+    boneType: LeftCrus
+
+- type: entity
+  id: BaseBoneMiddleLeg
+  parent: BaseBoneLeg
+  abstract: true
+  name: middle leg bone
+  components:
+  - type: Sprite
+    state: middle_leg
+  - type: Bone
+    boneType: MiddleCrus
+
+- type: entity
+  id: BaseBoneRightLeg
+  parent: BaseBoneLeg
+  abstract: true
+  name: right leg bone
+  components:
+  - type: Sprite
+    state: right_leg
+  - type: Bone
+    boneType: RightCrus
+
+# Foot Bone / Pedis
+- type: entity
+  id: BaseBoneFoot
+  parent: BaseBone
+  abstract: true
+  name: foot bone
+  components:
+  - type: Sprite
+    state: foot
+  - type: Bone
+    boneType: Pedis
+  - type: WoundableBone
+    health: 30
+    maximumHealth: 30
+    boneStatusThresholds:
+      30: Whole
+      23: Damaged
+      15: Cracked
+      7: Broken
+    strengthThresholds:
+      Whole: 5
+      Damaged: 3
+      Cracked: 1
+      Broken: 0
+
+- type: entity
+  id: BaseBoneLeftFoot
+  parent: BaseBoneFoot
+  abstract: true
+  name: left foot bone
+  components:
+  - type: Sprite
+    state: left_foot
+  - type: Bone
+    boneType: LeftPedis
+
+- type: entity
+  id: BaseBoneMiddleFoot
+  parent: BaseBoneFoot
+  abstract: true
+  name: middle foot bone
+  components:
+  - type: Sprite
+    state: middle_foot
+  - type: Bone
+    boneType: MiddlePedis
+
+- type: entity
+  id: BaseBoneRightFoot
+  parent: BaseBoneFoot
+  abstract: true
+  name: right foot bone
+  components:
+  - type: Sprite
+    state: right_foot
+  - type: Bone
+    boneType: RightPedis
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/animal.yml b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/animal.yml
new file mode 100644
index 00000000000..4d24ce4354f
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/animal.yml
@@ -0,0 +1,84 @@
+- type: entity
+  id: BaseOrganAnimal
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - 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:
+    - chicken
+  - type: Tag
+    tags:
+    - Meat
+
+- type: entity
+  id: OrganHeartAnimal
+  parent: [BaseOrganAnimal, BaseOrganHeart]
+
+- type: entity
+  id: OrganLungsAnimal
+  parent: [BaseOrganAnimal, BaseOrganLungs]
+  components:
+  - type: Metabolizer
+    types: [ Animal ]
+  - 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: OrganStomachAnimal
+  parent: [BaseOrganAnimal, BaseOrganStomach]
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 40
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Metabolizer
+    types: [ Animal ]
+
+- type: entity
+  id: OrganLiverAnimal
+  parent: [BaseOrganAnimal, BaseOrganLiver]
+  components:
+  - type: Metabolizer
+    types: [ Animal ]
+
+- type: entity
+  id: OrganKidneysAnimal
+  parent: [BaseOrganAnimal, BaseOrganKidneys]
+  components:
+  - type: Metabolizer
+    types: [ Animal ]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/bloodsucker.yml b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/bloodsucker.yml
new file mode 100644
index 00000000000..41b3c83ce18
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/bloodsucker.yml
@@ -0,0 +1,20 @@
+- type: entity
+  id: OrganStomachBloodsucker
+  parent: OrganStomachAnimal
+  components:
+  - type: Metabolizer
+    types: [ Bloodsucker ]
+
+- type: entity
+  id: OrganLiverBloodsucker
+  parent: OrganStomachAnimal
+  components:
+  - type: Metabolizer
+    types: [ Bloodsucker ]
+
+- type: entity
+  id: OrganKidneysBloodsucker
+  parent: OrganStomachAnimal
+  components:
+  - type: Metabolizer
+    types: [ Bloodsucker ]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/friend_shaped.yml b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/friend_shaped.yml
new file mode 100644
index 00000000000..1b049981739
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/friend_shaped.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: OrganStomachFriendShaped
+  parent: OrganStomachAnimal
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 100
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/mouse.yml b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/mouse.yml
new file mode 100644
index 00000000000..366831987d9
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/mouse.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: OrganStomachMouse
+  parent: OrganStomachAnimal
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 30
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/rat.yml b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/rat.yml
new file mode 100644
index 00000000000..3f4fc1df17e
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/rat.yml
@@ -0,0 +1,25 @@
+- type: entity
+  id: OrganLungsRat
+  parent: OrganLungsAnimal
+  name: rat lungs
+  components:
+  - type: Metabolizer
+    types: [ Rat ]
+
+- type: entity
+  id: OrganStomachRat
+  parent: OrganStomachAnimal
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/ruminant.yml b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/ruminant.yml
new file mode 100644
index 00000000000..12fec1ce67b
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/ruminant.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: OrganStomachRuminant
+  parent: OrganStomachAnimal
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 80
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/vampiric.yml b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/vampiric.yml
new file mode 100644
index 00000000000..ad31a6c3d68
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/NPCs/vampiric.yml
@@ -0,0 +1,6 @@
+- type: entity
+  id: OrganStomachVampiric
+  parent: OrganStomachAnimal
+  components:
+  - type: Metabolizer
+    types: [Vampiric]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/arachne.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/arachne.yml
new file mode 100644
index 00000000000..c0a83dd0c64
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/arachne.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: OrganStomachArachne
+  parent: OrganStomachHuman
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [Vampiric]
+
+- type: entity
+  id: OrganEyesArachne
+  parent: OrganEyesHuman
+  components:
+  - type: OrganAppearance
+    sprite: Mobs/Species/eyes.rsi
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/arachnid.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/arachnid.yml
new file mode 100644
index 00000000000..28eeb90b61f
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/arachnid.yml
@@ -0,0 +1,110 @@
+- type: entity
+  id: BaseOrganArachnid
+  parent: BaseOrgan
+  abstract: true
+  name: arachnid organ
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Arachnid/organs.rsi
+  - 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: OrganHeartArachnid
+  parent: [BaseOrganArachnid, BaseOrganHeart]
+  name: arachnid heart
+  description: A disgustingly persistent little biological pump made for spiders.
+
+- type: entity
+  id: OrganEyesArachnid
+  parent: [BaseOrganArachnid, BaseOrganEyes]
+  name: arachnid eyes
+  description: Two was already too many.
+  components:
+  - type: OrganAppearance
+    sprite: Mobs/Species/Arachnid/parts.rsi
+
+- type: entity
+  id: OrganTongueArachnid
+  parent: [BaseOrganArachnid, BaseOrganTongue]
+  name: arachnid tongue
+
+- type: entity
+  id: OrganLungsArachnid
+  parent: [BaseOrganArachnid, BaseOrganLungs]
+  name: arachnid lungs
+  description: Filters oxygen from an atmosphere... just more greedily.
+  components:
+  - 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: OrganStomachArachnid
+  parent: [BaseOrganArachnid, BaseOrganStomach]
+  name: arachnid stomach
+  components:
+  - type: Stomach
+    updateInterval: 1.5
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Metabolizer
+    updateInterval: 1.5
+
+- type: entity
+  id: OrganLiverArachnid
+  parent: OrganLiverHuman
+  name: arachnid liver
+  components:
+  - type: Metabolizer
+    updateInterval: 1.5
+    types: [Arachnid]
+
+- type: entity
+  id: OrganKidneysArachnid
+  parent: OrganKidneysHuman
+  name: arachnid kidneys
+  components:
+  - type: Metabolizer
+    updateInterval: 1.5
+    types: [Animal]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/chitinid.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/chitinid.yml
new file mode 100644
index 00000000000..3bb3e36267a
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/chitinid.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: OrganLiverChitinid
+  parent: OrganLiverAnimal
+  # TODO
+  # components:
+  # - type: Organ
+  #   onAdd:
+  #   - type: UnpoweredFlashlight
+  #   - type: PointLight
+  #     enabled: false
+  #     radius: 3
+  #     softness: 5
+  #     color: "#2CFA1F"
+  #     autoRot: true
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/diona.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/diona.yml
new file mode 100644
index 00000000000..10cc98c334e
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/diona.yml
@@ -0,0 +1,140 @@
+- type: entity
+  id: BaseOrganDiona
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Diona/organs.rsi
+  - 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: entity
+  id: OrganBrainDiona
+  parent: [BaseOrganDiona, BaseOrganBrain]
+  name: diona brain
+  components:
+  - type: BadFood
+  - type: FoodSequenceElement
+    entries:
+      Burger: Brain
+      Taco: Brain
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+
+- type: entity
+  id: OrganBrainDionaNymph
+  parent: OrganBrainDiona
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Nymph
+    entityPrototype: MobDionaNymphBrain
+    transferMind: true
+
+- type: entity
+  id: OrganEyesDiona
+  parent: [BaseOrganDiona, BaseOrganEyes]
+  name: diona eyes
+  components:
+  - type: OrganAppearance
+    state: diona
+
+- type: entity
+  id: OrganEarsDiona
+  parent: [BaseOrganDiona, BaseOrganEars]
+  name: diona ears
+
+- type: entity
+  id: OrganLungsDiona
+  parent: [BaseOrganDiona, BaseOrganLungs]
+  name: diona lungs
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi # We don't have a lung sprite for diona.
+  - type: Metabolizer
+    types: [ Plant ]
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      lung:
+        maxVol: 100
+        canReact: False
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+
+- type: entity
+  id: OrganLungsDionaNymph
+  parent: OrganLungsDiona
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Nymph
+    entityPrototype: MobDionaNymphLungs
+
+- type: entity
+  id: OrganStomachDiona
+  parent: [BaseOrganDiona, BaseOrganStomach]
+  name: diona stomach
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Metabolizer
+    maxReagents: 6
+    types: [ Plant ]
+    removeEmpty: true
+    groups:
+    - id: Food
+    - id: Drink
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
+    - id: Alcohol
+      rateModifier: 0.1
+
+- type: entity
+  id: OrganStomachDionaNymph
+  parent: OrganStomachDiona
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Nymph
+    entityPrototype: MobDionaNymphStomach
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/dwarf.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/dwarf.yml
new file mode 100644
index 00000000000..0f9dd3039cc
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/dwarf.yml
@@ -0,0 +1,23 @@
+- type: entity
+  id: OrganLiverDwarf
+  parent: OrganLiverHuman
+  components:
+  - type: Metabolizer
+    types: [Dwarf, LiquorLifeline]
+
+- type: entity
+  id: OrganStomachDwarf
+  parent: OrganStomachHuman
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 75
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Metabolizer
+    maxReagents: 5
+    types: [Dwarf]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/gingerbread.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/gingerbread.yml
new file mode 100644
index 00000000000..3564d49c3f9
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/gingerbread.yml
@@ -0,0 +1,6 @@
+- type: entity
+  id: OrganEyesGingerbread
+  parent: OrganEyesHuman
+  components:
+  - type: OrganAppearance
+    state: no_eyes
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/harpy.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/harpy.yml
new file mode 100644
index 00000000000..0621eda1a94
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/harpy.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: OrganLungsHarpy
+  parent: OrganLungsHuman
+  name: harpy lungs
+  description: An advanced pair of avian lungs. Filters oxygen by way of moving air constantly through air sacs.
+  components:
+  - type: Metabolizer
+    updateInterval: 2.0
+    groups:
+    - id: Gas
+      rateModifier: 200.0
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/human.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/human.yml
new file mode 100644
index 00000000000..b4d3686516a
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/human.yml
@@ -0,0 +1,111 @@
+- type: entity
+  id: BaseOrganHuman
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - 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: OrganBrainHuman
+  parent: [BaseOrganHuman, BaseOrganBrain]
+  components:
+  - type: BadFood
+  - type: FoodSequenceElement
+    entries:
+      Burger: Brain
+      Taco: Brain
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+
+- type: entity
+  id: OrganHeartHuman
+  parent: [BaseOrganHuman, BaseOrganHeart]
+
+- type: entity
+  id: OrganEyesHuman
+  parent: [BaseOrganHuman, BaseOrganEyes]
+
+- type: entity
+  id: OrganTongueHuman
+  parent: [BaseOrganHuman, BaseOrganTongue]
+
+- type: entity
+  id: OrganAppendixHuman
+  parent: [BaseOrganHuman, BaseOrganAppendix]
+
+- type: entity
+  id: OrganEarsHuman
+  parent: [BaseOrganHuman, BaseOrganEars]
+
+- type: entity
+  id: OrganLungsHuman
+  parent: [BaseOrganHuman, BaseOrganLungs]
+  components:
+  - 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: OrganStomachHuman
+  parent: [BaseOrganHuman, BaseOrganStomach]
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+
+- type: entity
+  id: OrganLiverHuman
+  parent: [BaseOrganHuman, BaseOrganLiver]
+
+- type: entity
+  id: OrganKidneysHuman
+  parent: [BaseOrganHuman, BaseOrganKidneys]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/ipc.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/ipc.yml
new file mode 100644
index 00000000000..c2a6bfec79b
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/ipc.yml
@@ -0,0 +1,39 @@
+- type: entity
+  id: BaseOrganIPC
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/IPC/organs.rsi
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Oil
+          Quantity: 10
+
+- type: entity
+  id: OrganHeartIPC
+  parent: [BaseOrganIPC, BaseOrganHeart]
+  name: micro pump
+  description: A micro pump, used to circulate coolant.
+
+- type: entity
+  id: OrganEyesIPC
+  parent: [BaseOrganIPC, BaseOrganEyes]
+  name: robotic eyes
+  description: 01001001 00100000 01110011 01100101 01100101 00100000 01111001 01101111 01110101 00100001
+
+- type: entity
+  id: OrganTongueIPC
+  parent: [BaseOrganIPC, BaseOrganTongue]
+  name: vocal modulator
+  description: A vocal modulator, used to produce speech.
+
+- type: entity
+  id: OrganEarsIPC
+  parent: [BaseOrganIPC, BaseOrganEars]
+  name: sonic receptors
+  description: used to perceive atmospheric vibrations. Simply put, the ears.
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/moth.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/moth.yml
new file mode 100644
index 00000000000..5073871f5ba
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/moth.yml
@@ -0,0 +1,20 @@
+- type: entity
+  id: OrganStomachMoth
+  parent: OrganStomachHuman
+  components:
+  - type: Stomach
+    specialDigestible:
+      tags:
+      - ClothMade
+      - Fruit
+      - Paper
+  - type: Metabolizer
+    types: [ Moth ]
+
+- type: entity
+  id: OrganEyesMoth
+  parent: OrganEyesHuman
+  components:
+  - type: OrganAppearance
+    sprite: Mobs/Species/Moth/parts.rsi
+
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/plasmaman.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/plasmaman.yml
new file mode 100644
index 00000000000..0d9625a2c59
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/plasmaman.yml
@@ -0,0 +1,145 @@
+- type: entity
+  id: BaseOrganPlasmaman
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Plasmaman/organs.rsi
+  - type: Food
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Plasma
+          Quantity: 2.5
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - plasma
+
+- type: entity
+  id: OrganBrainPlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganBrain]
+  name: plasmaman brain
+  components:
+  - type: BadFood
+  - type: FoodSequenceElement
+    entries:
+      Burger: Brain
+      Taco: Brain
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Plasma
+          Quantity: 2.5
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+        - ReagentId: Plasma
+          Quantity: 5
+
+- type: entity
+  id: OrganHeartPlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganHeart]
+  name: plasmaman heart
+  description: It pulses with plasma even outside the body.
+
+- type: entity
+  id: OrganEyesPlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganEyes]
+  name: plasmaman eyes
+  components:
+  - type: Sprite
+    layers:
+    - state: eyes
+  - type: OrganAppearance
+    sprite: Mobs/Customization/plasmaman.rsi
+
+- type: entity
+  id: OrganTonguePlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganTongue]
+  name: plasmaman tongue
+
+- type: entity
+  id: OrganLungsPlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganLungs]
+  name: plasmaman lungs
+  description: The lungs yearn for the plasma. Only plasma gas can satiate these lungs, and oxygen is lethally toxic.
+  components:
+  - type: Sprite
+    layers:
+    - state: lungs
+  - type: Metabolizer
+    types: [ Plasmaman ]
+  - type: Lung
+    alert: LowPlasma
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Plasma
+          Quantity: 2.5
+      lung:
+        maxVol: 100.0
+        canReact: false
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 5
+
+- type: entity
+  id: OrganStomachPlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganStomach]
+  name: plasmaman stomach
+  description: Why do plasmamen have stomachs if they don't need to eat?
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: Plasma
+          Quantity: 4
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 8
+        reagents:
+        - ReagentId: Plasma
+          Quantity: 8
+
+- type: entity
+  id: OrganLiverPlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganLiver]
+  name: plasmaman liver
+  components:
+  - type: Metabolizer
+    types: [ Plasmaman ]
+
+- type: entity
+  id: OrganKidneysPlasmaman
+  parent: [BaseOrganPlasmaman, BaseOrganKidneys]
+  name: plasmaman kidneys
+  components:
+  - type: Sprite
+    layers:
+    - state: kidneys
+  - type: Metabolizer
+    types: [ Plasmaman ]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/reptilian.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/reptilian.yml
new file mode 100644
index 00000000000..93fb074dc41
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/reptilian.yml
@@ -0,0 +1,6 @@
+- type: entity
+  id: OrganStomachReptilian
+  parent: OrganStomachHuman
+  components:
+  - type: Metabolizer
+    types: [ Animal ]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/shadowkin.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/shadowkin.yml
new file mode 100644
index 00000000000..68a7876c4de
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/shadowkin.yml
@@ -0,0 +1,162 @@
+- type: entity
+  id: BaseOrganShadowkin
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Shadowkin/organs.rsi
+  - 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: OrganBrainShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganBrain]
+  name: shadowkin brain
+  description: Oops, I should put this back where I found it.
+  components:
+  - type: Sprite
+    state: heart
+  - type: BadFood
+  - type: FoodSequenceElement
+    entries:
+      Burger: Brain
+      Taco: Brain
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+
+- type: entity
+  id: OrganHeartShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganHeart]
+  name: shadowkin heart
+  description: Oops, I think this belongs to someone!
+  components:
+  - type: Sprite
+    state: heart
+
+- type: entity
+  id: OrganEyesShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganEyes]
+  name: shadowkin eyes
+  description: I see beyond anything you ever will!
+  components:
+  - type: Sprite
+    layers:
+    - state: eyes
+  - type: OrganAppearance
+    sprite: Mobs/Species/Shadowkin/parts.rsi
+
+- type: entity
+  id: OrganTongueShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganTongue]
+  name: shadowkin tongue
+  description: What does this do again?
+
+- type: entity
+  id: OrganAppendixShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganAppendix]
+  name: shadowkin appendix
+  description: I think it does nothing...
+  components:
+  - type: Sprite
+    layers:
+    - state: appendix
+
+- type: entity
+  id: OrganEarsShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganEars]
+  name: shadowkin ears
+  description: Hey, listen!
+
+- type: entity
+  id: OrganLungsShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganLungs]
+  name: shadowkin lungs
+  description: What is this thing?
+  components:
+  - type: Sprite
+    layers:
+    - state: core
+  - 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: OrganStomachShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganStomach]
+  name: shadowkin stomach
+  description: 'Yummy!", says the stomach, although you are unable to hear it.'
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Metabolizer
+    types: [Shadowkin]
+
+- type: entity
+  id: OrganLiverShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganLiver]
+  name: shadowkin liver
+  description: "Live 'er? I hardly know 'er!"
+  components:
+  - type: Metabolizer
+    types: [Shadowkin]
+
+- type: entity
+  id: OrganKidneysShadowkin
+  parent: [BaseOrganShadowkin, BaseOrganKidneys]
+  name: shadowkin kidneys
+  description: Give the kid their knees back, please, this is the third time this week.
+  components:
+  - type: Sprite
+    layers:
+    - state: kidneys
+  - type: Metabolizer
+    types: [Shadowkin]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/smile.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/smile.yml
new file mode 100644
index 00000000000..554f169fa6c
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/smile.yml
@@ -0,0 +1,98 @@
+- type: entity
+  id: BaseOrganSlime
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Slime/organs.rsi
+  - type: Food
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Slime
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - slimy
+
+- type: entity
+  id: OrganCoreSlime
+  parent: BaseOrganSlime
+  name: sentient slime core
+  description: The source of incredible, unending gooeyness.
+  components:
+  - type: Sprite
+    state: brain-slime
+  - type: Organ
+    organType: Core
+  - type: BadFood
+  - type: FoodSequenceElement
+    entries:
+      Burger: Brain
+      Taco: Brain
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 50.0
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+      organ:
+        reagents:
+        - ReagentId: Slime
+          Quantity: 10
+  - type: Metabolizer
+    maxReagents: 6
+    types: [ Slime ]
+    stages:
+      Respiration:
+        solutionName: lung
+        solutionOnBody: false
+        metabolizeAll: true
+      Digestion:
+        solutionName: stomach
+        solutionOnBody: false
+        transferEfficacy: 0.5
+      Absorption:
+        solutionName: bloodstream
+      Excretion:
+        solutionName: bloodstream
+
+- type: entity
+  id: OrganLungsSlime
+  parent: [BaseOrganSlime, BaseOrganLungs]
+  name: slime gas sacs
+  description: Collects nitrogen, which slime cells use for maintenance.
+  components:
+  - type: Sprite
+    layers:
+    - state: lung-l-slime
+    - state: lung-r-slime
+  - type: Lung
+    alert: LowNitrogen
+  - type: Metabolizer
+    types: [ Slime ]
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Slime
+          Quantity: 10
+      lung:
+        maxVol: 100.0
+        canReact: false
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/thaven.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/thaven.yml
new file mode 100644
index 00000000000..68d8f32bf90
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/thaven.yml
@@ -0,0 +1,9 @@
+- type: entity
+  id: OrganBrainThaven
+  parent: OrganBrainHuman
+  name: thaven brain
+  description: An organic positronic brain. Quite remarkable, really.
+  components:
+  - type: Sprite
+    sprite: _Impstation/Mobs/Species/Thaven/organs.rsi
+    state: brain-thaven
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/vox.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/vox.yml
new file mode 100644
index 00000000000..7bebb90938f
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/vox.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: OrganLungsVox
+  parent: OrganLungsHuman
+  name: vox lungs
+  components:
+  - type: Lung
+    alert: LowNitrogen
+  - type: Metabolizer
+    types: [ Vox ]
+
+- type: entity
+  id: OrganEyesVox
+  parent: OrganEyesHuman
+  components:
+  - type: OrganAppearance
+    sprite: Mobs/Species/Vox/parts.rsi
+
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/vulpkanin.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/vulpkanin.yml
new file mode 100644
index 00000000000..7400eb9fcc1
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/vulpkanin.yml
@@ -0,0 +1,6 @@
+- type: entity
+  id: OrganStomachVulpkanin
+  parent: OrganStomachHuman
+  components:
+  - type: Metabolizer
+    types: [ Animal ]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Species/xelthia.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Species/xelthia.yml
new file mode 100644
index 00000000000..0d5ab92a0da
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Species/xelthia.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: OrganStomachXelthia
+  parent: OrganStomachHuman
+  components:
+  - type: Stomach
+    specialDigestible:
+      tags:
+      - Meat
+      - Pill
+      - Crayon
+      - Paper
+  - type: Metabolizer
+    types: [ Xelthia ]
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/Xenomorphs/xenomorph.yml b/Resources/Prototypes/_White/Entities/Body/Organs/Xenomorphs/xenomorph.yml
new file mode 100644
index 00000000000..c91d1cd21f9
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/Xenomorphs/xenomorph.yml
@@ -0,0 +1,260 @@
+- type: entity
+  id: BaseOrganXenomorph
+  parent: BaseOrgan
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _White/Mobs/Species/Xenomorph/organs.rsi
+  - type: Food
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: SulfuricAcid
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 3
+        - ReagentId: SulfuricAcid
+          Quantity: 2
+  - type: FlavorProfile
+    flavors:
+    - bun
+    - meaty
+    - acid
+  - type: Tag
+    tags:
+    - Meat
+
+- type: entity
+  parent: [BaseOrganXenomorph, BaseOrganBrain]
+  id: OrganBrainXenomorph
+  name: xenomorph brain
+  description: We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?
+  components:
+  - type: BadFood
+  - type: FoodSequenceElement
+    entries:
+      Burger: Brain
+      Taco: Brain
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: SulfuricAcid
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+
+- type: entity
+  id: OrganEyesXenomorph
+  parent: [BaseOrganXenomorph, BaseOrganEyes]
+  name: xenomorph eyes
+  description: It turned out they had them after all!
+
+- type: entity
+  id: OrganTongueXenomorph
+  parent: [BaseOrganXenomorph, BaseOrganTongue]
+  name: xenomorph tongue
+  description: According to leading xenobiologists the evolutionary benefit of having a second mouth in your mouth is "that it looks badass".
+
+- type: entity
+  id: OrganLungsXenomorph
+  parent: [BaseOrganXenomorph, BaseOrganLungs]
+  name: plasma vessel
+  description: A reservoir containing concentrated and highly active plasma - the main source of energy and raw material for the xenomorph's biological weapons.
+  components:
+  - type: Sprite
+    layers:
+    - state: plasma_vessel
+  - type: Metabolizer
+    types: [ Xenomorph ]
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: SulfuricAcid
+          Quantity: 10
+      lung:
+        maxVol: 100.0
+        canReact: false
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 3
+        - ReagentId: SulfuricAcid
+          Quantity: 2
+  # - type: Organ
+  #   onAdd:
+  #   - type: PlasmaVessel
+  #   TODO: Organ should give plant weeds and transfer plasma action
+
+- type: entity
+  id: OrganLungsLargeXenomorph
+  parent: OrganLungsXenomorph
+  name: large plasma vessel
+  components:
+  - type: Sprite
+    state: plasma_vessel_large
+  # - type: Organ
+  #   onAdd:
+  #   - type: PlasmaVessel
+  #     maxPlasma: 500
+  #     plasma: 200
+  #     plasmaPerSecondOffWeed: 0.75
+  #     plasmaPerSecondOnWeed: 7.5
+
+- type: entity
+  id: OrganLungsLargeQueenXenomorph
+  parent: OrganLungsLargeXenomorph
+  # components:
+  # - type: Organ
+  #   onAdd:
+  #   - type: PlasmaVessel
+  #     maxPlasma: 500
+  #     plasma: 200
+  #     plasmaPerSecondOffWeed: 1
+  #     plasmaPerSecondOnWeed: 10
+
+- type: entity
+  id: OrganLungsSmallXenomorph
+  parent: OrganLungsXenomorph
+  name: small plasma vessel
+  components:
+  - type: Sprite
+    state: plasma_vessel_small
+  # - type: Organ
+  #   onAdd:
+  #   - type: PlasmaVessel
+  #     maxPlasma: 150
+  #     plasma: 100
+  #     plasmaPerSecondOffWeed: 0.25
+  #     plasmaPerSecondOnWeed: 2.5
+
+- type: entity
+  id: OrganLungsTinyXenomorph
+  parent: OrganLungsXenomorph
+  name: tiny plasma vessel
+  components:
+  - type: Sprite
+    state: plasma_vessel_tiny
+  # - type: Organ
+  #   onAdd:
+  #   - type: PlasmaVessel
+  #     maxPlasma: 100
+
+- type: entity
+  id: OrganStomachXenomorph
+  parent: [BaseOrganXenomorph, BaseOrganStomach]
+  name: xenomorph stomach
+  description: Its walls are capable of both significantly expanding and contracting with enormous force.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: SulfuricAcid
+          Quantity: 10
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 3
+        - ReagentId: SulfuricAcid
+          Quantity: 2
+  - type: Metabolizer
+    types: [Xenomorph]
+
+- type: entity
+  id: OrganLiverXenomorph
+  parent: [BaseOrganXenomorph, BaseOrganLiver]
+  name: xenomorph liver
+  description: A liver that used to belong to a killer alien, who knows what it used to eat.
+  components:
+  - type: Metabolizer
+    types: [Xenomorph]
+
+- type: entity
+  id: OrganGlandAcidXenomorph
+  parent: [BaseOrganXenomorph, BaseOrganGland]
+  name: acid gland
+  description: A specialized tank with acid. The resulting corrosive mixture can melt most known materials.
+  components:
+  - type: Sprite
+    state: acid_gland
+  # - type: Organ
+  #   onAdd:
+  #   - type: XenomorphAcid
+  #     damagePerSecond:
+  #       types:
+  #         Caustic: 20
+
+- type: entity
+  id: OrganGlandNeurotoxinXenomorph
+  parent: [BaseOrganXenomorph, BaseOrganGland]
+  name: neurotoxin gland
+  description: A specialized tank with neurotoxin. Сonsists of many microscopic tubes filled with clear liquid.
+  components:
+  - type: Sprite
+    state: neurotoxin_gland
+  # - type: Organ
+  #   onAdd:
+  #   - type: RechargeBasicEntityAmmo
+  #     rechargeCooldown: 0.75
+  #   - type: PlasmaAmmoProvider
+  #     fireCost: 55
+  #     proto: BulletNeurotoxin
+  #     type: Gun
+  #       fireRate: 0.75
+  #     useKey: false
+  #     selectedMode: FullAuto
+  #     availableModes:
+  #     - FullAuto
+  #     soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg
+
+- type: entity
+  id: OrganEggSackXenomorph
+  parent: BaseOrganXenomorph
+  name: egg sack
+  description: Designed to produce and store eggs containing facehuggers, the organ's enormous size allows the xenomorph queen to lay thousands of eggs in a short period of time.
+  components:
+  - type: Sprite
+    state: egg_sack
+  - type: Organ
+    organType: Specific
+    # TODO: Organ should give egg spawn actions
+
+- type: entity
+  id: OrganResinSpinnerXenomorph
+  parent: BaseOrganXenomorph
+  name: resin spinner
+  description: Designed for the production and isolation of resin-like biopolymer.
+  components:
+  - type: Sprite
+    state: resin_spinner
+  - type: Organ
+    organType: Specific
+    # TODO: Organ should give construction actions
+
+- type: entity
+  id: OrganHiveNodeXenomorph
+  parent: BaseOrganXenomorph
+  name: hive node
+  description: The central organ of the xenomorphs, providing communication with the common mind.
+  components:
+  - type: Sprite
+    state: hive_node
+  - type: Organ
+    organType: Specific
+    # TODO: Organ should give XenoHivemind language and Xeno faction
+
diff --git a/Resources/Prototypes/_White/Entities/Body/Organs/base.yml b/Resources/Prototypes/_White/Entities/Body/Organs/base.yml
new file mode 100644
index 00000000000..68afe40a7bb
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/base.yml
@@ -0,0 +1,249 @@
+- type: entity
+  id: BaseOrgan
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi
+  - type: Damageable
+  - type: Organ
+  - type: WoundableOrgan
+    supportedDamageType:
+    - Blunt
+    - Slash
+    - Piercing
+    organStatusThresholds:
+      90: Healthy
+      70: Bruised
+      50: Damaged
+      25: Critical
+      0: Dead
+
+- type: entity
+  id: BaseOrganBrain
+  parent: BaseOrgan
+  abstract: true
+  name: brain
+  description: The source of incredible, unending intelligence. Honk.
+  components:
+  - type: Sprite
+    state: brain
+  - type: Organ
+    organType: Brain
+  - type: Input
+    context: "ghost"
+  - type: Brain
+  - type: InputMover
+  - type: Examiner
+  - type: BlockMovement
+  - type: WoundableOrgan
+    health: 120
+    maximumHealth: 120
+    organStatusThresholds:
+      110: Healthy
+      80: Bruised
+      55: Damaged
+      30: Critical
+      0: Dead
+  - type: RespiratorСonsumer
+    saturationConsumption: 0.004
+
+- type: entity
+  id: BaseOrganHeart
+  parent: BaseOrgan
+  abstract: true
+  name: heart
+  description: I feel bad for the heartless bastard who lost this.
+  components:
+  - type: Sprite
+    state: heart-on
+  - type: Organ
+    organType: Heart
+  - type: WoundableOrgan
+    health: 120
+    maximumHealth: 120
+    organStatusThresholds:
+      110: Healthy
+      80: Bruised
+      55: Damaged
+      30: Critical
+      0: Dead
+  - type: RespiratorСonsumer
+    saturationConsumption: 0.002
+    damageThreshold: 0.2
+  - type: Heart
+    strainDamageChanceThresholds:
+      0.1: 0
+      0.25: 0.001
+      0.5: 0.005
+      0.75: 0.01
+      1: 0.02
+
+- type: entity
+  id: BaseOrganEyes
+  parent: BaseOrgan
+  abstract: true
+  name: eyes
+  description: I see you!
+  components:
+  - type: Sprite
+    layers:
+    - state: eyeball-l
+    - state: eyeball-r
+  - type: OrganAppearance
+    layer: enum.BodyAppearanceLayer.Eyes
+    sprite: Mobs/Customization/eyes.rsi
+    state: eyes
+  - type: Organ
+    organType: Eyes
+
+- type: entity
+  id: BaseOrganTongue
+  parent: BaseOrgan
+  abstract: true
+  name: tongue
+  description: A fleshy muscle mostly used for lying.
+  components:
+  - type: Sprite
+    state: tongue
+  - type: Organ
+    organType: Tongue
+
+- type: entity
+  id: BaseOrganAppendix
+  parent: BaseOrgan
+  abstract: true
+  name: appendix
+  description: It has the ability to make this life painful.
+  components:
+  - type: Sprite
+    layers:
+    - state: appendix
+    - state: appendix-inflamed
+      visible: false
+  - type: Organ
+    organType: Appendix
+
+- type: entity
+  id: BaseOrganEars
+  parent: BaseOrgan
+  abstract: true
+  name: ears
+  description: There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible.
+  components:
+  - type: Sprite
+    state: ears
+  - type: Organ
+    organType: Ears
+
+- type: entity
+  id: BaseOrganLungs
+  parent: BaseOrgan
+  abstract: true
+  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: Organ
+    organType: Lungs
+  - type: Lung
+  - type: Metabolizer
+    types: [ Human ]
+    updateInterval: 0
+    stages:
+      Respiration:
+        solutionName: lung
+        solutionOnBody: false
+        metabolizeAll: true
+  - type: SolutionContainerManager
+    solutions:
+      lung:
+        maxVol: 100.0
+        canReact: false
+  - type: RespiratorСonsumer
+    saturationConsumption: 0.001
+
+- type: entity
+  id: BaseOrganStomach
+  parent: BaseOrgan
+  abstract: true
+  name: stomach
+  description: Gross. This is hard to stomach.
+  components:
+  - type: Sprite
+    state: stomach
+  - type: Organ
+    organType: Stomach
+  - type: Stomach
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 50
+  - type: Metabolizer
+    maxReagents: 3
+    types: [Human]
+    stages:
+      Digestion:
+        solutionName: stomach
+        solutionOnBody: false
+        transferEfficacy: 0.5
+    groups:
+    - id: Food
+    - id: Drink
+  - type: RespiratorСonsumer
+    saturationConsumption: 0.001
+
+- type: entity
+  id: BaseOrganLiver
+  parent: BaseOrgan
+  abstract: true
+  name: liver
+  description: "Pairing suggestion: chianti and fava beans."
+  components:
+  - type: Sprite
+    state: liver
+  - type: Organ
+    organType: Liver
+  - type: Metabolizer
+    maxReagents: 10
+    types: [Human]
+    stages:
+      Absorption:
+        solutionName: bloodstream
+  - type: RespiratorСonsumer
+    saturationConsumption: 0.001
+
+- type: entity
+  id: BaseOrganKidneys
+  parent: BaseOrgan
+  abstract: true
+  name: kidneys
+  description: Filters toxins from the bloodstream.
+  components:
+  - type: Sprite
+    layers:
+    - state: kidney-l
+    - state: kidney-r
+  - type: Organ
+    organType: Kidneys
+  - type: Metabolizer
+    maxReagents: 5
+    types: [Human]
+    stages:
+      Excretion:
+        solutionName: bloodstream
+  - type: RespiratorСonsumer
+    saturationConsumption: 0.001
+
+- type: entity
+  id: BaseOrganGland
+  parent: BaseOrgan
+  abstract: true
+  name: gland
+  description: There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible.
+  components:
+  - type: Organ
+    organType: Gland
diff --git a/Resources/Prototypes/_White/Body/Organs/infection.yml b/Resources/Prototypes/_White/Entities/Body/Organs/infection.yml
similarity index 99%
rename from Resources/Prototypes/_White/Body/Organs/infection.yml
rename to Resources/Prototypes/_White/Entities/Body/Organs/infection.yml
index 8be99fe57b7..1b62b562085 100644
--- a/Resources/Prototypes/_White/Body/Organs/infection.yml
+++ b/Resources/Prototypes/_White/Entities/Body/Organs/infection.yml
@@ -8,7 +8,7 @@
     sprite: _White/Mobs/Species/Xenomorph/organs.rsi
     state: embryon
   - type: Organ
-    slotId: xenomorph_larva
+    organType: Infection
   - type: StaticPrice
     price: 2000
   - type: XenomorphInfection
diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/hoods.yml
index 52b5382f81e..eb98781e3e6 100644
--- a/Resources/Prototypes/_White/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Head/hoods.yml
@@ -13,4 +13,4 @@
     unequipSound: /Audio/Effects/rustle2.ogg
   - type: HideLayerClothing
     slots:
-    - Hair
+    - enum.HumanoidVisualLayers.Hair
diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/modsuits.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/modsuits.yml
index 908d6b610af..89b718b4820 100644
--- a/Resources/Prototypes/_White/Entities/Clothing/Head/modsuits.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Head/modsuits.yml
@@ -10,10 +10,10 @@
     sprite: _White/Clothing/Head/modsuits/Infiltrator.rsi
   - type: HideLayerClothing
     slots:
-    - Hair
-    - Snout
-    - HeadTop
-    - HeadSide
+    - enum.HumanoidVisualLayers.Hair
+    - enum.HumanoidVisualLayers.Snout
+    - enum.HumanoidVisualLayers.HeadTop
+    - enum.HumanoidVisualLayers.HeadSide
   - type: Armor
     modifiers:
       coefficients:
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/human_hair.yml
index e402f6bcbe1..ab1baba85e9 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1,543 +1,611 @@
 - type: marking
   id: HumanHairAfropuffdouble
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: afropuffdouble
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: afropuffdouble
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairAfropuffleft
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: afropuffleft
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: afropuffleft
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairAfropuffright
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: afropuffright
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: afropuffright
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairAmazon
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: amazon
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: amazon
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairAstolfo
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: astolfo
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: astolfo
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairBaum
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: baum
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: baum
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairBeachwave
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: beachwave
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: beachwave
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairBluntbangs
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: bluntbangs
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: bluntbangs
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairBluntbangsAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: bluntbangs_alt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: bluntbangs_alt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairBobcutAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: bobcutalt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: bobcutalt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairBunhead4
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: bunhead4
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: bunhead4
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairCombed
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: combed
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: combed
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairCombedbob
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: combedbob
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: combedbob
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairCotton
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: cotton
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: cotton
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairCurly
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: curly
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: curly
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairDave
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: dave
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: dave
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairDiagonalBangs
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: diagonal_bangs
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: diagonal_bangs
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairEmoshort
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: emoshort
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: emoshort
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairFingerwave
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: fingerwave
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: fingerwave
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairFluffyShort
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: fluffy_short
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: fluffy_short
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairFortuneteller
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: fortuneteller
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: fortuneteller
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairFortunetellerAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: fortuneteller_alt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: fortuneteller_alt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairFroofylong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: froofylong
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: froofylong
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairGeisha
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: geisha
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: geisha
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairGentle21
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: gentle21
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: gentle21
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairGlammetal
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: glammetal
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: glammetal
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairGloomyLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: gloomy_long
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: gloomy_long
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairGloomyMedium
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: gloomy_medium
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: gloomy_medium
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairGrande
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: grande
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: grande
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairHalfshave
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: halfshave
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: halfshave
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairHalfshaveglamorous
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: halfshave_glamorous
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: halfshave_glamorous
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairHalfshaveLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: halfshave_long
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: halfshave_long
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairHalfshaveMessy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: halfshave_messy
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: halfshave_messy
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairHalfshaveMessyLong
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: halfshave_messylong
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: halfshave_messylong
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairHalfshaveSnout
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: halfshave_snout
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: halfshave_snout
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairHyenamane
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: hyenamane
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: hyenamane
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairJessica
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: jessica
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: jessica
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairLong5
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: long5
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: long5
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairLongdtails
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: longdtails
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: longdtails
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairLongerAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: longeralt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: longeralt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairLongovereyeAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: longovereye_alt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: longovereye_alt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairLongsidepartstraight
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: longsidepartstraight
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: longsidepartstraight
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairLooseSlicked
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: loose_slicked
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: loose_slicked
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairMediumbraid
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: mediumbraid
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: mediumbraid
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairNewyou
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: newyou
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: newyou
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairPonytailAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: ponytailalt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: ponytailalt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairPonytailF
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: ponytailf
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: ponytailf
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairPoofy2
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: poofy2
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: poofy2
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairQuadcurls
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: quadcurls
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: quadcurls
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSabitsuki
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: sabitsuki
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: sabitsuki
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairScully
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: scully
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: scully
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairShorthair4
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: shorthair4
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: shorthair4
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairShy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: shy
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: shy
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSimplePonytail
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: simple_ponytail
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: simple_ponytail
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSleaze
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: sleaze
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: sleaze
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSlightlyMessy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: slightlymessy
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: slightlymessy
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSlimedroplet
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: slimedroplet
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: slimedroplet
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSlimedropletAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: slimedroplet_alt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: slimedroplet_alt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSlimespikes
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: slimespikes
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: slimespikes
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSlimetendrils
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: slimetendrils
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: slimetendrils
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSlimetendrilsAlt
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: slimetendrils_alt
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: slimetendrils_alt
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairSpicy
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: spicy
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: spicy
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairTwintailFloor
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: twintail_floor
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: twintail_floor
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairVeryshortovereye
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: veryshortovereye
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: veryshortovereye
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairVictory
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: victory
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: victory
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairViper
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: viper
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: viper
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairWife
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: wife
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: wife
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HumanHairZiegler
-  bodyPart: Hair
   markingCategory: Hair
   sprites:
-    - sprite: _White/Mobs/Customization/human_hair.rsi
-      state: ziegler
+  - sprite: _White/Mobs/Customization/human_hair.rsi
+    state: ziegler
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml
index abe1ddc455e..bec4cb91982 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -1,159 +1,257 @@
 # HEAD
 - type: marking
   id: LizardHeadGuilmon
-  bodyPart: Eyes
   markingCategory: Head
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/snouts.rsi
     state: guilmon
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
 
 - type: marking
   id: LizardHeadCobraHood
-  bodyPart: HeadSide
   markingCategory: HeadSide
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi
     state: cobra_hood_with_ears
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
   - sprite: _White/Mobs/Customization/reptilian_parts.rsi
     state: cobra_hood_with_ears_overlay
+    layer: enum.HumanoidVisualLayers.HeadSide
+    bodyPart: Head
 
 # SHOUT
 - type: marking
   id: LizardShoutEasternDragon
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/snouts.rsi
     state: eastern_dragon
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
   - sprite: _White/Mobs/Customization/snouts.rsi
     state: eastern_dragon_overlay
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
 
 - type: marking
   id: LizardShoutEasternDragonUsiki
-  bodyPart: Snout
   markingCategory: Snout
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/snouts.rsi
     state: eastern_dragon
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
   - sprite: _White/Mobs/Customization/snouts.rsi
     state: eastern_dragon_overlay
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
   - sprite: _White/Mobs/Customization/snouts.rsi
     state: eastern_dragon_usiki
+    layer: enum.HumanoidVisualLayers.Snout
+    bodyPart: Head
 
 # TAIL
 - type: marking
   id: SnakeLargeTail
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: [Reptilian]
   sprites:
-    - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
-      state: snake_large
-    - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
-      state: snake_large_overlay
+  - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
+    state: snake_large
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+  - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
+    state: snake_large_overlay
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 - type: marking
   id: SnakeLargeTailAnimated
-  bodyPart: Tail
   markingCategory: Tail
   speciesRestriction: []
   sprites:
-    - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
-      state: snake_large_wagging
-    - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
-      state: snake_large_wagging_overlay
+  - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
+    state: snake_large_wagging
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailReptilian
+  - sprite: _White/Mobs/Customization/reptilian_64x32.rsi
+    state: snake_large_wagging_overlay
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 # SPINE
 - type: marking
   id: LizardChestSpinesAquatic
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_aquatic
+    state: spines_aquatic_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_aquatic_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_aquatic_head
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_aquatic_tail
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 - type: marking
   id: LizardChestSpinesAquaticWithoutTail
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_aquatic_alt
+    state: spines_aquatic_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_aquatic_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_aquatic_head
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
 
 - type: marking
   id: LizardChestSpinesLong
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_long
+    state: spines_long_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_long_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_long_tail
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 - type: marking
   id: LizardChestSpinesLongWithoutTail
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_long_alt
+    state: spines_long_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_long_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
 
 - type: marking
   id: LizardChestSpinesLongMembrane
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_longmembrane
+    state: spines_longmembrane_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_longmembrane_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_longmembrane_tail
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 - type: marking
   id: LizardChestSpinesLongMembraneWithoutTail
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_longmembrane_alt
+    state: spines_longmembrane_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_longmembrane_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
 
 - type: marking
   id: LizardChestSpinesShort
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_short
+    state: spines_short_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_short_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_short_tail
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 - type: marking
   id: LizardChestSpinesShortWithoutTail
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_short_alt
+    state: spines_short_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_short_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
 
 - type: marking
   id: LizardChestSpinesShortMembrane
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_shortmembrane
+    state: spines_shortmembrane_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_shortmembrane_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_shortmembrane_tail
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 - type: marking
   id: LizardChestSpinesShortMembraneWithoutTail
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: _White/Mobs/Customization/reptilian.rsi
-    state: spines_shortmembrane_alt
+    state: spines_shortmembrane_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/reptilian.rsi
+    state: spines_shortmembrane_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi.yml b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi.yml
index 33acf1e7db5..cda07ea5247 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi.yml
@@ -1,82 +1,90 @@
 - type: marking
   id: ResomiTail
-  bodyPart: Chest
   markingCategory: Tail
   speciesRestriction: [Resomi]
   forcedColoring: true
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: tail
-
-- type: marking
-  id: ResomiTailFeathers
-  bodyPart: Chest
-  markingCategory: Tail
-  speciesRestriction: [Resomi]
-  sprites:
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
+    replacementBodyPart: BodyPartTailResomi
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: tail_feathers
+    layer: enum.BodyAppearanceLayer.Tail
+    bodyPart: Tail
 
 - type: marking
   id: ResomiLArmFeathers
-  bodyPart: LHand
   markingCategory: LeftArm
   speciesRestriction: [Resomi]
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: l_hand_feathers
+    layer: enum.BodyAppearanceLayer.LeftHand
+    bodyPart: LeftHand
 
 - type: marking
   id: ResomiLLegFeathers
-  bodyPart: LFoot
   markingCategory: LeftLeg
   speciesRestriction: [Resomi]
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: l_foot_feathers
+    layer: enum.BodyAppearanceLayer.LeftFoot
+    bodyPart: LeftFoot
 
 - type: marking
   id: ResomiRArmFeathers
-  bodyPart: RHand
   markingCategory: RightArm
   speciesRestriction: [Resomi]
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: r_hand_feathers
+    layer: enum.BodyAppearanceLayer.RightHand
+    bodyPart: RightHand
 
 - type: marking
   id: ResomiRLegFeathers
-  bodyPart: RFoot
   markingCategory: RightLeg
   speciesRestriction: [Resomi]
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: r_foot_feathers
+    layer: enum.BodyAppearanceLayer.RightFoot
+    bodyPart: RightFoot
 
 - type: marking
   id: ResomiFluff
-  bodyPart: Chest
   markingCategory: Chest
   speciesRestriction: [Resomi]
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
-    state: fluff
+    state: fluff_chest
+    layer: enum.BodyAppearanceLayer.Chest
+    bodyPart: Chest
+  - sprite: _White/Mobs/Customization/resomi_parts.rsi
+    state: fluff_groin
+    layer: enum.BodyAppearanceLayer.Groin
+    bodyPart: Groin
 
 - type: marking
   id: ResomiFluffHead
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Resomi]
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: fluff_head
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
 
 - type: marking
   id: ResomiFluffHeadUp
-  bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Resomi]
   sprites:
   - sprite: _White/Mobs/Customization/resomi_parts.rsi
     state: fluff_head_up
+    layer: enum.BodyAppearanceLayer.Head
+    bodyPart: Head
 
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi_hair.yml b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi_hair.yml
index 55865a96dab..8567fd80c1a 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi_hair.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Customization/Markings/resomi_hair.yml
@@ -1,161 +1,179 @@
 - type: marking
   id: HairResomiBackstrafe
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiBackstrafe
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiBackstrafe
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiBurstShort
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiBurstShort
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiBurstShort
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiDefault
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiDefault
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiDefault
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiDroopy
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiDroopy
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiDroopy
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiEars
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiEars
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiEars
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiFluffymohawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiFluffymohawk
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiFluffymohawk
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiHedge
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiHedge
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiHedge
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiLongway
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiLongway
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiLongway
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiMane
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiMane
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiMane
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiManeBeardless
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiManeBeardless
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiManeBeardless
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiMohawk
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiMohawk
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiMohawk
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiMushroom
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiMushroom
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiMushroom
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiNotree
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiNotree
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiNotree
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiSpiky
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiSpiky
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiSpiky
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiPointy
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiPointy
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiPointy
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiTwies
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiTwies
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiTwies
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiUpright
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiUpright
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiUpright
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
 
 - type: marking
   id: HairResomiLong
-  bodyPart: Hair
   markingCategory: Hair
   speciesRestriction: [Resomi]
   sprites:
-    - sprite: _White/Mobs/Customization/resomi_hair.rsi
-      state: ResomiLong
+  - sprite: _White/Mobs/Customization/resomi_hair.rsi
+    state: ResomiLong
+    layer: enum.HumanoidVisualLayers.Hair
+    bodyPart: Head
diff --git a/Resources/Prototypes/_White/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_White/Entities/Mobs/NPCs/animals.yml
new file mode 100644
index 00000000000..c5b842e565f
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Mobs/NPCs/animals.yml
@@ -0,0 +1,26 @@
+- type: entity
+  id: MobDionaNymphBrain
+  parent: MobDionaNymph
+  suffix: Brain
+  description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
+  components:
+  - type: Body
+    prototype: DionaNymphBrain
+
+- type: entity
+  id: MobDionaNymphStomach
+  parent: MobDionaNymphAccent
+  suffix: Stomach
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it.
+  components:
+  - type: Body
+    prototype: DionaNymphStomach
+
+- type: entity
+  id: MobDionaNymphLungs
+  parent: MobDionaNymphAccent
+  suffix: Lungs
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking.
+  components:
+  - type: Body
+    prototype: DionaNymphLungs
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Species/resomi.yml b/Resources/Prototypes/_White/Entities/Mobs/Species/resomi.yml
index e311ad71235..517d968525d 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Species/resomi.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Species/resomi.yml
@@ -16,12 +16,13 @@
   - type: DamageVisuals
     thresholds: [ 10, 30, 50, 70]
     targetLayers:
-    - "enum.HumanoidVisualLayers.Chest"
-    - "enum.HumanoidVisualLayers.Head"
-    - "enum.HumanoidVisualLayers.LArm"
-    - "enum.HumanoidVisualLayers.LLeg"
-    - "enum.HumanoidVisualLayers.RArm"
-    - "enum.HumanoidVisualLayers.RLeg"
+    - "enum.BodyAppearanceLayer.Chest"
+    - "enum.BodyAppearanceLayer.Groin"
+    - "enum.BodyAppearanceLayer.Head"
+    - "enum.BodyAppearanceLayer.LeftArm"
+    - "enum.BodyAppearanceLayer.LeftLeg"
+    - "enum.BodyAppearanceLayer.RightArm"
+    - "enum.BodyAppearanceLayer.RightLeg"
     damageOverlayGroups:
       Brute:
         sprite: _White/Mobs/Effects/Resomi/brute_damage.rsi
@@ -59,7 +60,6 @@
     damageModifierSet: Resomi
   - type: Body
     prototype: Resomi
-    requiredLegs: 2
   - type: Bloodstream
     bloodReagent: ResomiBlood
   - type: MeleeWeapon
@@ -230,3 +230,7 @@
           32:
             sprite: _White/Mobs/Species/Resomi/displacement.rsi
             state: belt
+  # WD EDIT START
+  - type: Body
+    prototype: Resomi
+  # WD EDIT END
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/base.yml b/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/base.yml
index 48ee2fadd89..a87c161bcad 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/base.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/base.yml
@@ -155,7 +155,6 @@
   - type: Inventory
     templateId: xenomorph
   - type: Stripping
-  - type: SurgeryTarget
   - type: UserInterface
     interfaces:
       enum.StrippingUiKey.Key:
@@ -163,8 +162,6 @@
       enum.InstrumentUiKey.Key:
         type: InstrumentBoundUserInterface
         requireInputValidation: false
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
   - type: RotationVisuals
     defaultRotation: 90
     horizontalRotation: 90
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/drone.yml b/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/drone.yml
index a7e41f92e35..e88095e3a49 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/drone.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/drone.yml
@@ -60,8 +60,6 @@
       enum.InstrumentUiKey.Key:
         type: InstrumentBoundUserInterface
         requireInputValidation: false
-      enum.SurgeryUIKey.Key:
-        type: SurgeryBui
 
 - type: entity
   parent: [BaseMobXenomorphDungeon, BaseMobXenomorphDrone]
diff --git a/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/larva.yml b/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/larva.yml
index de7cbb1854d..4c73cc58643 100644
--- a/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/larva.yml
+++ b/Resources/Prototypes/_White/Entities/Mobs/Xenomorphs/larva.yml
@@ -57,7 +57,6 @@
   - type: MobPrice
     price: 250
   - type: Organ
-    slotId: xenomorph_larva
   # - type: GuideHelp
   #   guides:
   #   - XenomorphLarva
diff --git a/Resources/Prototypes/_White/Entities/Mobs/base.yml b/Resources/Prototypes/_White/Entities/Mobs/base.yml
new file mode 100644
index 00000000000..e4a977595ba
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Mobs/base.yml
@@ -0,0 +1,87 @@
+- type: entity
+  abstract: true
+  id: BaseMobWoundable
+  components:
+  - type: Woundable
+  - type: Damageable
+    damageContainer: Biological
+  - type: RadiationReceiver
+  - type: Stamina
+  - type: MobState
+  - type: MobStateActions
+    actions:
+      Critical:
+      - ActionCritSuccumb
+      - ActionCritFakeDeath
+      - ActionCritLastWords
+  - type: Deathgasp
+  - type: HealthExaminable
+    examinableTypes:
+    - Blunt
+    - Slash
+    - Piercing
+    - Heat
+    - Shock
+  - type: DamageOnHighSpeedImpact
+    damage:
+      types:
+        Blunt: 5
+    soundHit:
+      path: /Audio/Effects/hit_kick.ogg
+  - type: Pullable
+  - type: LightningTarget
+    priority: 2
+    lightningExplode: false
+  - type: Hearing
+  - type: Painful
+  - type: PainThresholds
+    mobStateThresholds:
+      0: Alive
+      200: Critical
+      500: Dead
+    painLevelThresholds:
+      0: Zero
+      25: Mild
+      70: Moderate
+      130: Severe
+      200: Excruciating
+      350: Mortal
+    painEffects:
+      Moderate:
+      - !type:Emote
+        emote: PainScream
+        showInChat: true
+      - !type:Jitter
+        amplitude: 24
+        frequency: 1
+        time: 0.9
+      Severe:
+      - !type:Emote
+        emote: PainScream
+        showInChat: true
+      - !type:Jitter
+        amplitude: 30
+        frequency: 12
+        time: 0.9
+      Excruciating:
+      - !type:Emote
+        emote: PainScream
+        showInChat: true
+      - !type:Jitter
+        amplitude: 20
+        frequency: 7
+        time: 4
+      - !type:Paralyze
+        paralyzeTime: 2
+      # TODO: Release of adrenaline into the blood.
+      Mortal:
+      - !type:Emote
+        emote: PainScream
+        showInChat: true
+      - !type:Jitter
+        amplitude: 20
+        frequency: 7
+        time: 7
+      - !type:Paralyze
+        paralyzeTime: 3
+        # TODO: Release of adrenaline into the blood.
diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/hosbat.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/hosbat.yml
index dcbb87b36d4..455a0d4a9ed 100644
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/hosbat.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Melee/hosbat.yml
@@ -219,4 +219,4 @@
           Blunt: 350
       randomDamageChance: 0.001
       applyBonusOnThrow: true
-      forcedThrowTargetPart: "Head"
+      # forcedThrowTargetPart: "Head"
diff --git a/Resources/Prototypes/_White/Entities/Surgery/surgeries.yml b/Resources/Prototypes/_White/Entities/Surgery/surgeries.yml
index f94c05be72b..31ffb558969 100644
--- a/Resources/Prototypes/_White/Entities/Surgery/surgeries.yml
+++ b/Resources/Prototypes/_White/Entities/Surgery/surgeries.yml
@@ -1,20 +1,20 @@
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveLarvaEmbryo
-  name: Remove Larva Embryo
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: XenomorphInfection
-    slotId: xenomorph_larva
+# - type: entity
+#   parent: SurgeryBase
+#   id: SurgeryRemoveLarvaEmbryo
+#  name: Remove Larva Embryo
+#   categories: [ HideSpawnMenu ]
+#   components:
+#   - type: Surgery
+#     requirement: SurgeryOpenRibcage
+#    steps:
+#     - SurgeryStepClampInternalBleeders
+#     - SurgeryStepRemoveOrgan
+#   - type: SurgeryPartCondition
+#     part: Torso
+#   - type: SurgeryOrganCondition
+#     organ:
+#     - type: XenomorphInfection
+#     slotId: xenomorph_larva
 
 # - type: entity
 #   parent: SurgeryBase
@@ -37,20 +37,20 @@
 #     reattaching: true
 #     slotId: xenomorph_larva
 
-- type: entity
-  parent: SurgeryBase
-  id: SurgeryRemoveLarva
-  name: Remove Larva
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Surgery
-    requirement: SurgeryOpenRibcage
-    steps:
-    - SurgeryStepClampInternalBleeders
-    - SurgeryStepRemoveOrgan
-  - type: SurgeryPartCondition
-    part: Torso
-  - type: SurgeryOrganCondition
-    organ:
-    - type: XenomorphLarva
-    slotId: xenomorph_larva
+# - type: entity
+#   parent: SurgeryBase
+#   id: SurgeryRemoveLarva
+#   name: Remove Larva
+#   categories: [ HideSpawnMenu ]
+#   components:
+#   - type: Surgery
+#     requirement: SurgeryOpenRibcage
+#     steps:
+#     - SurgeryStepClampInternalBleeders
+#     - SurgeryStepRemoveOrgan
+#   - type: SurgeryPartCondition
+#     part: Torso
+#   - type: SurgeryOrganCondition
+#     organ:
+#     - type: XenomorphLarva
+#     slotId: xenomorph_larva
diff --git a/Resources/Prototypes/_White/Entities/Wounds/base.yml b/Resources/Prototypes/_White/Entities/Wounds/base.yml
new file mode 100644
index 00000000000..b9168e2c342
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Wounds/base.yml
@@ -0,0 +1,5 @@
+- type: entity
+  id: WoundBase
+  abstract: true
+  components:
+  - type: Wound
diff --git a/Resources/Prototypes/_White/Entities/Wounds/damage.yml b/Resources/Prototypes/_White/Entities/Wounds/damage.yml
new file mode 100644
index 00000000000..aa94d825682
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Wounds/damage.yml
@@ -0,0 +1,83 @@
+- type: entity
+  id: WoundBlunt
+  parent: WoundBase
+  name: bruise
+  components:
+  - type: Wound
+    damageType: Blunt
+  - type: PainfulWound
+    painCoefficients: 0.8
+    freshPainCoefficients: 0.6
+  - type: BleedingWound
+
+- type: entity
+  id: WoundSlash
+  parent: WoundBase
+  name: cut
+  components:
+  - type: Wound
+    damageType: Slash
+  - type: PainfulWound
+    painCoefficients: 0.8
+    freshPainCoefficients: 0.6
+  - type: BleedingWound
+    bleedingCoefficient: 0.1
+    bleedingDurationCoefficient: 2
+
+- type: entity
+  id: WoundPiercing
+  parent: WoundBase
+  name: puncture
+  components:
+  - type: Wound
+    damageType: Piercing
+  - type: PainfulWound
+    painCoefficients: 0.8
+    freshPainCoefficients: 0.6
+  - type: BleedingWound
+    bleedingCoefficient: 0.1
+    bleedingDurationCoefficient: 2
+
+- type: entity
+  id: WoundHeat
+  parent: WoundBase
+  name: burn
+  components:
+  - type: Wound
+    damageType: Heat
+  - type: PainfulWound
+    painCoefficients: 0.6
+    freshPainCoefficients: 0.8
+
+- type: entity
+  id: WoundCold
+  parent: WoundBase
+  name: frostbite
+  components:
+  - type: Wound
+    damageType: Cold
+  - type: PainfulWound
+    painCoefficients: 0.6
+    freshPainCoefficients: 0.8
+
+- type: entity
+  id: WoundCaustic
+  parent: WoundBase
+  name: caustic burn
+  components:
+  - type: Wound
+    damageType: Caustic
+  - type: PainfulWound
+    painCoefficients: 0.6
+    freshPainCoefficients: 0.8
+
+- type: entity
+  id: WoundShock
+  parent: WoundBase
+  name: shock burn
+  components:
+  - type: Wound
+    damageType: Shock
+  - type: PainfulWound
+    painCoefficients: 0.6
+    freshPainCoefficients: 0.8
diff --git a/Resources/Prototypes/_White/Entities/Wounds/scar.yml b/Resources/Prototypes/_White/Entities/Wounds/scar.yml
new file mode 100644
index 00000000000..3d8db024069
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/Wounds/scar.yml
@@ -0,0 +1,15 @@
+- type: entity
+  id: WoundScarAmputation
+  parent: WoundBase
+  name: bruise
+  components:
+  - type: Wound
+    damageType: Slash
+    isScar: true
+  - type: PainfulWound
+    pain: 20
+    painCoefficients: 0.8
+    freshPainCoefficients: 0.6
+  - type: BleedingWound
+    bleedingCoefficient: 0.02
+    bleedingDurationCoefficient: 2
diff --git a/Resources/Prototypes/_White/Entities/categories.yml b/Resources/Prototypes/_White/Entities/categories.yml
new file mode 100644
index 00000000000..2962e970114
--- /dev/null
+++ b/Resources/Prototypes/_White/Entities/categories.yml
@@ -0,0 +1,4 @@
+- type: entityCategory
+  id: Wounds
+  name: entity-category-name-wounds
+  hideSpawnMenu: true
diff --git a/Resources/Prototypes/_White/GameRules/midround.yml b/Resources/Prototypes/_White/GameRules/midround.yml
index 3198b3318ed..95faabda387 100644
--- a/Resources/Prototypes/_White/GameRules/midround.yml
+++ b/Resources/Prototypes/_White/GameRules/midround.yml
@@ -36,8 +36,8 @@
       - type: NpcFactionMember
         factions:
         - Syndicate
-      - type: SurgerySpeedModifier
-        speedModifier: 5
+      # - type: SurgerySpeedModifier
+      #   speedModifier: 5
       mindRoles:
       - MindRoleNukeopsMedic
     - spawnerPrototype: SpawnPointNukeopsOperative
diff --git a/Resources/Prototypes/_White/Reagents/fun.yml b/Resources/Prototypes/_White/Reagents/fun.yml
index 9ced4b3020e..f2a468cc8e2 100644
--- a/Resources/Prototypes/_White/Reagents/fun.yml
+++ b/Resources/Prototypes/_White/Reagents/fun.yml
@@ -7,7 +7,7 @@
   flavor: mindful
   color: "#915E48"
   metabolisms:
-    Poison:
+    Absorption:
       metabolismRate: 0.25
       effects:
       - !type:PopupMessage
@@ -33,7 +33,7 @@
       - !type:Polymorph
         prototype: Gondola
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Animal
           shouldHave: false
         - !type:ReagentThreshold
diff --git a/Resources/Prototypes/_White/Reagents/gases.yml b/Resources/Prototypes/_White/Reagents/gases.yml
index bc70561ded8..83eccf5c59c 100644
--- a/Resources/Prototypes/_White/Reagents/gases.yml
+++ b/Resources/Prototypes/_White/Reagents/gases.yml
@@ -6,7 +6,7 @@
   flavor: bitter
   color: "#e69edd"
   metabolisms:
-    Gas:
+    Respiration:
       effects:
       - !type:GenericStatusEffect
         key: SeeingRainbows
@@ -29,7 +29,7 @@
         - !type:ReagentThreshold
           reagent: BZ
           min: 1
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Slime
         type: Local
         visualType: Medium
@@ -40,7 +40,7 @@
         - !type:ReagentThreshold
           reagent: BZ
           min: 1
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Slime
         walkSpeedModifier: 0.65
         sprintSpeedModifier: 0.65
@@ -49,7 +49,7 @@
         - !type:ReagentThreshold
           reagent: BZ
           min: 1
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Slime
         key: ForcedSleep
         component: ForcedSleeping
@@ -66,31 +66,31 @@
   boilingPoint: -183.0
   meltingPoint: -218.4
   metabolisms:
-    Gas:
+    Respiration:
       effects:
       - !type:Oxygenate
         factor: 8
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Human
       - !type:Oxygenate
         factor: 8
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Animal
       - !type:Oxygenate
         factor: 8
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Rat
       - !type:Oxygenate
         factor: 8
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Plant
       - !type:ModifyLungGas
         conditions:
-        - !type:OrganType
+        - !type:MetabolizerType
           type: Vox
           shouldHave: false
         ratios:
@@ -118,7 +118,7 @@
   boilingPoint: -253.0
   meltingPoint: -259.2
   metabolisms:
-    Gas:
+    Respiration:
       effects:
       - !type:MovespeedModifier
         conditions:
@@ -171,7 +171,7 @@
   boilingPoint: -253.0
   meltingPoint: -259.2
   metabolisms:
-    Gas:
+    Respiration:
       effects:
       - !type:GenericStatusEffect
         conditions:
@@ -191,11 +191,9 @@
         ignoreResistances: true
         damage:
           groups:
-            # WD EDIT START - small buff
             Brute: -2.0
             Burn: -2.0
             Toxin: -1.0
-            # WD EDIT END
 
 - type: reagent
   id: Hyper-Noblium
@@ -227,7 +225,7 @@
   boilingPoint: -253.0
   meltingPoint: -259.2
   metabolisms:
-    Gas:
+    Respiration:
       effects:
       - !type:HealthChange
         conditions:
diff --git a/Resources/Prototypes/_White/Reagents/narcotics.yml b/Resources/Prototypes/_White/Reagents/narcotics.yml
index 28dd2774ebb..6763fa73d25 100644
--- a/Resources/Prototypes/_White/Reagents/narcotics.yml
+++ b/Resources/Prototypes/_White/Reagents/narcotics.yml
@@ -9,7 +9,7 @@
   boilingPoint: 212.0
   meltingPoint: 170.0
   metabolisms:
-    Narcotic:
+    Absorption:
       metabolismRate: 0.25
       effects:
       - !type:MovespeedModifier
@@ -89,9 +89,6 @@
         key: Adrenaline
         component: IgnoreSlowOnDamage
         time: 5
-    Medicine:
-      metabolismRate: 0.25
-      effects:
       - !type:ResetNarcolepsy
       - !type:SatiateHunger
         factor: 1
diff --git a/Resources/Prototypes/_White/Recipes/Crafting/Graphs/prosthetic.yml b/Resources/Prototypes/_White/Recipes/Crafting/Graphs/prosthetic.yml
index 480365c0139..b5aa07c8705 100644
--- a/Resources/Prototypes/_White/Recipes/Crafting/Graphs/prosthetic.yml
+++ b/Resources/Prototypes/_White/Recipes/Crafting/Graphs/prosthetic.yml
@@ -1,114 +1,114 @@
-- type: constructionGraph
-  id: MakeshiftRightLegGraph
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: makeshiftrightleg
-      steps:
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-      - material: Cable
-        amount: 10
-      - material: WoodPlank
-        amount: 3
-      - material: Cloth
-        amount: 3
-      - material: MetalRod
-        amount: 4
-        doAfter: 20
-  - node: makeshiftrightleg
-    entity: MakeshiftRightLeg
+# - type: constructionGraph
+#   id: MakeshiftRightLegGraph
+#   start: start
+#   graph:
+#  - node: start
+#     edges:
+#     - to: makeshiftrightleg
+#      steps:
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#       - material: Cable
+#        amount: 10
+#       - material: WoodPlank
+#        amount: 3
+#       - material: Cloth
+#        amount: 3
+#       - material: MetalRod
+#         amount: 4
+#         doAfter: 20
+#   - node: makeshiftrightleg
+#     entity: MakeshiftRightLeg
 
-- type: constructionGraph
-  id: MakeshiftLeftLegGraph
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: makeshiftleftleg
-      steps:
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-      - material: Cable
-        amount: 10
-      - material: WoodPlank
-        amount: 3
-      - material: Cloth
-        amount: 3
-      - material: MetalRod
-        amount: 4
-        doAfter: 20
-  - node: makeshiftleftleg
-    entity: MakeshiftLeftLeg
+# - type: constructionGraph
+#   id: MakeshiftLeftLegGraph
+#   start: start
+#   graph:
+#   - node: start
+#     edges:
+#     - to: makeshiftleftleg
+#       steps:
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#       - material: Cable
+#         amount: 10
+#       - material: WoodPlank
+#         amount: 3
+#       - material: Cloth
+#         amount: 3
+#       - material: MetalRod
+#         amount: 4
+#         doAfter: 20
+#   - node: makeshiftleftleg
+#     entity: MakeshiftLeftLeg
 
-- type: constructionGraph
-  id: MakeshiftLeftArmGraph
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: makeshiftleftarm
-      steps:
-      - material: Cloth
-        amount: 5
-      - material: Cable
-        amount: 15
-      - material: MetalRod
-        amount: 8
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-        doAfter: 25
-  - node: makeshiftleftarm
-    entity: MakeshiftLeftArm
-- type: constructionGraph
-  id: MakeshiftRightArmGraph
-  start: start
-  graph:
-  - node: start
-    edges:
-    - to: makeshiftrightarm
-      steps:
-      - material: Cloth
-        amount: 5
-      - material: Cable
-        amount: 15
-      - material: MetalRod
-        amount: 8
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-      - tag: Pipe
-        icon:
-          sprite: Structures/Piping/Atmospherics/pipe.rsi
-          state: pipeStraight
-        name: pipe
-        doAfter: 25
-  - node: makeshiftrightarm
-    entity: MakeshiftRightArm
+# - type: constructionGraph
+#   id: MakeshiftLeftArmGraph
+#  start: start
+#   graph:
+#   - node: start
+#     edges:
+#     - to: makeshiftleftarm
+#       steps:
+#       - material: Cloth
+#         amount: 5
+#       - material: Cable
+#         amount: 15
+#       - material: MetalRod
+#         amount: 8
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#         doAfter: 25
+#   - node: makeshiftleftarm
+#     entity: MakeshiftLeftArm
+# - type: constructionGraph
+#   id: MakeshiftRightArmGraph
+#   start: start
+#   graph:
+#   - node: start
+#     edges:
+#     - to: makeshiftrightarm
+#       steps:
+#       - material: Cloth
+#         amount: 5
+#       - material: Cable
+#         amount: 15
+#       - material: MetalRod
+#         amount: 8
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#       - tag: Pipe
+#         icon:
+#           sprite: Structures/Piping/Atmospherics/pipe.rsi
+#           state: pipeStraight
+#         name: pipe
+#         doAfter: 25
+#   - node: makeshiftrightarm
+#     entity: MakeshiftRightArm
diff --git a/Resources/Prototypes/_White/Recipes/Crafting/prosthetic.yml b/Resources/Prototypes/_White/Recipes/Crafting/prosthetic.yml
index fb312ed1034..488aa580428 100644
--- a/Resources/Prototypes/_White/Recipes/Crafting/prosthetic.yml
+++ b/Resources/Prototypes/_White/Recipes/Crafting/prosthetic.yml
@@ -1,51 +1,51 @@
-- type: construction
-  name: Right leg prosthetic
-  id: MakeshiftRightLeg
-  graph: MakeshiftRightLegGraph
-  startNode: start
-  targetNode: makeshiftrightleg
-  category: construction-category-misc
-  objectType: Item
-  description: Poor, slow replacement for a right leg, it's nearly impossible to run on it. It is cheap, though
-  icon:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_leg-combined"
+# - type: construction
+#   name: Right leg prosthetic
+#   id: MakeshiftRightLeg
+#   graph: MakeshiftRightLegGraph
+#   startNode: start
+#   targetNode: makeshiftrightleg
+#   category: construction-category-misc
+#   objectType: Item
+#   description: Poor, slow replacement for a right leg, it's nearly impossible to run on it. It is cheap, though
+#   icon:
+#     sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
+#     state: "r_leg-combined"
 
-- type: construction
-  name: Left leg prosthetic
-  id: MakeshiftLeftLeg
-  graph: MakeshiftLeftLegGraph
-  startNode: start
-  targetNode: makeshiftleftleg
-  category: construction-category-misc
-  objectType: Item
-  description: Poor, slow replacement for a left leg, it's nearly impossible to run on it. It is cheap, though
-  icon:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_leg-combined"
+# - type: construction
+#   name: Left leg prosthetic
+#   id: MakeshiftLeftLeg
+#   graph: MakeshiftLeftLegGraph
+#   startNode: start
+#   targetNode: makeshiftleftleg
+#   category: construction-category-misc
+#   objectType: Item
+#   description: Poor, slow replacement for a left leg, it's nearly impossible to run on it. It is cheap, though
+#   icon:
+#     sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
+#     state: "l_leg-combined"
 
-- type: construction
-  name: Right arm prosthetic
-  id: MakeshiftRightArm
-  graph: MakeshiftRightArmGraph
-  startNode: start
-  targetNode: makeshiftrightarm
-  category: construction-category-misc
-  objectType: Item
-  description: bulky and unhandy metal hand
-  icon:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "r_arm-combined"
+# - type: construction
+#   name: Right arm prosthetic
+#   id: MakeshiftRightArm
+#   graph: MakeshiftRightArmGraph
+#   startNode: start
+#   targetNode: makeshiftrightarm
+#   category: construction-category-misc
+#   objectType: Item
+#   description: bulky and unhandy metal hand
+#   icon:
+#     sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
+#     state: "r_arm-combined"
 
-- type: construction
-  name: Left arm prosthetic
-  id: MakeshiftLeftArm
-  graph: MakeshiftLeftArmGraph
-  startNode: start
-  targetNode: makeshiftleftarm
-  category: construction-category-misc
-  objectType: Item
-  description: bulky and unhandy metal hand
-  icon:
-    sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
-    state: "l_arm-combined"
+# - type: construction
+#   name: Left arm prosthetic
+#   id: MakeshiftLeftArm
+#   graph: MakeshiftLeftArmGraph
+#   startNode: start
+#   targetNode: makeshiftleftarm
+#   category: construction-category-misc
+#   objectType: Item
+#   description: bulky and unhandy metal hand
+#   icon:
+#     sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi
+#     state: "l_arm-combined"
diff --git a/Resources/Prototypes/_White/Shaders/shaders.yml b/Resources/Prototypes/_White/Shaders/shaders.yml
index 3bde4e772ef..7c4a71c02b4 100644
--- a/Resources/Prototypes/_White/Shaders/shaders.yml
+++ b/Resources/Prototypes/_White/Shaders/shaders.yml
@@ -37,3 +37,8 @@
   id: LightingOverlay
   kind: source
   path: "/Textures/_White/Effects/Shaders/light.swsl"
+
+- type: shader
+  id: PainBlink
+  kind: source
+  path: "/Textures/_White/Shaders/pain_blink.swsl"
diff --git a/Resources/Prototypes/_White/SoundCollections/pain_scream.yml b/Resources/Prototypes/_White/SoundCollections/pain_scream.yml
new file mode 100644
index 00000000000..4b6671758ef
--- /dev/null
+++ b/Resources/Prototypes/_White/SoundCollections/pain_scream.yml
@@ -0,0 +1,18 @@
+- type: soundCollection
+  id: MalePainScream
+  files:
+  - /Audio/_White/Voice/Human/male_pain_scream_1.ogg
+  - /Audio/_White/Voice/Human/male_pain_scream_2.ogg
+  - /Audio/_White/Voice/Human/male_pain_scream_3.ogg
+  - /Audio/_White/Voice/Human/male_pain_scream_4.ogg
+  - /Audio/_White/Voice/Human/male_pain_scream_5.ogg
+  - /Audio/_White/Voice/Human/male_pain_scream_6.ogg
+  - /Audio/_White/Voice/Human/male_pain_scream_7.ogg
+
+- type: soundCollection
+  id: FemalePainScream
+  files:
+  - /Audio/_White/Voice/Human/female_pain_scream_1.ogg
+  - /Audio/_White/Voice/Human/female_pain_scream_2.ogg
+  - /Audio/_White/Voice/Human/female_pain_scream_3.ogg
+  - /Audio/_White/Voice/Human/female_pain_scream_4.ogg
diff --git a/Resources/Prototypes/_White/Species/harpy.yml b/Resources/Prototypes/_White/Species/harpy.yml
deleted file mode 100644
index 130ed291086..00000000000
--- a/Resources/Prototypes/_White/Species/harpy.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-- type: bodyType
-  id: HarpySlim
-  name: body-slim
-  sexRestrictions:
-  - Male
-  sprites:
-    Head: MobHarpyHeadSlim
-    Face: MobHumanoidAnyMarking
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Chest: MobHarpyTorsoSlim
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobHarpyLArmSlim
-    RArm: MobHarpyRArmSlim
-    LHand: MobHarpyLHandSlim
-    RHand: MobHarpyRHandSlim
-    LLeg: MobHarpyLLegSlim
-    RLeg: MobHarpyRLegSlim
-    LFoot: MobHarpyLFootSlim
-    RFoot: MobHarpyRFootSlim
-
-- type: humanoidBaseSprite
-  id: MobHarpyHeadSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: head_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyHeadSlimMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: head_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyHeadSlimFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: head_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorsoSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: torso_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorsoSlimMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: torso_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyTorsoSlimFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: torso_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHarpyLLegSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: l_leg_slim
-
-- type: humanoidBaseSprite
-  id: MobHarpyLHandSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: l_hand_slim
-
-- type: humanoidBaseSprite
-  id: MobHarpyLArmSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: l_arm_slim
-
-- type: humanoidBaseSprite
-  id: MobHarpyLFootSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: l_foot_slim
-
-- type: humanoidBaseSprite
-  id: MobHarpyRLegSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: r_leg_slim
-
-- type: humanoidBaseSprite
-  id: MobHarpyRHandSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: r_hand_slim
-
-- type: humanoidBaseSprite
-  id: MobHarpyRArmSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: r_arm_slim
-
-- type: humanoidBaseSprite
-  id: MobHarpyRFootSlim
-  baseSprite:
-    sprite: _White/Mobs/Species/Harpy/parts.rsi
-    state: r_foot_slim
diff --git a/Resources/Prototypes/_White/Species/human.yml b/Resources/Prototypes/_White/Species/human.yml
deleted file mode 100644
index 57e842c6ff1..00000000000
--- a/Resources/Prototypes/_White/Species/human.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-- type: bodyType
-  id: HumanSlim
-  name: body-slim
-  sexRestrictions:
-  - Male
-  sprites:
-    Head: MobHumanSlimHead
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobHumanSlimTorso
-    HeadTop: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobHumanSlimLArm
-    RArm: MobHumanSlimRArm
-    LHand: MobHumanSlimLHand
-    RHand: MobHumanSlimRHand
-    LLeg: MobHumanSlimLLeg
-    RLeg: MobHumanSlimRLeg
-    LFoot: MobHumanSlimLFoot
-    RFoot: MobHumanSlimRFoot
-
-# Slim types
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimHead
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: head_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimHeadMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: head_slim_f
-    
-- type: humanoidBaseSprite
-  id: MobHumanSlimHeadFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: head_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimTorso
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: torso_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimTorsoMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: torso_slim_f
-    
-- type: humanoidBaseSprite
-  id: MobHumanSlimTorsoFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: torso_slim_f
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimLLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: l_leg_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimLArm
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: l_arm_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimLHand
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: l_hand_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimLFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: l_foot_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimRLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: r_leg_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimRArm
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: r_arm_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimRHand
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: r_hand_slim
-
-- type: humanoidBaseSprite
-  id: MobHumanSlimRFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Human/parts.rsi
-    state: r_foot_slim
diff --git a/Resources/Prototypes/_White/Species/reptilian.yml b/Resources/Prototypes/_White/Species/reptilian.yml
deleted file mode 100644
index 129d7281688..00000000000
--- a/Resources/Prototypes/_White/Species/reptilian.yml
+++ /dev/null
@@ -1,136 +0,0 @@
-- type: bodyType
-  id: ReptilianSlim
-  name: body-slim
-  sexRestrictions:
-  - Male
-  sprites:
-    Head: MobReptilianSlimHead
-    Face: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
-    Underwear: MobHumanoidAnyMarking
-    Undershirt: MobHumanoidAnyMarking
-    Chest: MobReptilianSlimTorso
-    HeadTop: MobHumanoidAnyMarking
-    HeadSide: MobHumanoidAnyMarking
-    Tail: MobHumanoidAnyMarking
-    Eyes: MobHumanoidEyes
-    LArm: MobReptilianSlimLArm
-    RArm: MobReptilianSlimRArm
-    LHand: MobReptilianSlimLHand
-    RHand: MobReptilianSlimRHand
-    LLeg: MobReptilianSlimLLeg
-    RLeg: MobReptilianSlimRLeg
-    LFoot: MobReptilianSlimLFoot
-    RFoot: MobReptilianSlimRFoot
-
-# Slim types
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimHead
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: head_slim_f
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimHeadMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: head_slim_f
-    
-- type: humanoidBaseSprite
-  id: MobReptilianSlimHeadFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: head_slim_f
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimTorso
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: torso_slim_f
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimTorsoMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: torso_slim_f
-    
-- type: humanoidBaseSprite
-  id: MobReptilianSlimTorsoFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: torso_slim_f
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimLLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: l_leg_slim
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimLArm
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: l_arm_slim
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimLHand
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: l_hand_slim
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimLFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: l_foot_slim
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimRLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: r_leg_slim
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimRArm
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: r_arm_slim
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimRHand
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: r_hand_slim
-
-- type: humanoidBaseSprite
-  id: MobReptilianSlimRFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: r_foot_slim
-
-# Digitigrade types
-
-- type: humanoidBaseSprite
-  id: MobReptilianDigiLLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: l_leg_digi
-
-- type: humanoidBaseSprite
-  id: MobReptilianDigiLFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: l_foot_digi
-
-- type: humanoidBaseSprite
-  id: MobReptilianDigiRLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: r_leg_digi
-
-- type: humanoidBaseSprite
-  id: MobReptilianDigiRFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Reptilian/parts.rsi
-    state: r_foot_digi
diff --git a/Resources/Prototypes/_White/Species/resomi.yml b/Resources/Prototypes/_White/Species/resomi.yml
index 12720b1d9a4..500fa0998b4 100644
--- a/Resources/Prototypes/_White/Species/resomi.yml
+++ b/Resources/Prototypes/_White/Species/resomi.yml
@@ -3,8 +3,6 @@
   name: species-name-resomi
   roundStart: false
   prototype: MobResomi
-  bodyTypes:
-    - ResomiNormal
   defaultSkinTone: "#faf7f7"
   markingLimits: MobResomiMarkingLimits
   maleFirstNames: names_resomi_male
@@ -13,24 +11,6 @@
   dollPrototype: MobResomiDummy
   skinColoration: Hues
 
-- type: bodyType
-  id: ResomiNormal
-  name: body-normal
-  sprites:
-    Head: MobResomiHead
-    Hair: MobResomiHair
-    Chest: MobResomiTorso
-    Eyes: MobResomiEyes
-    LArm: MobResomiLArm
-    RArm: MobResomiRArm
-    LHand: MobResomiLHand
-    RHand: MobResomiRHand
-    LLeg: MobResomiLLeg
-    RLeg: MobResomiRLeg
-    LFoot: MobResomiLFoot
-    RFoot: MobResomiRFoot
-    Tail: MobHumanoidAnyMarking
-
 - type: markingPoints
   id: MobResomiMarkingLimits
   onlyWhitelisted: true
@@ -38,16 +18,15 @@
     Hair:
       points: 1
       required: false
-    Tail:
-      points: 2
-      required: true
-      defaultMarkings: [ ResomiTail, ResomiTailFeathers ]
     Head:
       points: 2
       required: false
     Chest:
       points: 1
       required: false
+    Groin:
+      points: 1
+      required: false
     RightLeg:
       points: 2
       required: false
@@ -76,96 +55,3 @@
     LeftHand:
       points: 2
       required: false
-
-- type: humanoidBaseSprite
-  id: MobResomiEyes
-  baseSprite:
-    sprite: _White/Mobs/Customization/eyes.rsi
-    state: resomi
-
-- type: humanoidBaseSprite
-  id: MobResomiHair
-
-- type: humanoidBaseSprite
-  id: MobResomiHead
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobResomiHeadMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: head_m
-
-- type: humanoidBaseSprite
-  id: MobResomiHeadFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: head_f
-
-- type: humanoidBaseSprite
-  id: MobResomiTorso
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobResomiTorsoMale
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: torso_m
-
-- type: humanoidBaseSprite
-  id: MobResomiTorsoFemale
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: torso_f
-
-- type: humanoidBaseSprite
-  id: MobResomiLLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: l_leg
-
-- type: humanoidBaseSprite
-  id: MobResomiLArm
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: l_arm
-
-- type: humanoidBaseSprite
-  id: MobResomiLHand
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: l_hand
-
-- type: humanoidBaseSprite
-  id: MobResomiLFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: l_foot
-
-- type: humanoidBaseSprite
-  id: MobResomiRLeg
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: r_leg
-
-- type: humanoidBaseSprite
-  id: MobResomiRArm
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: r_arm
-
-- type: humanoidBaseSprite
-  id: MobResomiRHand
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: r_hand
-
-- type: humanoidBaseSprite
-  id: MobResomiRFoot
-  baseSprite:
-    sprite: _White/Mobs/Species/Resomi/parts.rsi
-    state: r_foot
diff --git a/Resources/Prototypes/_White/Traits/traits.yml b/Resources/Prototypes/_White/Traits/traits.yml
index 111700bfd0e..43ce252b6fe 100644
--- a/Resources/Prototypes/_White/Traits/traits.yml
+++ b/Resources/Prototypes/_White/Traits/traits.yml
@@ -23,16 +23,16 @@
   id: Contract
   category: Psionics
   points: 13
-  enable: false # WD EDIT
+  enable: false
   functions:
   - !type:TraitAddComponent
     components:
-      - type: TriggerOnMobstateChange
-        mobState:
-        - Dead
-      - type: DeleteOnTrigger
-      - type: SpawnOnTrigger
-        proto: giber
+    - type: TriggerOnMobstateChange
+      mobState:
+      - Dead
+    - type: DeleteOnTrigger
+    - type: SpawnOnTrigger
+      proto: giber
 
 - type: trait
   id: BlueBlood
@@ -43,11 +43,13 @@
   - !type:CharacterSpeciesRequirement
     inverted: true
     species:
-      - IPC
-      - Arachnid
-      - SlimePerson
-      - Shadowkin
+    - Arachnid
+    - IPC
+    - Shadowkin
+    - SlimePerson
   functions:
-    - !type:TraitAddComponent
-      components:
-        - type: BlueBloodTrait
+  - !type:TraitAddMetabolizerTypes
+    metabolizerTypes:
+    - Arachnid
+  - !type:TraitReplaceBloodReagent
+    reagent: CopperBlood
diff --git a/Resources/Prototypes/_White/Voice/speech_emotes.yml b/Resources/Prototypes/_White/Voice/speech_emotes.yml
index 0ae159af6d0..da8244ceba1 100644
--- a/Resources/Prototypes/_White/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/_White/Voice/speech_emotes.yml
@@ -1,3 +1,11 @@
+# vocal emotes
+- type: emote
+  id: PainScream
+  name: chat-emote-name-pain-scream
+  category: Vocal
+  icon: Interface/Emotes/scream.png
+  chatMessages: ["chat-emote-msg-pain-scream"]
+
 - type: emote
   id: Nod
   name: chat-emote-name-nod
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index adf980e2005..bbb8a234361 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -177,11 +177,10 @@
     actions:
     - ActionFabricateLollipop
     - ActionFabricateGumball
-  - type: SurgeryIgnoreClothing
-  - type: SurgerySpeedModifier
-    speedModifier: 1.5
-  - type: SurgeryTarget
-  - type: Sanitized
+  # - type: SurgeryIgnoreClothing
+  # - type: SurgerySpeedModifier
+  #   speedModifier: 1.5
+  # - type: Sanitized
 
   # Visual
   inventoryTemplateId: borgDutch
diff --git a/Resources/ServerInfo/_Shitmed/Guidebook/Antagonist/Abductors.xml b/Resources/ServerInfo/_Shitmed/Guidebook/Antagonist/Abductors.xml
deleted file mode 100644
index 17b0b4dd29b..00000000000
--- a/Resources/ServerInfo/_Shitmed/Guidebook/Antagonist/Abductors.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<Document>
-  # Абдукторы
-
-  <Box>
-    <GuideEntityEmbed Entity="MobLoneAbductor"/>
-  </Box>
-  Абдукторы - это инопланетное общество, целью которого является каталогизация и проведение экспериментов над персоналом станции.
-  Важно отметить: в отличие от большинства антагонистов, абдукторы [color=red]НЕ стремятся убивать людей[/color], их интересует только проведение экспериментов.
-
-  Абдукторы не обладают способностью говорить и поэтому общаются более... пантомимными методами.
-
-  ##Похищение
-  Абдукторы начинают на своем корабле где-то рядом со станцией. Используя [color=#a149bf]"Консоль наблюдения за людьми"[/color], вы можете найти жертв, которые находятся в одиночестве, и [color=lightblue]телепортироваться[/color] рядом с ними, чтобы начать похищение.
-
-  Чудо-шокер - это основной инструмент абдуктора. У него есть четыре режима, которые вы будете использовать для похищения:
-  - [color=yellow]{Оглушение}[/color] Оглушает жертву примерно на 5 секунд.
-  - [color=pink]{Связывание}[/color] Связывает руки жертвы слабыми кабелями.
-  - [color=blue]{Сон}[/color] Вводит жертву в состояние, похожее на сон.
-  - [color=red]{Вред}[/color] Обжигает цель, нанося урон. [bold]ИСПОЛЬЗУЙТЕ ТОЛЬКО В КРАЙНЕМ СЛУЧАЕ.[/bold]
-
-  Как только цель обездвижена, вы можете использовать [italic]гизмо[/italic], чтобы имплантировать ей нано-трекер, вернуться на свой корабль с помощью [color=lightblue]способности возврата[/color], а затем использовать гизмо на [color=#a149bf]Консоли абдукторов[/color].
-
-  ##Экспериментирование
-  После того как вы связали последний нано-трекер с консолью, выберите [bold]{ПРИВЛЕЧЬ}[/bold], чтобы телепортировать вашу жертву на корабль.
-
-  Теперь, когда у вас есть жертва на борту, рекомендуется:
-  - Пристегнуть её к хирургическому столу.
-  - Заменить наручники на более качественные, предоставленные на корабле.
-  - Убрать все их вещи, которые могут навредить вам или секретности эксперимента.
-  - Использовать ваши обширные хирургические знания, чтобы заменить их сердце железой. В отличие от обычных хирургов, вам не нужно снимать их одежду для проведения операции.
-
-  Наконец, перетащите жертву, над которой вы завершили эксперимент, в [color=#a149bf]Экспериментатор[/color], чтобы подтвердить результаты эксперимента на [color=#a149bf]Консоли абдукторов[/color] и отправить их обратно туда, где вы их нашли.
-
-  ## Инструменты абдукторов
-
-  Абдукторы имеют доступ к более продвинутым инструментам, чем обычные хирурги или инженеры. Их хирургические инструменты быстрее, чем продвинутые хирургические инструменты, а из их обычных инструментов мультитул в альтернативном режиме может использоваться для взлома дверей.
-
-  ##Как избавиться от абдуктора
-  Как и [textlink="Генокрады" link="Changelings"], абдукторы не защищены [textlink="космическим законом" link="SpaceLaw"] и могут быть казнены свободно.
-
-  Кроме того, корабль абдуктора - это физический объект в мире, любой, у кого есть доступ к космическому кораблю, например [textlink="Утилизаторы" link="Salvage"], может столкнуться с ними в космосе и разобрать их корабль.
-</Document>
diff --git a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/Autodoc.xml b/Resources/ServerInfo/_Shitmed/Guidebook/Medical/Autodoc.xml
deleted file mode 100644
index 06dd6696afb..00000000000
--- a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/Autodoc.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<Document>
-# АвтоДок Mk.XIV
-
-Созданный по чертежам, спасённым с заброшенного крейсера KC13, этот хирургический робот представляет собой настоящего монстра медицины. С правильной настройкой он способен провести почти любую операцию, будь она простой или смертельно сложной.
-
-[color=red]ВНИМАНИЕ:[/color] Для работы с этим устройством необходима соответствующая медицинская квалификация и строгое соблюдение протоколов станции!
-
-Чтобы начать работу, подключите его мультитулом к ближайшему операционному столу. Как только АвтоДок заметит спящего пациента, он готов к работе.
-
-Перед операцией обязательно поместите нужные предметы в специальные лотки для инструментов. [italic]АвтоДок не станет поднимать с пола ваши грязные и залитые кровью инструменты.[/italic]
-
-# «Как заставить эту штуку резать и шить? Помогите!»
-
-АвтоДок работает по программам, состоящим из шагов, которые выполняются последовательно, пока не закончатся или пока что-то не пойдёт не так.
-
-Если на одном из этапов возникнет проблема, робот моментально прервёт операцию, если только вы не отключили защиту безопасности программы.
-
-Для создания новой программы выберите простое и запоминающееся название, например «похититель органов». Затем добавьте нужные шаги, нажимая кнопку «ДОБАВИТЬ ШАГ»:
-
-- **ПРОВЕСТИ ОПЕРАЦИЮ** — самое главное. Может воздействовать на любую часть тела и выполнять любую хирургическую операцию. Ваша задача — убедиться, что операции совместимы: [italic]устанавливать мозг пациенту в ступни — плохая идея.[/italic]
-  Не волнуйтесь насчёт предварительных действий вроде вскрытия грудной клетки: робот автоматически сделает это за вас.
-
-- **ВЗЯТЬ ПРЕДМЕТ** — робот берёт предмет с указанным названием из лотков для инструментов. Используйте маркировщик, если у вас много похожих предметов.
-
-- **ВЗЯТЬ ОРГАН** — короткая команда, заставляющая робота взять любой подходящий орган.
-
-- **ВЗЯТЬ ЧАСТЬ ТЕЛА** — аналогично команде выше, но для конечностей.
-
-- **УБРАТЬ ПРЕДМЕТ** — робот помещает удерживаемый предмет обратно в лоток (если он не переполнен). Важно делать это после извлечения органа или части тела, иначе последующие операции завершатся тем, что предметы будут валяться на полу.
-
-- **НАЗНАЧИТЬ МЕТКУ** — добавляет метку на удерживаемый предмет. Особенно полезно при пересадках, когда нужно работать с конкретным органом.
-
-- **ОЖИДАТЬ** — пауза перед выполнением следующего шага.
-
-Так чего же ты ждёшь, товарищ? Совершай медицинские (или не очень) чудеса уже сегодня!
-
-# Полезные дополнительные сведения
-
-- Отключение защиты безопасности заставляет робота пропускать неудачные шаги вместо полной остановки программы. [color=#ffa500]Делайте это, только если точно уверены, что делаете![/color]
-
-- Если вы выберете шаг в списке, то сможете его удалить или добавить новый шаг перед ним, а не только в конец.
-
-# Предостережения и важные замечания
-
-- [color=red]НИ В КОЕМ СЛУЧАЕ[/color] не перерезайте провод, отвечающий за безопасность! В этом случае ваша лицензия на автоматическую хирургию будет немедленно аннулирована. Использование анестезии — обязательное условие. Отключение её применения крайне неэтично по отношению к пациентам!
-
-- При ампутации рук или ног кисти и ступни отвалятся прямо на пол. Чтобы этого избежать, предварительно отсоедините их вручную.
-
-- Если лотки для инструментов переполнены, робот не сможет положить туда предметы и просто прекратит работу, зависнув прямо посреди операции.
-</Document>
diff --git a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/OrganManipulation.xml b/Resources/ServerInfo/_Shitmed/Guidebook/Medical/OrganManipulation.xml
deleted file mode 100644
index 7078d541f1d..00000000000
--- a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/OrganManipulation.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<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/_Shitmed/Guidebook/Medical/PartManipulation.xml b/Resources/ServerInfo/_Shitmed/Guidebook/Medical/PartManipulation.xml
deleted file mode 100644
index 54ad557f4c3..00000000000
--- a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/PartManipulation.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<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/_Shitmed/Guidebook/Medical/Surgery.xml b/Resources/ServerInfo/_Shitmed/Guidebook/Medical/Surgery.xml
deleted file mode 100644
index 714ab0f373b..00000000000
--- a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/Surgery.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<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>
-
-Когда инструменты у вас под рукой, просто взаимодействуйте с пациентом, чтобы начать процедуру. Вы сможете выбрать ту часть тела, над которой будете издеваться... то есть, работать.
-
-## «Подручная» хирургия (она же гетто-хирургия)
-
-Если настоящих хирургических инструментов под рукой нет (кто-то снова их украл, или вы просто не хотите идти за ними в медбей), можете воспользоваться подручными средствами. Используйте кнопку «осмотреть» на скальпеле, чтобы понять, насколько хороша или плоха замена.
-
-<Box>
-<GuideEntityEmbed Entity="Welder" Caption="сварочный аппарат"/>
-<GuideEntityEmbed Entity="Wirecutter" Caption="кусачки"/>
-<GuideEntityEmbed Entity="KitchenKnife" Caption="кухонный нож"/>
-<GuideEntityEmbed Entity="Crowbar" Caption="лом"/>
-</Box>
-
-Эти предметы не заменят полноценные медицинские инструменты, но когда выбора нет, сгодятся и они. Главное — убедитесь, что пациент не увидит заранее, чем вы собираетесь его резать.
-</Document>
-
diff --git a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/UtilitySurgeries.xml b/Resources/ServerInfo/_Shitmed/Guidebook/Medical/UtilitySurgeries.xml
deleted file mode 100644
index 517c1a03ecc..00000000000
--- a/Resources/ServerInfo/_Shitmed/Guidebook/Medical/UtilitySurgeries.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Document>
-# Вспомогательные хирургические процедуры
-
-## Обработка ран (Tend Wounds)
-
-Эта хирургическая процедура позволяет быстро вылечить тяжёлые ожоги или физические повреждения, не прибегая к мазям и бинтам.
-Для начала сделайте аккуратный надрез на теле пациента, после чего обработайте его зажимом до тех пор, пока повреждённая область не восстановится полностью. Затем не забудьте закрыть надрез прижигателем, чтобы не оставить за собой следов преступления.
-
-<Box>
-<GuideEntityEmbed Entity="Scalpel" Caption="скальпель"/>
-<GuideEntityEmbed Entity="Hemostat" Caption="зажим"/>
-<GuideEntityEmbed Entity="Cautery" Caption="прижигатель"/>
-</Box>
-
-Эта операция особенно эффективна, если пациент тяжело ранен, но всё ещё умудряется быть живым. С её помощью вы сможете воскресить даже тех, кого, казалось бы, уже пора списывать в утиль, например, очередного технического ассистента, который решил проверить прочность своего костюма прямо в камере сгорания.
-
-## Скрытая полость (Cavity Implant)
-
-Процедура позволяет незаметно имплантировать любой небольшой или миниатюрный предмет прямо в грудную клетку пациента. Для начала вскройте грудную клетку, обеспечив доступ к её внутренностям.
-После имплантации пациент не сможет самостоятельно извлечь предмет. Зачем это нужно? Возможно, вы хотите надёжно спрятать что-то ценное или опасное — например, диск активации ядерного заряда. Главное — не забудьте предупредить пациента, что теперь он — ходячий сейф.
-
-</Document>
-
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_chest.png
index 8981bd797e8..734b3e55db9 100644
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_chest.png and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_groin.png
new file mode 100644
index 00000000000..2f7310b04d1
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/charred_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/meta.json
index 6667bbc2b36..b28cd09144d 100644
--- a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/MilenVolf, Charred further modified and new assets by https://github.com/ElusiveCoin",
+    "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/MilenVolf, Charred further modified and new assets by https://github.com/ElusiveCoin. The division of the torso into chest and groin was done by Sparison.",
     "size": {
         "x": 32,
         "y": 32
@@ -15,6 +15,10 @@
             "name": "toxic_chest",
             "directions": 4
         },
+        {
+            "name": "toxic_groin",
+            "directions": 4
+        },
         {
             "name": "toxic_r_arm",
             "directions": 4
@@ -39,6 +43,10 @@
             "name": "charred_chest",
             "directions": 4
         },
+        {
+            "name": "charred_groin",
+            "directions": 4
+        },
         {
             "name": "charred_r_arm",
             "directions": 4
@@ -63,6 +71,10 @@
             "name": "radiant_chest",
             "directions": 4
         },
+        {
+            "name": "radiant_groin",
+            "directions": 4
+        },
         {
             "name": "radiant_r_arm",
             "directions": 4
@@ -83,6 +95,10 @@
             "name": "plated_chest",
             "directions": 4
         },
+        {
+            "name": "plated_groin",
+            "directions": 4
+        },
         {
             "name": "plated_r_arm",
             "directions": 4
@@ -99,6 +115,10 @@
             "name": "stripes_chest",
             "directions": 4
         },
+        {
+            "name": "stripes_groin",
+            "directions": 4
+        },
         {
             "name": "stripes_r_arm",
             "directions": 4
@@ -123,6 +143,10 @@
             "name": "spotted_chest",
             "directions": 4
         },
+        {
+            "name": "spotted_groin",
+            "directions": 4
+        },
         {
             "name": "spotted_r_arm",
             "directions": 4
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_chest.png
index f32f5d317c1..e57170a55d5 100644
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_chest.png and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_groin.png
new file mode 100644
index 00000000000..ae0cd514204
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/plated_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_chest.png
index 214caa4c971..444f7496911 100644
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_chest.png and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_groin.png
new file mode 100644
index 00000000000..dce11893b43
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/radiant_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_chest.png
index 90a8539d735..4f0ba7becf2 100644
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_chest.png and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_groin.png
new file mode 100644
index 00000000000..36ad69af61a
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/spotted_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_chest.png
index 29b41970dce..62cc1adc9ef 100644
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_chest.png and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_groin.png
new file mode 100644
index 00000000000..8cf608f0d16
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/stripes_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_chest.png
index ad53da7165d..515134aabf0 100644
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_chest.png and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_groin.png
new file mode 100644
index 00000000000..f5deda0e723
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Chitinid/chitinid_parts.rsi/toxic_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest.png
deleted file mode 100644
index 4f89cd5c744..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest_chest.png
new file mode 100644
index 00000000000..c997848247d
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest_groin.png
new file mode 100644
index 00000000000..a54970deb0a
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_crest_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox.png
deleted file mode 100644
index a87895c87a7..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox_chest.png
new file mode 100644
index 00000000000..63b02d864fc
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox_groin.png
new file mode 100644
index 00000000000..6e93a0861f8
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_fox_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full.png
deleted file mode 100644
index 4aacde2a6f8..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full_chest.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full_chest.png
new file mode 100644
index 00000000000..d402600a633
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full_chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full_groin.png b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full_groin.png
new file mode 100644
index 00000000000..2254ce75b53
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/belly_full_groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json
index 9411445392d..fd1a016a1f9 100644
--- a/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/body_markings.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers. The division of the torso into chest and groin was done by Sparison.",
   "size": {"x": 32, "y": 32},
   "states": [
     {
@@ -17,15 +17,27 @@
       "directions": 4
     },
     {
-      "name": "belly_fox",
+      "name": "belly_fox_chest",
       "directions": 4
     },
     {
-      "name": "belly_full",
+      "name": "belly_fox_groin",
       "directions": 4
     },
     {
-      "name": "belly_crest",
+      "name": "belly_full_chest",
+      "directions": 4
+    },
+    {
+      "name": "belly_full_groin",
+      "directions": 4
+    },
+    {
+      "name": "belly_crest_chest",
+      "directions": 4
+    },
+    {
+      "name": "belly_crest_groin",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/chest.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/chest.png
new file mode 100644
index 00000000000..b91d87c56e5
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/chest_female.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..5f3baf0a7fe
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/groin.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/groin.png
new file mode 100644
index 00000000000..eca307ba64c
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/groin_female.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..a84f7b5a909
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head_m.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head_m.png
rename to Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head_f.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head_f.png
rename to Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/head_female.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/meta.json
index ed5dfd51450..a28afc41ec3 100644
--- a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/commit/1d0eadcb126fc3581eed33490f4be2a88157af58, modified by https://github.com/PixelTheKermit",
+    "copyright": "https://github.com/tgstation/tgstation/commit/1d0eadcb126fc3581eed33490f4be2a88157af58, modified by https://github.com/PixelTheKermit. Changed by WWDP",
     "size": {
         "x": 32,
         "y": 32
@@ -11,11 +11,11 @@
             "name": "full"
         },
         {
-            "name": "head_f",
+            "name": "head",
             "directions": 4
         },
         {
-            "name": "head_m",
+            "name": "head_female",
             "directions": 4
         },
         {
@@ -51,11 +51,19 @@
             "directions": 4
         },
         {
-            "name": "torso_f",
+            "name": "chest",
             "directions": 4
         },
         {
-            "name": "torso_m",
+            "name": "chest_female",
+            "directions": 4
+        },
+        {
+            "name": "groin",
+            "directions": 4
+        },
+        {
+            "name": "groin_female",
             "directions": 4
         },
         {
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/torso_f.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/torso_f.png
deleted file mode 100644
index 71d34660015..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/torso_m.png b/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/torso_m.png
deleted file mode 100644
index 9f08874e16b..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Species/Chitinid/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/chest.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/chest.png
new file mode 100644
index 00000000000..8786a93870f
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/chest.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/chest_female.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..0fbaf326113
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/groin.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/groin.png
new file mode 100644
index 00000000000..a02fc41728e
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/groin.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/groin_female.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..cd09a26112b
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head_m.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head_m.png
rename to Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head_f.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head_f.png
rename to Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/head_female.png
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/meta.json
index 026fc8b64c9..463466db174 100644
--- a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers. Changed by WWDP",
   "size": {
     "x": 32,
     "y": 32
@@ -14,11 +14,11 @@
       "name": "icon"
     },
     {
-      "name": "head_f",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_m",
+      "name": "head_female",
       "directions": 4
     },
     {
@@ -54,11 +54,19 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png
deleted file mode 100644
index db8a63bbd92..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png b/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png
deleted file mode 100644
index dfe4705aa37..00000000000
Binary files a/Resources/Textures/DeltaV/Mobs/Species/Vulpkanin/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/chest.png b/Resources/Textures/Interface/Default/TargetDoll/chest.png
new file mode 100644
index 00000000000..e5f0f72371c
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/chest.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/chest_hover.png b/Resources/Textures/Interface/Default/TargetDoll/chest_hover.png
new file mode 100644
index 00000000000..e7448a177c9
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/chest_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/eyes.png b/Resources/Textures/Interface/Default/TargetDoll/eyes.png
new file mode 100644
index 00000000000..6d946675526
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/eyes.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/eyes_hover.png b/Resources/Textures/Interface/Default/TargetDoll/eyes_hover.png
new file mode 100644
index 00000000000..c1281f51516
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/eyes_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/groin.png b/Resources/Textures/Interface/Default/TargetDoll/groin.png
new file mode 100644
index 00000000000..52e5d4f7a99
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/groin.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/groin_hover.png b/Resources/Textures/Interface/Default/TargetDoll/groin_hover.png
new file mode 100644
index 00000000000..985ce6284d8
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/groin_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/head.png b/Resources/Textures/Interface/Default/TargetDoll/head.png
new file mode 100644
index 00000000000..635a89f43b2
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/head.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/head_hover.png b/Resources/Textures/Interface/Default/TargetDoll/head_hover.png
new file mode 100644
index 00000000000..0d4fab0e8a2
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/head_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_arm.png b/Resources/Textures/Interface/Default/TargetDoll/left_arm.png
new file mode 100644
index 00000000000..ec71c0778b7
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_arm.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_arm_hover.png b/Resources/Textures/Interface/Default/TargetDoll/left_arm_hover.png
new file mode 100644
index 00000000000..d98758c0751
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_arm_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_foot.png b/Resources/Textures/Interface/Default/TargetDoll/left_foot.png
new file mode 100644
index 00000000000..d918294d90a
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_foot.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_foot_hover.png b/Resources/Textures/Interface/Default/TargetDoll/left_foot_hover.png
new file mode 100644
index 00000000000..126dfbee121
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_foot_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_hand.png b/Resources/Textures/Interface/Default/TargetDoll/left_hand.png
new file mode 100644
index 00000000000..15f70618bcf
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_hand.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_hand_hover.png b/Resources/Textures/Interface/Default/TargetDoll/left_hand_hover.png
new file mode 100644
index 00000000000..7fdd363e1ba
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_hand_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_leg.png b/Resources/Textures/Interface/Default/TargetDoll/left_leg.png
new file mode 100644
index 00000000000..9af8f428382
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_leg.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/left_leg_hover.png b/Resources/Textures/Interface/Default/TargetDoll/left_leg_hover.png
new file mode 100644
index 00000000000..7e5bde73618
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/left_leg_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/mouth.png b/Resources/Textures/Interface/Default/TargetDoll/mouth.png
new file mode 100644
index 00000000000..19b9f5e6f18
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/mouth.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/mouth_hover.png b/Resources/Textures/Interface/Default/TargetDoll/mouth_hover.png
new file mode 100644
index 00000000000..ca756e1b01a
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/mouth_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_arm.png b/Resources/Textures/Interface/Default/TargetDoll/right_arm.png
new file mode 100644
index 00000000000..e2ee2178937
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_arm.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_arm_hover.png b/Resources/Textures/Interface/Default/TargetDoll/right_arm_hover.png
new file mode 100644
index 00000000000..f4ed76e285d
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_arm_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_foot.png b/Resources/Textures/Interface/Default/TargetDoll/right_foot.png
new file mode 100644
index 00000000000..ad6fde9ec29
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_foot.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_foot_hover.png b/Resources/Textures/Interface/Default/TargetDoll/right_foot_hover.png
new file mode 100644
index 00000000000..eff188fab3e
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_foot_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_hand.png b/Resources/Textures/Interface/Default/TargetDoll/right_hand.png
new file mode 100644
index 00000000000..9358daa9062
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_hand.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_hand_hover.png b/Resources/Textures/Interface/Default/TargetDoll/right_hand_hover.png
new file mode 100644
index 00000000000..973b5746846
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_hand_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_leg.png b/Resources/Textures/Interface/Default/TargetDoll/right_leg.png
new file mode 100644
index 00000000000..2c55e7b319e
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_leg.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/right_leg_hover.png b/Resources/Textures/Interface/Default/TargetDoll/right_leg_hover.png
new file mode 100644
index 00000000000..a80f80bb5fc
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/right_leg_hover.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/tail.png b/Resources/Textures/Interface/Default/TargetDoll/tail.png
new file mode 100644
index 00000000000..3488cc8767c
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/tail.png differ
diff --git a/Resources/Textures/Interface/Default/TargetDoll/tail_hover.png b/Resources/Textures/Interface/Default/TargetDoll/tail_hover.png
new file mode 100644
index 00000000000..ec00f98aff4
Binary files /dev/null and b/Resources/Textures/Interface/Default/TargetDoll/tail_hover.png differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/chest.png b/Resources/Textures/Mobs/Animals/kobold.rsi/chest.png
new file mode 100644
index 00000000000..2e3a51ad6e6
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/kobold.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/eyes.png b/Resources/Textures/Mobs/Animals/kobold.rsi/eyes.png
deleted file mode 100644
index 626bd2fa1ea..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/eyes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/full.png b/Resources/Textures/Mobs/Animals/kobold.rsi/full.png
index 25006b92124..4a6ad59a830 100644
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/full.png and b/Resources/Textures/Mobs/Animals/kobold.rsi/full.png differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/groin.png b/Resources/Textures/Mobs/Animals/kobold.rsi/groin.png
new file mode 100644
index 00000000000..343bcf5466b
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/kobold.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/head_f.png b/Resources/Textures/Mobs/Animals/kobold.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/kobold.rsi/head_f.png
rename to Resources/Textures/Mobs/Animals/kobold.rsi/head.png
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/head_m.png b/Resources/Textures/Mobs/Animals/kobold.rsi/head_m.png
deleted file mode 100644
index 6b6102a5b50..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png b/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png
deleted file mode 100644
index 4a6ad59a830..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/kobold.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json b/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json
index 769f96a914e..4b88c0ae07f 100644
--- a/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/kobold.rsi/meta.json
@@ -8,18 +8,11 @@
   "copyright": "Drawn by Ubaser, modified by Bhijn and Myr, parts splitted up by Roudenn (GitHub)",
   "states": [
     {
-      "name": "kobold",
+      "name": "full",
       "directions": 4
     },
     {
-      "name": "full"
-    },
-    {
-      "name": "head_f",
-      "directions": 4
-    },
-    {
-      "name": "head_m",
+      "name": "head",
       "directions": 4
     },
     {
@@ -55,21 +48,17 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "groin",
       "directions": 4
     },
     {
       "name": "tail",
       "directions": 4
     },
-    {
-      "name": "eyes",
-      "directions": 4
-    },
     {
       "name": "innerline",
       "directions": 4
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_f.png b/Resources/Textures/Mobs/Animals/kobold.rsi/torso_f.png
deleted file mode 100644
index 192d2b9849e..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_m.png b/Resources/Textures/Mobs/Animals/kobold.rsi/torso_m.png
deleted file mode 100644
index 192d2b9849e..00000000000
Binary files a/Resources/Textures/Mobs/Animals/kobold.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/chest.png b/Resources/Textures/Mobs/Animals/monkey.rsi/chest.png
new file mode 100644
index 00000000000..2b235b7087d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/monkey.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/eyes.png b/Resources/Textures/Mobs/Animals/monkey.rsi/eyes.png
deleted file mode 100644
index 573a605e91a..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/eyes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/full.png b/Resources/Textures/Mobs/Animals/monkey.rsi/full.png
deleted file mode 100644
index c36e9abf8b8..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/groin.png b/Resources/Textures/Mobs/Animals/monkey.rsi/groin.png
new file mode 100644
index 00000000000..dd86916cb2a
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/monkey.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/head_f.png b/Resources/Textures/Mobs/Animals/monkey.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/monkey.rsi/head_f.png
rename to Resources/Textures/Mobs/Animals/monkey.rsi/head.png
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/head_m.png b/Resources/Textures/Mobs/Animals/monkey.rsi/head_m.png
deleted file mode 100644
index e84d4fbbb5f..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json b/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
index d22ab1556c9..9531360853e 100644
--- a/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
@@ -1,25 +1,18 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , edited by Alekshhh, parts splitted up by Roudenn (GitHub)",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , edited by Alekshhh, parts splitted up by Roudenn (GitHub). Chest and Groin by WWDP",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-        {
-            "name": "full"
-        },
         {
             "name": "monkey",
             "directions": 4
         },
         {
-            "name": "head_f",
-            "directions": 4
-        },
-        {
-            "name": "head_m",
+            "name": "head",
             "directions": 4
         },
         {
@@ -55,20 +48,16 @@
             "directions": 4
         },
         {
-            "name": "torso_f",
+            "name": "chest",
             "directions": 4
         },
         {
-            "name": "torso_m",
+            "name": "groin",
             "directions": 4
         },
         {
             "name": "tail",
             "directions": 4
-        },
-        {
-            "name": "eyes",
-            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_f.png b/Resources/Textures/Mobs/Animals/monkey.rsi/torso_f.png
deleted file mode 100644
index aa3c5ce5487..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_m.png b/Resources/Textures/Mobs/Animals/monkey.rsi/torso_m.png
deleted file mode 100644
index aa3c5ce5487..00000000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_chest_primary.png
new file mode 100644
index 00000000000..4703bf070ac
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_chest_secondary.png
new file mode 100644
index 00000000000..4703bf070ac
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_groin_primary.png
new file mode 100644
index 00000000000..308dfc31da3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_groin_secondary.png
new file mode 100644
index 00000000000..7afaf2f796b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_primary.png
deleted file mode 100644
index bcfe8f3a96f..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_secondary.png
deleted file mode 100644
index b6d8e6d3a79..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/chipped_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_chest_primary.png
new file mode 100644
index 00000000000..114deb463fe
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_chest_secondary.png
new file mode 100644
index 00000000000..fd745298fb9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_groin_primary.png
new file mode 100644
index 00000000000..f9f371343f9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_groin_secondary.png
new file mode 100644
index 00000000000..0b8c0c0a86c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_primary.png
deleted file mode 100644
index b928d2ec92e..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_secondary.png
deleted file mode 100644
index 4c2740d201a..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/curled_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_chest_primary.png
new file mode 100644
index 00000000000..6ed6124a813
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_chest_secondary.png
new file mode 100644
index 00000000000..16415ac2cba
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_groin_primary.png
new file mode 100644
index 00000000000..d2ab094a8a2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_groin_secondary.png
new file mode 100644
index 00000000000..4c4a9a66cb0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_primary.png
deleted file mode 100644
index b852964156c..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_secondary.png
deleted file mode 100644
index 7b17e94e5b6..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/freaky_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_chest_primary.png
new file mode 100644
index 00000000000..c886c9ae906
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_chest_secondary.png
new file mode 100644
index 00000000000..166b31539ad
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_groin_primary.png
new file mode 100644
index 00000000000..e343445f21a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_groin_secondary.png
new file mode 100644
index 00000000000..d896471cb1c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_primary.png
deleted file mode 100644
index 0ebf4a3f21c..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_secondary.png
deleted file mode 100644
index 702423929df..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/harvest_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest.png
new file mode 100644
index 00000000000..6d9e8b91a69
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest_primary.png
new file mode 100644
index 00000000000..ab515f78122
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest_secondary.png
new file mode 100644
index 00000000000..5d758225bcb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin.png
new file mode 100644
index 00000000000..7883b32c0c7
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin_primary.png
new file mode 100644
index 00000000000..042c5c72249
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin_secondary.png
new file mode 100644
index 00000000000..60b6be22387
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_primary.png
deleted file mode 100644
index 3be5da120b2..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_secondary.png
deleted file mode 100644
index f940a233f7b..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/long_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json
index b1cb1eb1ab5..e923bb5190c 100644
--- a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/meta.json
@@ -1,82 +1,162 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14",
+  "copyright": "Made by PixelTheKermit (github) for SS14. The division of the torso into chest and groin was done by Sparison",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "long_primary",
+      "name": "long_chest",
       "directions": 4
     },
     {
-      "name": "long_secondary",
+      "name": "long_groin",
       "directions": 4
     },
     {
-      "name": "sharp_primary",
+      "name": "long_chest_primary",
       "directions": 4
     },
     {
-      "name": "sharp_secondary",
+      "name": "long_groin_primary",
       "directions": 4
     },
     {
-      "name": "stingers_primary",
+      "name": "long_chest_secondary",
       "directions": 4
     },
     {
-      "name": "stingers_secondary",
+      "name": "long_groin_secondary",
       "directions": 4
     },
     {
-      "name": "curled_primary",
+      "name": "sharp_chest_primary",
       "directions": 4
     },
     {
-      "name": "curled_secondary",
+      "name": "sharp_groin_primary",
       "directions": 4
     },
     {
-      "name": "zigzag_primary",
+      "name": "sharp_chest_secondary",
       "directions": 4
     },
     {
-      "name": "zigzag_secondary",
+      "name": "sharp_groin_secondary",
       "directions": 4
     },
     {
-      "name": "chipped_primary",
+      "name": "stingers_chest_primary",
       "directions": 4
     },
     {
-      "name": "chipped_secondary",
+      "name": "stingers_groin_primary",
       "directions": 4
     },
     {
-      "name": "harvest_primary",
+      "name": "stingers_chest_secondary",
       "directions": 4
     },
     {
-      "name": "harvest_secondary",
+      "name": "stingers_groin_secondary",
       "directions": 4
     },
     {
-      "name": "short_primary",
+      "name": "curled_chest_primary",
       "directions": 4
     },
     {
-      "name": "short_secondary",
+      "name": "curled_groin_primary",
       "directions": 4
     },
     {
-      "name": "freaky_primary",
+      "name": "curled_chest_secondary",
       "directions": 4
     },
     {
-      "name": "freaky_secondary",
+      "name": "curled_groin_secondary",
+      "directions": 4
+    },
+    {
+      "name": "zigzag_chest_primary",
+      "directions": 4
+    },
+    {
+      "name": "zigzag_groin_primary",
+      "directions": 4
+    },
+    {
+      "name": "zigzag_chest_secondary",
+      "directions": 4
+    },
+    {
+      "name": "zigzag_groin_secondary",
+      "directions": 4
+    },
+    {
+      "name": "chipped_chest_primary",
+      "directions": 4
+    },
+    {
+      "name": "chipped_groin_primary",
+      "directions": 4
+    },
+    {
+      "name": "chipped_chest_secondary",
+      "directions": 4
+    },
+    {
+      "name": "chipped_groin_secondary",
+      "directions": 4
+    },
+    {
+      "name": "harvest_chest_primary",
+      "directions": 4
+    },
+    {
+      "name": "harvest_groin_primary",
+      "directions": 4
+    },
+    {
+      "name": "harvest_chest_secondary",
+      "directions": 4
+    },
+    {
+      "name": "harvest_groin_secondary",
+      "directions": 4
+    },
+    {
+      "name": "short_chest_primary",
+      "directions": 4
+    },
+    {
+      "name": "short_groin_primary",
+      "directions": 4
+    },
+    {
+      "name": "short_chest_secondary",
+      "directions": 4
+    },
+    {
+      "name": "short_groin_secondary",
+      "directions": 4
+    },
+    {
+      "name": "freaky_chest_primary",
+      "directions": 4
+    },
+    {
+      "name": "freaky_groin_primary",
+      "directions": 4
+    },
+    {
+      "name": "freaky_chest_secondary",
+      "directions": 4
+    },
+    {
+      "name": "freaky_groin_secondary",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_chest_primary.png
new file mode 100644
index 00000000000..afb5af7ae2f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_chest_secondary.png
new file mode 100644
index 00000000000..7a3576e3251
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_groin_primary.png
new file mode 100644
index 00000000000..88fa8a34652
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_groin_secondary.png
new file mode 100644
index 00000000000..78bdfb33972
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_primary.png
deleted file mode 100644
index 819336bd607..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_secondary.png
deleted file mode 100644
index c6cc1b90553..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/sharp_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_chest_primary.png
new file mode 100644
index 00000000000..1d586737796
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_chest_secondary.png
new file mode 100644
index 00000000000..3350779570e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_groin_primary.png
new file mode 100644
index 00000000000..085eade8cbd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_groin_secondary.png
new file mode 100644
index 00000000000..2eae6ffae1a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_primary.png
deleted file mode 100644
index f4fc44b767b..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_secondary.png
deleted file mode 100644
index 9f56b0690c3..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/short_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_chest_primary.png
new file mode 100644
index 00000000000..b85ca9fa314
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_chest_secondary.png
new file mode 100644
index 00000000000..21f305cccca
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_groin_primary.png
new file mode 100644
index 00000000000..4672246e3b3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_groin_secondary.png
new file mode 100644
index 00000000000..68dc4d345ad
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_primary.png
deleted file mode 100644
index c3cde078616..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_secondary.png
deleted file mode 100644
index 0720706c4a0..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/stingers_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_chest_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_chest_primary.png
new file mode 100644
index 00000000000..db4f9c942e5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_chest_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_chest_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_chest_secondary.png
new file mode 100644
index 00000000000..07d63646816
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_chest_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_groin_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_groin_primary.png
new file mode 100644
index 00000000000..24b4a9a071c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_groin_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_groin_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_groin_secondary.png
new file mode 100644
index 00000000000..9af1548d1f9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_groin_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_primary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_primary.png
deleted file mode 100644
index a7b99cc5318..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_secondary.png b/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_secondary.png
deleted file mode 100644
index a32e1f7689b..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/appendages.rsi/zigzag_secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows.png
deleted file mode 100644
index 3897e867421..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows_chest.png
new file mode 100644
index 00000000000..4c3b4e888df
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows_groin.png
new file mode 100644
index 00000000000..97a4345c65e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/arrows_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core.png
deleted file mode 100644
index 46dc4559a38..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core_chest.png
new file mode 100644
index 00000000000..c6b6ff4da03
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core_groin.png
new file mode 100644
index 00000000000..daa57f1d76e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/core_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross.png
deleted file mode 100644
index e938f1810cf..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross_chest.png
new file mode 100644
index 00000000000..c49caa613aa
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross_groin.png
new file mode 100644
index 00000000000..89a8e09473a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/cross_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback.png
deleted file mode 100644
index 857a4862bb8..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback_chest.png
new file mode 100644
index 00000000000..70b3022a3aa
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback_groin.png
new file mode 100644
index 00000000000..862ee759029
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/fiddleback_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart.png
deleted file mode 100644
index 184f8039eb2..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart_chest.png
new file mode 100644
index 00000000000..58fd9e8886c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart_groin.png
new file mode 100644
index 00000000000..2b470fc2d8e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/heart_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass.png
deleted file mode 100644
index 433fefb1874..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass_chest.png
new file mode 100644
index 00000000000..9a9ed027b6c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass_groin.png
new file mode 100644
index 00000000000..570d7e13544
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/hourglass_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json
index 727fcf1eec4..9be9a5d5c4c 100644
--- a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/meta.json
@@ -1,58 +1,106 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PixelTheKermit (github) for SS14. Arrows, core, fiddleback, skull and target made by Nairodian (github) for SS14.",
+  "copyright": "Made by PixelTheKermit (github) for SS14. Arrows, core, fiddleback, skull and target made by Nairodian (github) for SS14. The division of the torso into chest and groin was done by Sparison",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "stripes",
+      "name": "stripes_chest",
       "directions": 4
     },
     {
-      "name": "slashes",
+      "name": "stripes_groin",
       "directions": 4
     },
     {
-      "name": "x",
+      "name": "slashes_chest",
       "directions": 4
     },
     {
-      "name": "cross",
+      "name": "slashes_groin",
       "directions": 4
     },
     {
-      "name": "heart",
+      "name": "x_chest",
       "directions": 4
     },
     {
-      "name": "hourglass",
+      "name": "x_groin",
       "directions": 4
     },
     {
-      "name": "nail-and-hammer",
+      "name": "cross_chest",
       "directions": 4
     },
     {
-      "name": "star",
+      "name": "cross_groin",
       "directions": 4
     },
     {
-      "name": "arrows",
+      "name": "heart_chest",
       "directions": 4
     },
     {
-      "name": "core",
+      "name": "heart_groin",
       "directions": 4
     },
     {
-      "name": "fiddleback",
+      "name": "hourglass_chest",
       "directions": 4
     },
     {
-      "name": "skull",
+      "name": "hourglass_groin",
+      "directions": 4
+    },
+    {
+      "name": "nail-and-hammer_chest",
+      "directions": 4
+    },
+    {
+      "name": "nail-and-hammer_groin",
+      "directions": 4
+    },
+    {
+      "name": "star_chest",
+      "directions": 4
+    },
+    {
+      "name": "star_groin",
+      "directions": 4
+    },
+    {
+      "name": "arrows_chest",
+      "directions": 4
+    },
+    {
+      "name": "arrows_groin",
+      "directions": 4
+    },
+    {
+      "name": "core_chest",
+      "directions": 4
+    },
+    {
+      "name": "core_groin",
+      "directions": 4
+    },
+    {
+      "name": "fiddleback_chest",
+      "directions": 4
+    },
+    {
+      "name": "fiddleback_groin",
+      "directions": 4
+    },
+    {
+      "name": "skull_chest",
+      "directions": 4
+    },
+    {
+      "name": "skull_groin",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer.png
deleted file mode 100644
index 09ac325b300..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer_chest.png
new file mode 100644
index 00000000000..f1e8b65ae7b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer_groin.png
new file mode 100644
index 00000000000..4b4ec0f1547
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/nail-and-hammer_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull.png
deleted file mode 100644
index 468d543c466..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull_chest.png
new file mode 100644
index 00000000000..b3b323992af
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull_groin.png
new file mode 100644
index 00000000000..ad0cd43a728
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/skull_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes.png
deleted file mode 100644
index 0d35996c4dd..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes_chest.png
new file mode 100644
index 00000000000..32916a6b312
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes_groin.png
new file mode 100644
index 00000000000..39795d62e35
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/slashes_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star.png
deleted file mode 100644
index 04131696907..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star_chest.png
new file mode 100644
index 00000000000..602878c6c4a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star_groin.png
new file mode 100644
index 00000000000..dc787bc0cf2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/star_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes.png
deleted file mode 100644
index 047624504bb..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes_chest.png
new file mode 100644
index 00000000000..c12c706024f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes_groin.png
new file mode 100644
index 00000000000..f531e640738
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/stripes_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x.png
deleted file mode 100644
index 0e8bf3be697..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x_chest.png
new file mode 100644
index 00000000000..3f1a6a88ebc
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x_groin.png b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x_groin.png
new file mode 100644
index 00000000000..a4a42813cfd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/chest.rsi/x_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy.png
deleted file mode 100644
index 53c581a59b5..00000000000
Binary files a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_chest.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_chest.png
new file mode 100644
index 00000000000..ff22874210e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_head.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_head.png
new file mode 100644
index 00000000000..f2c2ed592eb
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_head.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_arm.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_arm.png
new file mode 100644
index 00000000000..4d02a170b07
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_arm.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_hand.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_hand.png
new file mode 100644
index 00000000000..aead0cdf2bd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_hand.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_leg.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_leg.png
new file mode 100644
index 00000000000..94bb6232122
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_l_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_arm.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_arm.png
new file mode 100644
index 00000000000..986e264c217
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_arm.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_hand.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_hand.png
new file mode 100644
index 00000000000..453c6e9e84a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_hand.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_leg.png b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_leg.png
new file mode 100644
index 00000000000..b7cef7096b1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/fuzzy_r_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/meta.json b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/meta.json
index 5c8c06456fb..3c6534cf502 100644
--- a/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Arachnid/overlay.rsi/meta.json
@@ -1,14 +1,42 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Nairodian (github) for SS14",
+  "copyright": "Made by Nairodian (github) for SS14. The division was done by Sparison",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "fuzzy",
+      "name": "fuzzy_chest",
+      "directions": 4
+    },
+    {
+      "name": "fuzzy_head",
+      "directions": 4
+    },
+    {
+      "name": "fuzzy_l_arm",
+      "directions": 4
+    },
+    {
+      "name": "fuzzy_l_hand",
+      "directions": 4
+    },
+    {
+      "name": "fuzzy_l_leg",
+      "directions": 4
+    },
+    {
+      "name": "fuzzy_r_arm",
+      "directions": 4
+    },
+    {
+      "name": "fuzzy_r_hand",
+      "directions": 4
+    },
+    {
+      "name": "fuzzy_r_leg",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/charred_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/charred_chest.png
index 8981bd797e8..734b3e55db9 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/charred_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/charred_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/charred_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/charred_groin.png
new file mode 100644
index 00000000000..2f7310b04d1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/charred_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/deathhead_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/deathhead_chest.png
index d2741f89547..bac626b0a6f 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/deathhead_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/deathhead_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/deathhead_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/deathhead_groin.png
new file mode 100644
index 00000000000..f6bdf786fc9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/deathhead_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/fan_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/fan_chest.png
index 9c606c14111..df2beb38ab1 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/fan_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/fan_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/fan_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/fan_groin.png
new file mode 100644
index 00000000000..4d6510ce05e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/fan_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/firewatch_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/firewatch_chest.png
index a5b726ca02b..9c1015a980d 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/firewatch_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/firewatch_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/firewatch_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/firewatch_groin.png
new file mode 100644
index 00000000000..ed76cd0c7ac
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/firewatch_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/gothic_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/gothic_chest.png
index f942cf309c4..1a1413fb9f0 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/gothic_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/gothic_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/gothic_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/gothic_groin.png
new file mode 100644
index 00000000000..68447c95e4e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/gothic_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/jungle_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/jungle_chest.png
index e1518529ddf..2d2a1d9cbd6 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/jungle_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/jungle_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/jungle_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/jungle_groin.png
new file mode 100644
index 00000000000..ed6814403a5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/jungle_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json
index 58b5aa55533..95a8faa0a50 100644
--- a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/MilenVolf",
+  "copyright": "Taken from tgstation at commits https://github.com/tgstation/tgstation/commit/b30e2934e7585bad901dd12a35d0635f1fc292c1 and https://github.com/tgstation/tgstation/commit/6b0af0febe578f47ae280781682ea7a3d77f508a, modified by https://github.com/MilenVolf. The division of the torso into chest and groin was done by Sparison",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,10 @@
       "name": "royal_chest",
       "directions": 4
     },
+    {
+      "name": "royal_groin",
+      "directions": 4
+    },
     {
       "name": "royal_r_arm",
       "directions": 4
@@ -39,6 +43,10 @@
       "name": "gothic_chest",
       "directions": 4
     },
+    {
+      "name": "gothic_groin",
+      "directions": 4
+    },
     {
       "name": "gothic_r_arm",
       "directions": 4
@@ -63,6 +71,10 @@
       "name": "whitefly_chest",
       "directions": 4
     },
+    {
+      "name": "whitefly_groin",
+      "directions": 4
+    },
     {
       "name": "whitefly_r_arm",
       "directions": 4
@@ -87,6 +99,10 @@
       "name": "charred_chest",
       "directions": 4
     },
+    {
+      "name": "charred_groin",
+      "directions": 4
+    },
     {
       "name": "charred_r_arm",
       "directions": 4
@@ -111,6 +127,10 @@
       "name": "firewatch_chest",
       "directions": 4
     },
+    {
+      "name": "firewatch_groin",
+      "directions": 4
+    },
     {
       "name": "firewatch_r_arm",
       "directions": 4
@@ -135,6 +155,10 @@
       "name": "deathhead_chest",
       "directions": 4
     },
+    {
+      "name": "deathhead_groin",
+      "directions": 4
+    },
     {
       "name": "deathhead_r_arm",
       "directions": 4
@@ -159,6 +183,10 @@
       "name": "fan_chest",
       "directions": 4
     },
+    {
+      "name": "fan_groin",
+      "directions": 4
+    },
     {
       "name": "fan_r_arm",
       "directions": 4
@@ -183,6 +211,10 @@
       "name": "ragged_chest",
       "directions": 4
     },
+    {
+      "name": "ragged_groin",
+      "directions": 4
+    },
     {
       "name": "ragged_r_arm",
       "directions": 4
@@ -207,6 +239,10 @@
       "name": "moonfly_chest",
       "directions": 4
     },
+    {
+      "name": "moonfly_groin",
+      "directions": 4
+    },
     {
       "name": "moonfly_r_arm",
       "directions": 4
@@ -231,6 +267,10 @@
       "name": "oakworm_chest",
       "directions": 4
     },
+    {
+      "name": "oakworm_groin",
+      "directions": 4
+    },
     {
       "name": "oakworm_r_arm",
       "directions": 4
@@ -255,6 +295,10 @@
       "name": "jungle_chest",
       "directions": 4
     },
+    {
+      "name": "jungle_groin",
+      "directions": 4
+    },
     {
       "name": "jungle_r_arm",
       "directions": 4
@@ -279,6 +323,10 @@
       "name": "witchwing_chest",
       "directions": 4
     },
+    {
+      "name": "witchwing_groin",
+      "directions": 4
+    },
     {
       "name": "witchwing_r_arm",
       "directions": 4
@@ -303,6 +351,10 @@
       "name": "pointy_chest",
       "directions": 4
     },
+    {
+      "name": "pointy_groin",
+      "directions": 4
+    },
     {
       "name": "pointy_r_arm",
       "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_chest.png
index bfe34fa5c2f..da7cd60441f 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_groin.png
new file mode 100644
index 00000000000..1992f564580
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/oakworm_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/oakworm_chest.png
index 1d930e7551d..638f6c1923c 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/oakworm_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/oakworm_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/oakworm_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/oakworm_groin.png
new file mode 100644
index 00000000000..7b891195ee3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/oakworm_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/pointy_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/pointy_chest.png
index a69afbc4bf6..defde94ae8d 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/pointy_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/pointy_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/pointy_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/pointy_groin.png
new file mode 100644
index 00000000000..34a8872d433
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/pointy_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/ragged_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/ragged_chest.png
index 4e15843ff43..317943f4531 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/ragged_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/ragged_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/ragged_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/ragged_groin.png
new file mode 100644
index 00000000000..4d40328be13
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/ragged_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/royal_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/royal_chest.png
index 2bad803a078..4fbdd667c03 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/royal_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/royal_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/royal_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/royal_groin.png
new file mode 100644
index 00000000000..0fa2d83cf30
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/royal_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/whitefly_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/whitefly_chest.png
index d5c88555256..43eda15b905 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/whitefly_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/whitefly_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/whitefly_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/whitefly_groin.png
new file mode 100644
index 00000000000..cd332228dd6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/whitefly_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/witchwing_chest.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/witchwing_chest.png
index 2617620c917..77d42fff30e 100644
Binary files a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/witchwing_chest.png and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/witchwing_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/witchwing_groin.png b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/witchwing_groin.png
new file mode 100644
index 00000000000..660852ba5c8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/witchwing_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/chest-primary.png b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/chest-primary.png
new file mode 100644
index 00000000000..92a78205ba1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/chest-primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/chest-secondary.png b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/chest-secondary.png
new file mode 100644
index 00000000000..071236392a1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/chest-secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/groin-primary.png b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/groin-primary.png
new file mode 100644
index 00000000000..264c9bf8a1f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/groin-primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/groin-secondary.png b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/groin-secondary.png
new file mode 100644
index 00000000000..92c0a4b459d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/groin-secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/meta.json b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/meta.json
index 94020ddda5b..97938d7c62e 100644
--- a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
+  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS). The division of the torso into chest and groin was done by Sparison",
   "license": "CC-BY-SA-3.0",
   "size": {
     "x": 32,
@@ -40,11 +40,19 @@
       "directions": 4
     },
     {
-      "name": "torso-primary",
+      "name": "chest-primary",
       "directions": 4
     },
     {
-      "name": "torso-secondary",
+      "name": "chest-secondary",
+      "directions": 4
+    },
+    {
+      "name": "groin-primary",
+      "directions": 4
+    },
+    {
+      "name": "groin-secondary",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/torso-primary.png b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/torso-primary.png
deleted file mode 100644
index 08cabfc99dc..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/torso-primary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/torso-secondary.png b/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/torso-secondary.png
deleted file mode 100644
index 4e61c144a95..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi/torso-secondary.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/chest-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/chest-1.png
new file mode 100644
index 00000000000..1b3c52ab359
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/chest-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/chest-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/chest-2.png
new file mode 100644
index 00000000000..49e77a8a4e8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/chest-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/groin-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/groin-1.png
new file mode 100644
index 00000000000..5db44e4a82a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/groin-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/groin-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/groin-2.png
new file mode 100644
index 00000000000..4726df09c66
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/groin-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/meta.json b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/meta.json
index 9f4ca1ee51f..ae45c02ee70 100644
--- a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
+  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS). The division of the torso into chest and groin was done by Sparison",
   "license": "CC-BY-SA-3.0",
   "size": {
     "x": 32,
@@ -40,11 +40,19 @@
       "directions": 4
     },
     {
-      "name": "torso-1",
+      "name": "chest-1",
       "directions": 4
     },
     {
-      "name": "torso-2",
+      "name": "chest-2",
+      "directions": 4
+    },
+    {
+      "name": "groin-1",
+      "directions": 4
+    },
+    {
+      "name": "groin-2",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/torso-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/torso-1.png
deleted file mode 100644
index 45fb93052e4..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/torso-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/torso-2.png
deleted file mode 100644
index a8782ac3b04..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/chest.png b/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/chest.png
new file mode 100644
index 00000000000..49602601fe2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/groin.png b/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/groin.png
new file mode 100644
index 00000000000..d5ab1a55902
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/meta.json b/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/meta.json
index 118c3f613c0..5b24ce589f5 100644
--- a/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise)",
+  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). The division of the torso into chest and groin was done by Sparison",
   "license": "CC-BY-SA-3.0",
   "size": {
     "x": 32,
@@ -24,7 +24,11 @@
       "directions": 4
     },
     {
-      "name": "torso",
+      "name": "chest",
+      "directions": 4
+    },
+    {
+      "name": "groin",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/torso.png b/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/torso.png
deleted file mode 100644
index 49afe13d65a..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/morpheus/morpheus_main.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/chest-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/chest-1.png
new file mode 100644
index 00000000000..72b1bd16420
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/chest-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/chest-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/chest-2.png
new file mode 100644
index 00000000000..62d69356230
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/chest-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/groin-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/groin-1.png
new file mode 100644
index 00000000000..38f870fa660
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/groin-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/groin-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/groin-2.png
new file mode 100644
index 00000000000..aa42ffda961
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/groin-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/meta.json b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/meta.json
index 9f4ca1ee51f..ae45c02ee70 100644
--- a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
+  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS). The division of the torso into chest and groin was done by Sparison",
   "license": "CC-BY-SA-3.0",
   "size": {
     "x": 32,
@@ -40,11 +40,19 @@
       "directions": 4
     },
     {
-      "name": "torso-1",
+      "name": "chest-1",
       "directions": 4
     },
     {
-      "name": "torso-2",
+      "name": "chest-2",
+      "directions": 4
+    },
+    {
+      "name": "groin-1",
+      "directions": 4
+    },
+    {
+      "name": "groin-2",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/torso-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/torso-1.png
deleted file mode 100644
index c757f06420a..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/torso-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/torso-2.png
deleted file mode 100644
index cd822361bf4..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/shellguard/shellguard_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/chest.png b/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/chest.png
new file mode 100644
index 00000000000..aafb8ee1e72
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/groin.png b/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/groin.png
new file mode 100644
index 00000000000..bbceaf0aa58
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/meta.json b/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/meta.json
index f30906990a5..4fc6e88563e 100644
--- a/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99",
+  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Edited by Timemaster99. The division of the torso into chest and groin was done by Sparison",
   "license": "CC-BY-SA-3.0",
   "size": {
     "x": 32,
@@ -24,7 +24,11 @@
       "directions": 4
     },
     {
-      "name": "torso",
+      "name": "chest",
+      "directions": 4
+    },
+    {
+      "name": "groin",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/torso.png b/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/torso.png
deleted file mode 100644
index ad1bd42ca6c..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/wardtakahashi/wardtakahashi_main.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/chest-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/chest-1.png
new file mode 100644
index 00000000000..4e32a79809f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/chest-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/chest-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/chest-2.png
new file mode 100644
index 00000000000..1db85f3dfcd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/chest-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/groin-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/groin-1.png
new file mode 100644
index 00000000000..baa37e8277b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/groin-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/groin-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/groin-2.png
new file mode 100644
index 00000000000..a536024ee92
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/groin-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/meta.json b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/meta.json
index 35c1cad74bd..62f327cf190 100644
--- a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS)",
+  "copyright": "Sprites originally from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version made by: DayOS (https://github.com/Day-OS). The division of the torso into chest and groin was done by Sparison",
   "license": "CC-BY-SA-3.0",
   "size": {
     "x": 32,
@@ -39,11 +39,19 @@
       "directions": 4
     },
     {
-      "name": "torso-1",
+      "name": "chest-1",
       "directions": 4
     },
     {
-      "name": "torso-2",
+      "name": "chest-2",
+      "directions": 4
+    },
+    {
+      "name": "groin-1",
+      "directions": 4
+    },
+    {
+      "name": "groin-2",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/torso-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/torso-1.png
deleted file mode 100644
index db42c9a82bf..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/torso-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/torso-2.png
deleted file mode 100644
index 70271b0c3a2..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/xion/xion_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/chest-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/chest-1.png
new file mode 100644
index 00000000000..9211abd849d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/chest-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/chest-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/chest-2.png
new file mode 100644
index 00000000000..52e549c3aa4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/chest-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/groin-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/groin-1.png
new file mode 100644
index 00000000000..98b88bdc5fc
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/groin-1.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/groin-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/groin-2.png
new file mode 100644
index 00000000000..1a312b63788
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/groin-2.png differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/meta.json b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/meta.json
index bf863d580f6..2dba90d7f4e 100644
--- a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/meta.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version by Timemaster99",
+  "copyright": "Sprites from Paradise Station (https://github.com/ParadiseSS13/Paradise). Monochromatic version by Timemaster99. The division of the torso into chest and groin was done by Sparison",
   "license": "CC-BY-SA-3.0",
   "size": {
     "x": 32,
@@ -44,11 +44,19 @@
       "directions": 4
     },
     {
-      "name": "torso-1",
+      "name": "chest-1",
       "directions": 4
     },
     {
-      "name": "torso-2",
+      "name": "chest-2",
+      "directions": 4
+    },
+    {
+      "name": "groin-1",
+      "directions": 4
+    },
+    {
+      "name": "groin-2",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/torso-1.png b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/torso-1.png
deleted file mode 100644
index 0e1480d6986..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/torso-1.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/torso-2.png b/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/torso-2.png
deleted file mode 100644
index d6bffee42c2..00000000000
Binary files a/Resources/Textures/Mobs/Customization/cyberlimbs/zenghu/zenghu_main.rsi/torso-2.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/flowers_body.png b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_body.png
deleted file mode 100644
index e531b3ac3c0..00000000000
Binary files a/Resources/Textures/Mobs/Customization/diona.rsi/flowers_body.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/flowers_chest.png b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_chest.png
new file mode 100644
index 00000000000..cf2dfeb7b70
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/flowers_groin.png b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_groin.png
new file mode 100644
index 00000000000..ad1f747ec7b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/flowers_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover.png b/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover.png
deleted file mode 100644
index c0d779a730e..00000000000
Binary files a/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover_chest.png b/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover_chest.png
new file mode 100644
index 00000000000..ae9ed23cbe7
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover_groin.png b/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover_groin.png
new file mode 100644
index 00000000000..d3628858a6c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/leaf_cover_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/meta.json b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json
index 833c9404698..2cfbf4d3556 100644
--- a/Resources/Textures/Mobs/Customization/diona.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/diona.rsi/meta.json
@@ -1,14 +1,18 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "flowers_body, flowers_head, leaf_cover, thorns_body, thorns_head from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe, modified by EmoGarbage and other from https://github.com/TauCetiStation/TauCetiClassic/blob/a8c097fd0e749dcd6f66f05cf5325e51f6b081dd/icons/mob/human_face.dmi",
+  "copyright": "flowers_body, flowers_head, leaf_cover, thorns_body, thorns_head from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe, modified by EmoGarbage and other from https://github.com/TauCetiStation/TauCetiClassic/blob/a8c097fd0e749dcd6f66f05cf5325e51f6b081dd/icons/mob/human_face.dmi. The division of the torso into chest and groin was done by Sparison.",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "flowers_body",
+      "name": "flowers_chest",
+      "directions": 4
+    },
+    {
+      "name": "flowers_groin",
       "directions": 4
     },
     {
@@ -16,11 +20,19 @@
       "directions": 4
     },
     {
-      "name": "leaf_cover",
+      "name": "leaf_cover_chest",
+      "directions": 4
+    },
+    {
+      "name": "leaf_cover_groin",
       "directions": 4
     },
     {
-      "name": "thorns_body",
+      "name": "thorns_chest",
+      "directions": 4
+    },
+    {
+      "name": "thorns_groin",
       "directions": 4
     },
     {
@@ -76,7 +88,47 @@
       "directions": 4
     },
     {
-      "name": "overlay",
+      "name": "overlay_chest",
+      "directions": 4
+    },
+    {
+      "name": "overlay_groin",
+      "directions": 4
+    },
+    {
+      "name": "overlay_head",
+      "directions": 4
+    },
+    {
+      "name": "overlay_l_arm",
+      "directions": 4
+    },
+    {
+      "name": "overlay_l_foot",
+      "directions": 4
+    },
+    {
+      "name": "overlay_l_hand",
+      "directions": 4
+    },
+    {
+      "name": "overlay_l_leg",
+      "directions": 4
+    },
+    {
+      "name": "overlay_r_arm",
+      "directions": 4
+    },
+    {
+      "name": "overlay_r_foot",
+      "directions": 4
+    },
+    {
+      "name": "overlay_r_hand",
+      "directions": 4
+    },
+    {
+      "name": "overlay_r_leg",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay.png
deleted file mode 100644
index 502a5c3fff3..00000000000
Binary files a/Resources/Textures/Mobs/Customization/diona.rsi/overlay.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_chest.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_chest.png
new file mode 100644
index 00000000000..da25023bcf4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_groin.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_groin.png
new file mode 100644
index 00000000000..52221ce461c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_head.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_head.png
new file mode 100644
index 00000000000..6e980955abd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_head.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_arm.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_arm.png
new file mode 100644
index 00000000000..80b5bde553f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_arm.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_foot.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_foot.png
new file mode 100644
index 00000000000..591a7234d72
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_hand.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_hand.png
new file mode 100644
index 00000000000..62ab1910d4c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_hand.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_leg.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_leg.png
new file mode 100644
index 00000000000..d2505c0aaaa
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_l_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_arm.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_arm.png
new file mode 100644
index 00000000000..906f4a07777
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_arm.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_foot.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_foot.png
new file mode 100644
index 00000000000..5cb131c34a6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_hand.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_hand.png
new file mode 100644
index 00000000000..e3fa24d4e88
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_hand.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_leg.png b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_leg.png
new file mode 100644
index 00000000000..ef52a623c5e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/overlay_r_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/thorns_body.png b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_body.png
deleted file mode 100644
index 3f0061059b3..00000000000
Binary files a/Resources/Textures/Mobs/Customization/diona.rsi/thorns_body.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/thorns_chest.png b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_chest.png
new file mode 100644
index 00000000000..c71908e32ab
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/diona.rsi/thorns_groin.png b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_groin.png
new file mode 100644
index 00000000000..88d445c81c8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/diona.rsi/thorns_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png
deleted file mode 100644
index ba2c0f6032e..00000000000
Binary files a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder_chest.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder_chest.png
new file mode 100644
index 00000000000..1064ed4df2c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder_groin.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder_groin.png
new file mode 100644
index 00000000000..9c2e4365c79
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_moth_shoulder_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder.png
deleted file mode 100644
index 92679219696..00000000000
Binary files a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder_chest.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder_chest.png
new file mode 100644
index 00000000000..d8b60d82601
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder_groin.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder_groin.png
new file mode 100644
index 00000000000..b236ff635f2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_shoulder_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
index bd7d1ed4eb4..8aabb323610 100644
--- a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Gauze sprites by Github KittenColony / Discord kittencolony (297865728374210561), gauze_head by github:DreamlyJack(624946166152298517)",
+  "copyright": "Gauze sprites by Github KittenColony / Discord kittencolony (297865728374210561), gauze_head by github:DreamlyJack(624946166152298517). The division of the torso into chest and groin was done by Sparison",
   "size": {
 	"x": 32,
 	"y": 32
@@ -12,7 +12,11 @@
 	  "directions": 4
 	},
 	{
-	  "name": "gauze_shoulder",
+	  "name": "gauze_shoulder_chest",
+	  "directions": 4
+	},
+	{
+	  "name": "gauze_shoulder_groin",
 	  "directions": 4
 	},
 	{
@@ -96,7 +100,11 @@
       "directions": 4
     },
     {
-      "name": "gauze_moth_shoulder",
+      "name": "gauze_moth_shoulder_chest",
+      "directions": 4
+    },
+    {
+      "name": "gauze_moth_shoulder_groin",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json b/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json
index c0792d54004..4555a4c6a6f 100644
--- a/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json
@@ -1,14 +1,18 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by angelofallars (github), two toes based off of Reptilian ( https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi )",
+  "copyright": "Sprites by angelofallars (github), two toes based off of Reptilian ( https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi ). The division is made by Spatison",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "two_toes",
+      "name": "two_toes_r_foot",
+      "directions": 4
+    },
+    {
+      "name": "two_toes_l_foot",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png
deleted file mode 100644
index 898f115fe35..00000000000
Binary files a/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes_l_foot.png b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes_l_foot.png
new file mode 100644
index 00000000000..e1916b379cd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes_l_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes_r_foot.png b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes_r_foot.png
new file mode 100644
index 00000000000..834410088b8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes_r_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_backspikes.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_backspikes.png
deleted file mode 100644
index 60246a24d4e..00000000000
Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_backspikes.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_tiger.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_tiger.png
deleted file mode 100644
index 9d30d72c969..00000000000
Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_tiger.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_underbelly.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_underbelly.png
deleted file mode 100644
index df7388ad413..00000000000
Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_underbelly.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_backspikes.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_backspikes.png
new file mode 100644
index 00000000000..7d2fb82bc86
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_backspikes.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_tiger.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_tiger.png
new file mode 100644
index 00000000000..3f902414da4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_tiger.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_underbelly.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_underbelly.png
new file mode 100644
index 00000000000..83347451443
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/chest_underbelly.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_backspikes.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_backspikes.png
new file mode 100644
index 00000000000..042fd3ca9ca
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_backspikes.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_tiger.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_tiger.png
new file mode 100644
index 00000000000..97eec2618b1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_tiger.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_underbelly.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_underbelly.png
new file mode 100644
index 00000000000..6c201ab8a16
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/groin_underbelly.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
index 0905baed5da..c1415a0f86f 100644
--- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2, resprited by @mishutka09",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2, resprited by @mishutka09. The division of the torso into chest and groin was done by Sparison",
   "size": {
     "x": 32,
     "y": 32
@@ -546,7 +546,11 @@
       "directions": 4
     },
     {
-      "name": "body_tiger",
+      "name": "chest_tiger",
+      "directions": 4
+    },
+    {
+      "name": "groin_tiger",
       "directions": 4
     },
     {
@@ -594,11 +598,19 @@
       "directions": 4
     },
     {
-      "name": "body_underbelly",
+      "name": "chest_underbelly",
+      "directions": 4
+    },
+    {
+      "name": "groin_underbelly",
+      "directions": 4
+    },
+    {
+      "name": "chest_backspikes",
       "directions": 4
     },
     {
-      "name": "body_backspikes",
+      "name": "groin_backspikes",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
index 0a323f7f65d..8b4797a3cde 100644
--- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser",
+  "copyright": "Drawn by Ubaser. The division of the torso into chest and groin was done by Sparison.",
   "size": {
     "x": 32,
     "y": 32
@@ -26,6 +26,10 @@
     {
         "name": "scar_chest",
         "directions": 4
+    },
+    {
+        "name": "scar_groin",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png
index 9a1cc56c5ea..66a2591b968 100644
Binary files a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_groin.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_groin.png
new file mode 100644
index 00000000000..2b5342e4f39
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
index 82f7f16ea93..d106bb90796 100644
--- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi | Arachne eyes by Skubman (github: angelofallars)",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi | Arachne eyes by Skubman (github: angelofallars). The division of the torso into chest and groin was done by Sparison.",
   "size": {
     "x": 32,
     "y": 32
@@ -12,13 +12,25 @@
       "directions": 4
     },
     {
-      "name": "tattoo_nightling",
+      "name": "tattoo_hive_groin",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_nightling_chest",
+      "directions": 4
+    },
+    {
+      "name": "tattoo_nightling_groin",
       "directions": 4
     },
     {
       "name": "tattoo_nanotrasen_chest",
       "directions": 4
     },
+    {
+      "name": "tattoo_nanotrasen_groin",
+      "directions": 4
+    },
     {
       "name": "tattoo_campbell_r_arm",
       "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png
index 7baf398bc27..b42c3ffc32e 100644
Binary files a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_groin.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_groin.png
new file mode 100644
index 00000000000..f744e422b2f
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png
index f97c3078a84..4fec4b2de10 100644
Binary files a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_groin.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_groin.png
new file mode 100644
index 00000000000..f3caddbce7e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nanotrasen_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png
deleted file mode 100644
index 824a9921df6..00000000000
Binary files a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_chest.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_chest.png
new file mode 100644
index 00000000000..f64065796ad
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_groin.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_groin.png
new file mode 100644
index 00000000000..536c1b7f050
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s.png
deleted file mode 100644
index 8361f55864b..00000000000
Binary files a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s_chest.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s_chest.png
new file mode 100644
index 00000000000..fd799d75d39
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s_groin.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s_groin.png
new file mode 100644
index 00000000000..b8a6c9813c6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/hive_s_groin.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
index 725fbb6a0db..e9490676ed5 100644
--- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. The division of the torso into chest and groin was done by Sparison.",
   "size": {
     "x": 32,
     "y": 32
@@ -16,11 +16,19 @@
       "directions": 4
     },
     {
-      "name": "hive_s",
+      "name": "hive_s_chest",
       "directions": 4
     },
     {
-      "name": "nightling_s",
+      "name": "hive_s_groin",
+      "directions": 4
+    },
+    {
+      "name": "nightling_s_chest",
+      "directions": 4
+    },
+    {
+      "name": "nightling_s_groin",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s.png
deleted file mode 100644
index 72b0b30fd5f..00000000000
Binary files a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s_chest.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s_chest.png
new file mode 100644
index 00000000000..f873ee1fff9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s_groin.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s_groin.png
new file mode 100644
index 00000000000..b944afe6d50
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/nightling_s_groin.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png
index c790ff58668..a8349cc092d 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_100.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_100.png
index f0d9b5741b1..80d7d56a870 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_100.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png
index 2dff27f8512..0fde325a45a 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png
index 05419cc533b..50fa8220c75 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png
index d2ed2552d4d..630bcb7e2a3 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png
index ea8be7c02d4..0f47413769f 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_10.png
new file mode 100644
index 00000000000..66441a05bed
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_100.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_100.png
new file mode 100644
index 00000000000..8b9c5bdc824
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_20.png
new file mode 100644
index 00000000000..fc33591d4bd
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_30.png
new file mode 100644
index 00000000000..2a084ff9ce2
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_50.png
new file mode 100644
index 00000000000..8c9536378fc
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_70.png
new file mode 100644
index 00000000000..b605918380a
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Groin_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_10.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_10.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_100.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_100.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_100.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_20.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_30.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_50.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftArm_Brute_70.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_10.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_10.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_100.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_100.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_100.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_20.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_30.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_50.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/LeftLeg_Brute_70.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_10.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_10.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_100.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_100.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_100.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_20.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_30.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_50.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightArm_Brute_70.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_10.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_10.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_100.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_100.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_100.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_20.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_30.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_50.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png
rename to Resources/Textures/Mobs/Effects/brute_damage.rsi/RightLeg_Brute_70.png
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json b/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
index 68ad07d2bd7..4862458c551 100644
--- a/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
@@ -1,44 +1,50 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Drawn by Ubaser.",
+	"copyright": "Drawn by Ubaser. Edit by Spatison",
 	"size": {"x": 32, "y": 32},
 	"states": [
 		{"name": "Head_Brute_10", "directions": 4},
-		{"name": "LArm_Brute_10", "directions": 4},
-		{"name": "LLeg_Brute_10", "directions": 4},
-		{"name": "RArm_Brute_10", "directions": 4},
-		{"name": "RLeg_Brute_10", "directions": 4},
+		{"name": "LeftArm_Brute_10", "directions": 4},
+		{"name": "LeftLeg_Brute_10", "directions": 4},
+		{"name": "RightArm_Brute_10", "directions": 4},
+		{"name": "RightLeg_Brute_10", "directions": 4},
 		{"name": "Chest_Brute_10", "directions": 4},
+		{"name": "Groin_Brute_10", "directions": 4},
 		{"name": "Head_Brute_20", "directions": 4},
-		{"name": "LArm_Brute_20", "directions": 4},
-		{"name": "LLeg_Brute_20", "directions": 4},
-		{"name": "RArm_Brute_20", "directions": 4},
-		{"name": "RLeg_Brute_20", "directions": 4},
+		{"name": "LeftArm_Brute_20", "directions": 4},
+		{"name": "LeftLeg_Brute_20", "directions": 4},
+		{"name": "RightArm_Brute_20", "directions": 4},
+		{"name": "RightLeg_Brute_20", "directions": 4},
 		{"name": "Chest_Brute_20", "directions": 4},
+		{"name": "Groin_Brute_20", "directions": 4},
 		{"name": "Head_Brute_30", "directions": 4},
-		{"name": "LArm_Brute_30", "directions": 4},
-		{"name": "LLeg_Brute_30", "directions": 4},
-		{"name": "RArm_Brute_30", "directions": 4},
-		{"name": "RLeg_Brute_30", "directions": 4},
+		{"name": "LeftArm_Brute_30", "directions": 4},
+		{"name": "LeftLeg_Brute_30", "directions": 4},
+		{"name": "RightArm_Brute_30", "directions": 4},
+		{"name": "RightLeg_Brute_30", "directions": 4},
 		{"name": "Chest_Brute_30", "directions": 4},
+		{"name": "Groin_Brute_30", "directions": 4},
 		{"name": "Head_Brute_50", "directions": 4},
-		{"name": "LArm_Brute_50", "directions": 4},
-		{"name": "LLeg_Brute_50", "directions": 4},
-		{"name": "RArm_Brute_50", "directions": 4},
-		{"name": "RLeg_Brute_50", "directions": 4},
+		{"name": "LeftArm_Brute_50", "directions": 4},
+		{"name": "LeftLeg_Brute_50", "directions": 4},
+		{"name": "RightArm_Brute_50", "directions": 4},
+		{"name": "RightLeg_Brute_50", "directions": 4},
 		{"name": "Chest_Brute_50", "directions": 4},
+		{"name": "Groin_Brute_50", "directions": 4},
 		{"name": "Head_Brute_70", "directions": 4},
-		{"name": "LArm_Brute_70", "directions": 4},
-		{"name": "LLeg_Brute_70", "directions": 4},
-		{"name": "RArm_Brute_70", "directions": 4},
-		{"name": "RLeg_Brute_70", "directions": 4},
+		{"name": "LeftArm_Brute_70", "directions": 4},
+		{"name": "LeftLeg_Brute_70", "directions": 4},
+		{"name": "RightArm_Brute_70", "directions": 4},
+		{"name": "RightLeg_Brute_70", "directions": 4},
 		{"name": "Chest_Brute_70", "directions": 4},
+		{"name": "Groin_Brute_70", "directions": 4},
 		{"name": "Head_Brute_100", "directions": 4},
-		{"name": "LArm_Brute_100", "directions": 4},
-		{"name": "LLeg_Brute_100", "directions": 4},
-		{"name": "RArm_Brute_100", "directions": 4},
-		{"name": "RLeg_Brute_100", "directions": 4},
-		{"name": "Chest_Brute_100", "directions": 4}
+		{"name": "LeftArm_Brute_100", "directions": 4},
+		{"name": "LeftLeg_Brute_100", "directions": 4},
+		{"name": "RightArm_Brute_100", "directions": 4},
+		{"name": "RightLeg_Brute_100", "directions": 4},
+		{"name": "Chest_Brute_100", "directions": 4},
+		{"name": "Groin_Brute_100", "directions": 4}
 	]
 }
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png
index bb29391fa06..c2dda4f2b25 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png
index c4058b6b224..c96cda6b300 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_20.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_20.png
index bb29391fa06..c2dda4f2b25 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_20.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png
index 5a68c6fd861..766cf4a9557 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png
index 5a68c6fd861..766cf4a9557 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png
index 2ca0dc67f15..0919025d9a9 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_10.png
new file mode 100644
index 00000000000..2ad7a8a8f29
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_100.png
new file mode 100644
index 00000000000..211d7fcc55b
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_20.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_20.png
new file mode 100644
index 00000000000..2ad7a8a8f29
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_30.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_30.png
new file mode 100644
index 00000000000..2c665c59bfe
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_50.png
new file mode 100644
index 00000000000..2c665c59bfe
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_70.png
new file mode 100644
index 00000000000..77157cad835
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Groin_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_20.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_20.png
deleted file mode 100644
index bc8f7bf9cae..00000000000
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_20.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_10.png
new file mode 100644
index 00000000000..db5cdb4082f
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_100.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_20.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_30.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_30.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_50.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftArm_Burn_70.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_10.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_10.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_100.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_20.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_20.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_20.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_30.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_30.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_50.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LeftLeg_Burn_70.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_10.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_10.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_100.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_20.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_20.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_20.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_30.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_30.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_50.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightArm_Burn_70.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_10.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_10.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_100.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_100.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_20.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_20.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_20.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_20.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_30.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_30.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_50.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_50.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_70.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RightLeg_Burn_70.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json b/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
index 3649a05cc1a..a46456c1db8 100644
--- a/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
@@ -1,44 +1,50 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi, 100 drawn by Ubaser.",
+	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi, 100 drawn by Ubaser. Edit by Spatison",
 	"size": {"x": 32, "y": 32},
 	"states": [
 		{"name": "Head_Burn_10", "directions": 4},
-		{"name": "LArm_Burn_10", "directions": 4},
-		{"name": "LLeg_Burn_10", "directions": 4},
-		{"name": "RArm_Burn_10", "directions": 4},
-		{"name": "RLeg_Burn_10", "directions": 4},
+		{"name": "LeftArm_Burn_10", "directions": 4},
+		{"name": "LeftLeg_Burn_10", "directions": 4},
+		{"name": "RightArm_Burn_10", "directions": 4},
+		{"name": "RightLeg_Burn_10", "directions": 4},
 		{"name": "Chest_Burn_10", "directions": 4},
+		{"name": "Groin_Burn_10", "directions": 4},
 		{"name": "Head_Burn_20", "directions": 4},
-		{"name": "LArm_Burn_20", "directions": 4},
-		{"name": "LLeg_Burn_20", "directions": 4},
-		{"name": "RArm_Burn_20", "directions": 4},
-		{"name": "RLeg_Burn_20", "directions": 4},
+		{"name": "LeftArm_Burn_20", "directions": 4},
+		{"name": "LeftLeg_Burn_20", "directions": 4},
+		{"name": "RightArm_Burn_20", "directions": 4},
+		{"name": "RightLeg_Burn_20", "directions": 4},
 		{"name": "Chest_Burn_20", "directions": 4},
+		{"name": "Groin_Burn_20", "directions": 4},
 		{"name": "Head_Burn_30", "directions": 4},
-		{"name": "LArm_Burn_30", "directions": 4},
-		{"name": "LLeg_Burn_30", "directions": 4},
-		{"name": "RArm_Burn_30", "directions": 4},
-		{"name": "RLeg_Burn_30", "directions": 4},
+		{"name": "LeftArm_Burn_30", "directions": 4},
+		{"name": "LeftLeg_Burn_30", "directions": 4},
+		{"name": "RightArm_Burn_30", "directions": 4},
+		{"name": "RightLeg_Burn_30", "directions": 4},
 		{"name": "Chest_Burn_30", "directions": 4},
+		{"name": "Groin_Burn_30", "directions": 4},
 		{"name": "Head_Burn_50", "directions": 4},
-		{"name": "LArm_Burn_50", "directions": 4},
-		{"name": "LLeg_Burn_50", "directions": 4},
-		{"name": "RArm_Burn_50", "directions": 4},
-		{"name": "RLeg_Burn_50", "directions": 4},
+		{"name": "LeftArm_Burn_50", "directions": 4},
+		{"name": "LeftLeg_Burn_50", "directions": 4},
+		{"name": "RightArm_Burn_50", "directions": 4},
+		{"name": "RightLeg_Burn_50", "directions": 4},
 		{"name": "Chest_Burn_50", "directions": 4},
+		{"name": "Groin_Burn_50", "directions": 4},
 		{"name": "Head_Burn_70", "directions": 4},
-		{"name": "LArm_Burn_70", "directions": 4},
-		{"name": "LLeg_Burn_70", "directions": 4},
-		{"name": "RArm_Burn_70", "directions": 4},
-		{"name": "RLeg_Burn_70", "directions": 4},
+		{"name": "LeftArm_Burn_70", "directions": 4},
+		{"name": "LeftLeg_Burn_70", "directions": 4},
+		{"name": "RightArm_Burn_70", "directions": 4},
+		{"name": "RightLeg_Burn_70", "directions": 4},
 		{"name": "Chest_Burn_70", "directions": 4},
+		{"name": "Groin_Burn_70", "directions": 4},
 		{"name": "Head_Burn_100", "directions": 4},
-		{"name": "LArm_Burn_100", "directions": 4},
-		{"name": "LLeg_Burn_100", "directions": 4},
-		{"name": "RArm_Burn_100", "directions": 4},
-		{"name": "RLeg_Burn_100", "directions": 4},
-		{"name": "Chest_Burn_100", "directions": 4}
+		{"name": "LeftArm_Burn_100", "directions": 4},
+		{"name": "LeftLeg_Burn_100", "directions": 4},
+		{"name": "RightArm_Burn_100", "directions": 4},
+		{"name": "RightLeg_Burn_100", "directions": 4},
+		{"name": "Chest_Burn_100", "directions": 4},
+		{"name": "Groin_Burn_100", "directions": 4}
 	]
 }
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/chest.png
new file mode 100644
index 00000000000..2ba2e84cbd6
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..2ba2e84cbd6
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/groin.png
new file mode 100644
index 00000000000..df1627efe43
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..df1627efe43
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Arachnid/parts.rsi/head_female.png
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json
index a09c655a2b0..ca2f81c7a3b 100644
--- a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts.dmi for acting as a base, modified by PixelTheKermit (github) for SS14",
+  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts.dmi for acting as a base, modified by PixelTheKermit (github) for SS14. The division of the torso into chest and groin was done by Sparison",
   "size": {
     "x": 32,
     "y": 32
@@ -11,11 +11,11 @@
       "name": "full"
     },
     {
-      "name": "head_f",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_m",
+      "name": "head_female",
       "directions": 4
     },
     {
@@ -51,11 +51,19 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png
index 91602ff5d94..33e3c80f231 100644
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png and b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/template.png differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_f.png
deleted file mode 100644
index 10f3a3b0e4c..00000000000
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_m.png
deleted file mode 100644
index 10f3a3b0e4c..00000000000
Binary files a/Resources/Textures/Mobs/Species/Arachnid/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/chest.png
new file mode 100644
index 00000000000..29ffdabfca9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..29ffdabfca9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/groin.png
new file mode 100644
index 00000000000..f08e8633b4e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..f08e8633b4e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Diona/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Diona/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Diona/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Diona/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Diona/parts.rsi/head_female.png
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Diona/parts.rsi/meta.json
index bc90b509a1d..cbbe83a5fd5 100644
--- a/Resources/Textures/Mobs/Species/Diona/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Diona/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/ParadiseSS13/Paradise/commit/924e8cc949a40ea64a978656dbbc0b43b4a8f33a and modified by EmoGarbage",
+  "copyright": "https://github.com/ParadiseSS13/Paradise/commit/924e8cc949a40ea64a978656dbbc0b43b4a8f33a and modified by EmoGarbage. Changed by WWDP",
   "size": {
     "x": 32,
     "y": 32
@@ -11,11 +11,11 @@
       "name": "full"
     },
     {
-      "name": "head_f",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_m",
+      "name": "head_female",
       "directions": 4
     },
     {
@@ -51,11 +51,19 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png
deleted file mode 100644
index 6aaf688a4a2..00000000000
Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png
deleted file mode 100644
index 6aaf688a4a2..00000000000
Binary files a/Resources/Textures/Mobs/Species/Diona/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/chest.png
new file mode 100644
index 00000000000..e58314eeaec
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/groin.png
new file mode 100644
index 00000000000..f2c3af9dfae
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_m.png
deleted file mode 100644
index 5d0a9513799..00000000000
Binary files a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/meta.json
index fec31a494d2..ec58f14f6df 100644
--- a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites made by Aleksh for Space Station 14",
+  "copyright": "Sprites made by Aleksh for Space Station 14. Changed by WWDP",
   "size": {
     "x": 32,
     "y": 32
@@ -11,11 +11,7 @@
       "name": "full"
     },
     {
-      "name": "head_f",
-      "directions": 4
-    },
-    {
-      "name": "head_m",
+      "name": "head",
       "directions": 4
     },
     {
@@ -51,11 +47,11 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "groin",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_f.png
deleted file mode 100644
index bde0508ffda..00000000000
Binary files a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_m.png
deleted file mode 100644
index bde0508ffda..00000000000
Binary files a/Resources/Textures/Mobs/Species/Gingerbread/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest.png
new file mode 100644
index 00000000000..d9dc76a3060
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..aa3bad84017
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest_female_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest_female_slim.png
new file mode 100644
index 00000000000..1cb339fa079
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/chest_female_slim.png differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin.png
new file mode 100644
index 00000000000..02d285a881f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..ae53691d5a9
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin_female_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin_female_slim.png
new file mode 100644
index 00000000000..53976f09a31
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/groin_female_slim.png differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_female.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/head_slim_f.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_female_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/head_slim_f.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/head_female_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_arm_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_arm_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_arm_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_arm_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_foot_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_foot_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_foot_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_foot_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_hand_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_hand_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_hand_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_hand_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_leg_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_leg_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/l_leg_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/l_leg_slim.png
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json
index 4073a762e89..3efcb691789 100644
--- a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf, Legs and lower torso parts made by @ps3moira, Full reference with parts made by @Still-Icarus",
+  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf, Legs and lower torso parts made by @ps3moira, Full reference with parts made by @Still-Icarus. The division of the torso into chest and groin was done by Sparison. Slim body type by canceredpussy (discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -11,51 +11,103 @@
       "name": "full"
     },
     {
-      "name": "head_f",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_m",
+      "name": "head_female",
+      "directions": 4
+    },
+    {
+      "name": "head_female_slim",
       "directions": 4
     },
     {
       "name": "l_arm",
       "directions": 4
     },
+    {
+      "name": "l_arm_slim",
+      "directions": 4
+    },
     {
       "name": "l_foot",
       "directions": 4
     },
+    {
+      "name": "l_foot_slim",
+      "directions": 4
+    },
     {
       "name": "l_hand",
       "directions": 4
     },
+    {
+      "name": "l_hand_slim",
+      "directions": 4
+    },
     {
       "name": "l_leg",
       "directions": 4
     },
+    {
+      "name": "l_leg_slim",
+      "directions": 4
+    },
     {
       "name": "r_arm",
       "directions": 4
     },
+    {
+      "name": "r_arm_slim",
+      "directions": 4
+    },
     {
       "name": "r_foot",
       "directions": 4
     },
+    {
+      "name": "r_foot_slim",
+      "directions": 4
+    },
     {
       "name": "r_hand",
       "directions": 4
     },
+    {
+      "name": "r_hand_slim",
+      "directions": 4
+    },
     {
       "name": "r_leg",
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "r_leg_slim",
+      "directions": 4
+    },
+    {
+      "name": "chest",
+      "directions": 4
+    },
+    {
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "chest_female_slim",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "groin_female_slim",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_arm_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_arm_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_arm_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_arm_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_foot_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_foot_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_foot_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_foot_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_hand_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_hand_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_hand_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_hand_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_leg_slim.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_leg_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/r_leg_slim.png
rename to Resources/Textures/Mobs/Species/Harpy/parts.rsi/r_leg_slim.png
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png
deleted file mode 100644
index 8cd598f06e9..00000000000
Binary files a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_m.png
deleted file mode 100644
index 9a30fbfb574..00000000000
Binary files a/Resources/Textures/Mobs/Species/Harpy/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/chest.png
new file mode 100644
index 00000000000..4acd2cbce77
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..f3e6330b626
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/chest_female_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/chest_female_slim.png
new file mode 100644
index 00000000000..9f07f2fe98a
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/parts.rsi/chest_female_slim.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/groin.png
new file mode 100644
index 00000000000..d31f4f69a7e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..e0c05d30b3a
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/groin_female_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/groin_female_slim.png
new file mode 100644
index 00000000000..9d77de5450d
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/parts.rsi/groin_female_slim.png differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Human/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Human/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/head_female.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/head_slim_f.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/head_female_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/head_slim_f.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/head_female_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_arm_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/l_arm_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_arm_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/l_arm_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_foot_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/l_foot_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_foot_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/l_foot_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_hand_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/l_hand_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_hand_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/l_hand_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_leg_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/l_leg_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/l_leg_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/l_leg_slim.png
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json
index 00f5c7a9049..c03ea2d94d3 100644
--- a/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf",
+  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf. The division of the torso into chest and groin was done by Sparison. Slim body type by WWDP TEAM",
   "size": {
     "x": 32,
     "y": 32
@@ -11,52 +11,104 @@
       "name": "full"
     },
     {
-      "name": "head_f",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_m",
+      "name": "head_female",
+      "directions": 4
+    },
+    {
+      "name": "head_female_slim",
       "directions": 4
     },
     {
       "name": "l_arm",
       "directions": 4
     },
+    {
+      "name": "l_arm_slim",
+      "directions": 4
+    },
     {
       "name": "l_foot",
       "directions": 4
     },
+    {
+      "name": "l_foot_slim",
+      "directions": 4
+    },
     {
       "name": "l_hand",
       "directions": 4
     },
+    {
+      "name": "l_hand_slim",
+      "directions": 4
+    },
     {
       "name": "l_leg",
       "directions": 4
     },
+    {
+      "name": "l_leg_slim",
+      "directions": 4
+    },
     {
       "name": "r_arm",
       "directions": 4
     },
+    {
+      "name": "r_arm_slim",
+      "directions": 4
+    },
     {
       "name": "r_foot",
       "directions": 4
     },
+    {
+      "name": "r_foot_slim",
+      "directions": 4
+    },
     {
       "name": "r_hand",
       "directions": 4
     },
+    {
+      "name": "r_hand_slim",
+      "directions": 4
+    },
     {
       "name": "r_leg",
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "r_leg_slim",
+      "directions": 4
+    },
+    {
+      "name": "chest",
+      "directions": 4
+    },
+    {
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "chest_female_slim",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "groin_female_slim",
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_arm_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/r_arm_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_arm_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/r_arm_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_foot_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/r_foot_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_foot_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/r_foot_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_hand_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/r_hand_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_hand_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/r_hand_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_leg_slim.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/r_leg_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Human/parts.rsi/r_leg_slim.png
rename to Resources/Textures/Mobs/Species/Human/parts.rsi/r_leg_slim.png
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_f.png
deleted file mode 100644
index cf7d2e72b54..00000000000
Binary files a/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_m.png
deleted file mode 100644
index 3097763a95e..00000000000
Binary files a/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/chest.png
new file mode 100644
index 00000000000..a4e0de22e10
Binary files /dev/null and b/Resources/Textures/Mobs/Species/IPC/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..ed100321e7f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/IPC/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/groin.png
new file mode 100644
index 00000000000..40cbf653f3f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/IPC/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..40cbf653f3f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/IPC/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/IPC/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/IPC/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/IPC/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/IPC/parts.rsi/head_female.png
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/IPC/parts.rsi/meta.json
index 32c61db5940..e2a5346a6f4 100644
--- a/Resources/Textures/Mobs/Species/IPC/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/IPC/parts.rsi/meta.json
@@ -11,19 +11,27 @@
       "name": "full"
     },
     {
-      "name": "head_m",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_f",
+      "name": "head_female",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/torso_f.png
deleted file mode 100644
index 2b3f8f8bc44..00000000000
Binary files a/Resources/Textures/Mobs/Species/IPC/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/IPC/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/IPC/parts.rsi/torso_m.png
deleted file mode 100644
index 63f7ceeb9aa..00000000000
Binary files a/Resources/Textures/Mobs/Species/IPC/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/chest.png
new file mode 100644
index 00000000000..d86957f6bbf
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Moth/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..cb24e4a71e6
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Moth/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/groin.png
new file mode 100644
index 00000000000..1a24612ce5f
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Moth/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..e2046703454
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Moth/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Moth/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Moth/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Moth/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Moth/parts.rsi/head_female.png
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json
index 016f008fc91..1e95e0c6864 100644
--- a/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Moth/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/1d0eadcb126fc3581eed33490f4be2a88157af58, modified by https://github.com/PixelTheKermit",
+  "copyright": "https://github.com/tgstation/tgstation/commit/1d0eadcb126fc3581eed33490f4be2a88157af58, modified by https://github.com/PixelTheKermit. Changed by WWDP",
   "size": {
     "x": 32,
     "y": 32
@@ -11,11 +11,11 @@
       "name": "full"
     },
     {
-      "name": "head_f",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_m",
+      "name": "head_female",
       "directions": 4
     },
     {
@@ -51,11 +51,19 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     },
     {
@@ -63,4 +71,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/torso_f.png
deleted file mode 100644
index 233dd6d7222..00000000000
Binary files a/Resources/Textures/Mobs/Species/Moth/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Moth/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Moth/parts.rsi/torso_m.png
deleted file mode 100644
index a2722c22730..00000000000
Binary files a/Resources/Textures/Mobs/Species/Moth/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/chest.png
new file mode 100644
index 00000000000..3bbf364f2b7
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/groin.png
new file mode 100644
index 00000000000..f5068a59acc
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/head_m.png
deleted file mode 100644
index 1c861e1d9f0..00000000000
Binary files a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/meta.json
index db0b13c9206..17ef0126110 100644
--- a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TG station at commit https://github.com/tgstation/tgstation/commit/fc4de530ce208ad6d91ad85cf241b094e64b2ae5 and modified by Skubman",
+  "copyright": "Taken from TG station at commit https://github.com/tgstation/tgstation/commit/fc4de530ce208ad6d91ad85cf241b094e64b2ae5 and modified by Skubman. Changed by WWDP",
   "size": {
     "x": 32,
     "y": 32
@@ -11,11 +11,7 @@
       "name": "full"
     },
     {
-      "name": "head_f",
-      "directions": 4
-    },
-    {
-      "name": "head_m",
+      "name": "head",
       "directions": 4
     },
     {
@@ -51,11 +47,11 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "groin",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/torso_f.png
deleted file mode 100644
index 878dd9ed62a..00000000000
Binary files a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/torso_m.png
deleted file mode 100644
index 878dd9ed62a..00000000000
Binary files a/Resources/Textures/Mobs/Species/Plasmaman/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest.png
new file mode 100644
index 00000000000..603df7c3af5
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..7756c5b8f93
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest_female_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest_female_slim.png
new file mode 100644
index 00000000000..0b60ee6dbd1
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/chest_female_slim.png differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin.png
new file mode 100644
index 00000000000..e745586dafa
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..2c1be19fc9c
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin_female_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin_female_slim.png
new file mode 100644
index 00000000000..91efa3fceaa
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/groin_female_slim.png differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_female.png
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/head_slim_f.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_female_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/head_slim_f.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_female_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_arm_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_arm_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_arm_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_arm_slim.png
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_foot.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_foot.png
index 06c9c98b20a..eca8d473c25 100644
Binary files a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_foot.png and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_foot.png differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_foot_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_foot_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_foot_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_foot_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_hand_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_hand_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_hand_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_hand_slim.png
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_leg.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_leg.png
index 463ebd21ad5..ce2650f04e7 100644
Binary files a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_leg.png and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_leg.png differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_leg_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_leg_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_leg_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/l_leg_slim.png
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/meta.json
index 87197a14f3d..6030a1708cf 100644
--- a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/blob/08898964e67a0d517ca4e47eec7039394b694ac2/icons/mob/species/lizard/bodyparts.dmi",
+    "copyright": "https://github.com/tgstation/tgstation/blob/08898964e67a0d517ca4e47eec7039394b694ac2/icons/mob/species/lizard/bodyparts.dmi. legs and foots from edited by PuroSlavKing (Github). The division of the torso into chest and groin was done by Sparison. Slim body type by canceredpussy (discord)",
     "size": {
         "x": 32,
         "y": 32
@@ -11,51 +11,103 @@
             "name": "full"
         },
         {
-            "name": "head_f",
+            "name": "head",
             "directions": 4
         },
         {
-            "name": "head_m",
+            "name": "head_female",
+            "directions": 4
+        },
+        {
+            "name": "head_female_slim",
             "directions": 4
         },
         {
             "name": "l_arm",
             "directions": 4
         },
+        {
+            "name": "l_arm_slim",
+            "directions": 4
+        },
         {
             "name": "l_foot",
             "directions": 4
         },
+        {
+            "name": "l_foot_slim",
+            "directions": 4
+        },
         {
             "name": "l_hand",
             "directions": 4
         },
+        {
+            "name": "l_hand_slim",
+            "directions": 4
+        },
         {
             "name": "l_leg",
             "directions": 4
         },
+        {
+            "name": "l_leg_slim",
+            "directions": 4
+        },
         {
             "name": "r_arm",
             "directions": 4
         },
+        {
+            "name": "r_arm_slim",
+            "directions": 4
+        },
         {
             "name": "r_foot",
             "directions": 4
         },
+        {
+            "name": "r_foot_slim",
+            "directions": 4
+        },
         {
             "name": "r_hand",
             "directions": 4
         },
+        {
+            "name": "r_hand_slim",
+            "directions": 4
+        },
         {
             "name": "r_leg",
             "directions": 4
         },
         {
-            "name": "torso_f",
+            "name": "r_leg_slim",
+            "directions": 4
+        },
+        {
+            "name": "chest",
+            "directions": 4
+        },
+        {
+            "name": "chest_female",
+            "directions": 4
+        },
+        {
+            "name": "chest_female_slim",
+            "directions": 4
+        },
+        {
+            "name": "groin",
+            "directions": 4
+        },
+        {
+            "name": "groin_female",
             "directions": 4
         },
         {
-            "name": "torso_m",
+            "name": "groin_female_slim",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_arm_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_arm_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_arm_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_arm_slim.png
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_foot.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_foot.png
index ec467675367..82a92c0f297 100644
Binary files a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_foot.png and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_foot.png differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_foot_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_foot_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_foot_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_foot_slim.png
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_hand_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_hand_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_hand_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_hand_slim.png
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_leg.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_leg.png
index b9353474f99..7bd62f01305 100644
Binary files a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_leg.png and b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_leg.png differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_leg_slim.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_leg_slim.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_leg_slim.png
rename to Resources/Textures/Mobs/Species/Reptilian/parts.rsi/r_leg_slim.png
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_f.png
deleted file mode 100644
index e9ae3189c39..00000000000
Binary files a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_m.png
deleted file mode 100644
index 21741816c02..00000000000
Binary files a/Resources/Textures/Mobs/Species/Reptilian/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/chest.png
new file mode 100644
index 00000000000..017765b81bc
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/groin.png
new file mode 100644
index 00000000000..ec450768c59
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_m.png
deleted file mode 100644
index ce502dbdc68..00000000000
Binary files a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/meta.json
index a259ab696b8..cd00a00063c 100644
--- a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/5bc3ea02ce03a551c85017f1ddd411315a19a5ca#diff-519788fa2ca74299d1686a44d3ab2098b49ed5ab65d293ec742bead7d49f0b8d",
+    "copyright": "https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/5bc3ea02ce03a551c85017f1ddd411315a19a5ca#diff-519788fa2ca74299d1686a44d3ab2098b49ed5ab65d293ec742bead7d49f0b8d. Changed by WWDP",
     "states": [
         {
             "name": "full",
@@ -16,21 +16,17 @@
             "directions": 4
         },
         {
-            "name": "head_m",
-            "directions": 4
-        },
-        {
-            "name": "head_f",
-            "directions": 4
-        },
-        {
-            "name": "torso_m",
-            "directions": 4
-        },
-        {
-            "name": "torso_f",
+            "name": "head",
             "directions": 4
         },
+    	{
+  	    "name": "chest",
+  	    "directions": 4
+    	},
+    	{
+  	    "name": "groin",
+  	    "directions": 4
+    	},
         {
             "name": "r_arm",
             "directions": 4
@@ -68,4 +64,4 @@
             "directions": 4
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/torso_f.png
deleted file mode 100644
index 83cc63cdd29..00000000000
Binary files a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/torso_m.png
deleted file mode 100644
index dafc83b65eb..00000000000
Binary files a/Resources/Textures/Mobs/Species/Shadowkin/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/chest.png
new file mode 100644
index 00000000000..a2b59f6a133
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/groin.png
new file mode 100644
index 00000000000..f3ded9c31a7
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_m.png
deleted file mode 100644
index af813d888ac..00000000000
Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json
index 78e0a89e04d..d72def07108 100644
--- a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by EmoGarbage",
+    "copyright": "Created by EmoGarbage. Changed by WWDP",
     "size": {
         "x": 32,
         "y": 32
@@ -11,11 +11,7 @@
             "name": "full"
         },
         {
-            "name": "head_f",
-            "directions": 4
-        },
-        {
-            "name": "head_m",
+            "name": "head",
             "directions": 4
         },
         {
@@ -54,13 +50,13 @@
             "name": "skull_icon",
             "directions": 1
         },
-        {
-            "name": "torso_f",
-            "directions": 4
-        },
-        {
-            "name": "torso_m",
-            "directions": 4
-        }
+    	{
+  	    "name": "chest",
+  	    "directions": 4
+    	},
+    	{
+   	   "name": "groin",
+   	   "directions": 4
+    	}
     ]
 }
diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/torso_f.png
deleted file mode 100644
index 6eb022a0962..00000000000
Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/torso_m.png
deleted file mode 100644
index 22f860dc919..00000000000
Binary files a/Resources/Textures/Mobs/Species/Skeleton/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/chest.png
new file mode 100644
index 00000000000..9c3572e394a
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Slime/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/chest_female.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..2c0cd16f733
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Slime/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/groin.png
new file mode 100644
index 00000000000..a3e458df06e
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Slime/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/groin_female.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..fee712bda76
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Slime/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/head_m.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Slime/parts.rsi/head_m.png
rename to Resources/Textures/Mobs/Species/Slime/parts.rsi/head.png
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/head_f.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/Mobs/Species/Slime/parts.rsi/head_f.png
rename to Resources/Textures/Mobs/Species/Slime/parts.rsi/head_female.png
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json
index a7822a9e6ce..de6f689fec2 100644
--- a/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica",
+  "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica. Changed by WWDP",
   "size": {
     "x": 32,
     "y": 32
@@ -11,11 +11,11 @@
       "name": "full"
     },
     {
-      "name": "head_f",
+      "name": "head",
       "directions": 4
     },
     {
-      "name": "head_m",
+      "name": "head_female",
       "directions": 4
     },
     {
@@ -51,11 +51,19 @@
       "directions": 4
     },
     {
-      "name": "torso_f",
+      "name": "chest",
       "directions": 4
     },
     {
-      "name": "torso_m",
+      "name": "chest_female",
+      "directions": 4
+    },
+    {
+      "name": "groin",
+      "directions": 4
+    },
+    {
+      "name": "groin_female",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/torso_f.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/torso_f.png
deleted file mode 100644
index 593bccf12f2..00000000000
Binary files a/Resources/Textures/Mobs/Species/Slime/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Slime/parts.rsi/torso_m.png
deleted file mode 100644
index 1f4f3315ad8..00000000000
Binary files a/Resources/Textures/Mobs/Species/Slime/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/chest.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/chest.png
new file mode 100644
index 00000000000..3988b3e44a3
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/chest.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/groin.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/groin.png
index ec0dd8402e5..5dd30cf6594 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/parts.rsi/groin.png and b/Resources/Textures/Mobs/Species/Vox/parts.rsi/groin.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json
index 4704e093b40..4750fda45ba 100644
--- a/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, and modified by Bhijn, Errant and Flareguy",
+  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb, and modified by Bhijn, Errant and Flareguy. The division of the torso into chest and groin was done by Sparison",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
     {
       "name": "full"
     },
-    {
-      "name": "groin",
-      "directions": 4
-    },
     {
       "name": "head",
       "directions": 4
@@ -59,7 +55,11 @@
       "directions": 4
     },
     {
-      "name": "torso",
+      "name": "chest",
+      "directions": 4
+    },
+    {
+      "name": "groin",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/deathshead-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/deathshead-chest.png
index b384efc5f43..2609e6926b2 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/deathshead-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/deathshead-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/deathshead-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/deathshead-groin.png
new file mode 100644
index 00000000000..7a24f9c349d
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/deathshead-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/firewatch-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/firewatch-chest.png
index 357e799ef2a..7e796d0293a 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/firewatch-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/firewatch-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/firewatch-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/firewatch-groin.png
new file mode 100644
index 00000000000..60b5efec3c2
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/firewatch-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/gothic-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/gothic-chest.png
index 82a9186c55e..371917986dc 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/gothic-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/gothic-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/gothic-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/gothic-groin.png
new file mode 100644
index 00000000000..f0ea7b92707
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/gothic-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/jungle-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/jungle-chest.png
index 63ac28994e1..62af2f2cd82 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/jungle-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/jungle-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/jungle-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/jungle-groin.png
new file mode 100644
index 00000000000..203303b6cdc
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/jungle-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/lovers-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/lovers-chest.png
index 1c7538b71ee..b9089d752ef 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/lovers-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/lovers-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/lovers-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/lovers-groin.png
new file mode 100644
index 00000000000..aa943c1be11
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/lovers-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/meta.json b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/meta.json
index b566f6e303b..352c1ad7427 100644
--- a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/be0e6efdf6b18e953d3dcb1eff584b66a9d3b9e3",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/be0e6efdf6b18e953d3dcb1eff584b66a9d3b9e3. The division of the torso into chest and groin was done by Sparison.",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,10 @@
       "name": "deathshead-chest",
       "directions": 4
     },
+    {
+      "name": "deathshead-groin",
+      "directions": 4
+    },
     {
       "name": "deathshead-rightarm",
       "directions": 4
@@ -39,6 +43,10 @@
       "name": "firewatch-chest",
       "directions": 4
     },
+    {
+      "name": "firewatch-groin",
+      "directions": 4
+    },
     {
       "name": "firewatch-rightarm",
       "directions": 4
@@ -63,6 +71,10 @@
       "name": "gothic-chest",
       "directions": 4
     },
+    {
+      "name": "gothic-groin",
+      "directions": 4
+    },
     {
       "name": "gothic-rightarm",
       "directions": 4
@@ -87,6 +99,10 @@
       "name": "jungle-chest",
       "directions": 4
     },
+    {
+      "name": "jungle-groin",
+      "directions": 4
+    },
     {
       "name": "jungle-rightarm",
       "directions": 4
@@ -111,6 +127,10 @@
       "name": "lovers-chest",
       "directions": 4
     },
+    {
+      "name": "lovers-groin",
+      "directions": 4
+    },
     {
       "name": "lovers-rightarm",
       "directions": 4
@@ -135,6 +155,10 @@
       "name": "moonfly-chest",
       "directions": 4
     },
+    {
+      "name": "moonfly-groin",
+      "directions": 4
+    },
     {
       "name": "moonfly-rightarm",
       "directions": 4
@@ -159,6 +183,10 @@
       "name": "oakworm-chest",
       "directions": 4
     },
+    {
+      "name": "oakworm-groin",
+      "directions": 4
+    },
     {
       "name": "oakworm-rightarm",
       "directions": 4
@@ -183,6 +211,10 @@
       "name": "poison-chest",
       "directions": 4
     },
+    {
+      "name": "poison-groin",
+      "directions": 4
+    },
     {
       "name": "poison-rightarm",
       "directions": 4
@@ -207,6 +239,10 @@
       "name": "ragged-chest",
       "directions": 4
     },
+    {
+      "name": "ragged-groin",
+      "directions": 4
+    },
     {
       "name": "ragged-rightarm",
       "directions": 4
@@ -231,6 +267,10 @@
       "name": "reddish-chest",
       "directions": 4
     },
+    {
+      "name": "reddish-groin",
+      "directions": 4
+    },
     {
       "name": "reddish-rightarm",
       "directions": 4
@@ -255,6 +295,10 @@
       "name": "royal-chest",
       "directions": 4
     },
+    {
+      "name": "royal-groin",
+      "directions": 4
+    },
     {
       "name": "royal-rightarm",
       "directions": 4
@@ -279,6 +323,10 @@
       "name": "whitefly-chest",
       "directions": 4
     },
+    {
+      "name": "whitefly-groin",
+      "directions": 4
+    },
     {
       "name": "whitefly-rightarm",
       "directions": 4
@@ -303,6 +351,10 @@
       "name": "witchking-chest",
       "directions": 4
     },
+    {
+      "name": "witchking-groin",
+      "directions": 4
+    },
     {
       "name": "witchking-rightarm",
       "directions": 4
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/moonfly-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/moonfly-chest.png
index cf206356084..e003936d261 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/moonfly-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/moonfly-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/moonfly-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/moonfly-groin.png
new file mode 100644
index 00000000000..29b31cef6cf
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/moonfly-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/oakworm-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/oakworm-chest.png
index ebf241b3771..793c3639cfb 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/oakworm-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/oakworm-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/oakworm-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/oakworm-groin.png
new file mode 100644
index 00000000000..178fa2c2f3f
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/oakworm-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/poison-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/poison-chest.png
index d2a2170199d..f877a75d6c0 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/poison-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/poison-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/poison-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/poison-groin.png
new file mode 100644
index 00000000000..dad32a76a7d
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/poison-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/ragged-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/ragged-chest.png
index 583a3897ddb..b1407d1515e 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/ragged-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/ragged-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/ragged-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/ragged-groin.png
new file mode 100644
index 00000000000..d0921731131
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/ragged-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/reddish-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/reddish-chest.png
index f5908659b2f..ecbc26c4fe6 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/reddish-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/reddish-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/reddish-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/reddish-groin.png
new file mode 100644
index 00000000000..c76ff8a404a
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/reddish-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/royal-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/royal-chest.png
index 9db94180a65..a1d725442ae 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/royal-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/royal-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/royal-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/royal-groin.png
new file mode 100644
index 00000000000..6286353a569
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/royal-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/whitefly-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/whitefly-chest.png
index ef61107b2d4..b721e3d7bfd 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/whitefly-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/whitefly-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/whitefly-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/whitefly-groin.png
new file mode 100644
index 00000000000..934a01b1a0e
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/whitefly-groin.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/witchking-chest.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/witchking-chest.png
index 3fb15409d02..152aab278b8 100644
Binary files a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/witchking-chest.png and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/witchking-chest.png differ
diff --git a/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/witchking-groin.png b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/witchking-groin.png
new file mode 100644
index 00000000000..e41d628d590
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Mobs/Customization/Moth/moth_markings.rsi/witchking-groin.png differ
diff --git a/Resources/Textures/Shaders/color_tint.swsl b/Resources/Textures/Shaders/color_tint.swsl
index a5449b2d4d6..f95011cefab 100644
--- a/Resources/Textures/Shaders/color_tint.swsl
+++ b/Resources/Textures/Shaders/color_tint.swsl
@@ -53,4 +53,4 @@ void fragment() {
     color.rgb = mix(color.rgb, rgbColorMod, tint_amount);
 
     COLOR = color;
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png
deleted file mode 100644
index aadf88fe906..00000000000
Binary files a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png and /dev/null differ
diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots_chest.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots_chest.png
new file mode 100644
index 00000000000..14cefeaab2c
Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots_chest.png differ
diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots_groin.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots_groin.png
new file mode 100644
index 00000000000..2ec0fe088fa
Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots_groin.png differ
diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json
index d965e86b741..78c4ceee8ad 100644
--- a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json
+++ b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "cheek_barbels, eyebrow_barbels, underbelly_face, underbelly_torso, carp_spots by kushbreth (github).",
+    "copyright": "cheek_barbels, eyebrow_barbels, underbelly_face, underbelly_torso, carp_spots by kushbreth (github). The division of the torso into chest and groin was done by Sparison.",
     "size": {
         "x": 32,
         "y": 32
@@ -20,11 +20,19 @@
             "directions": 4
         },
         {
-            "name": "underbelly_torso",
+            "name": "underbelly_chest",
             "directions": 4
         },
         {
-            "name": "carp_spots",
+            "name": "underbelly_groin",
+            "directions": 4
+        },
+        {
+            "name": "carp_spots_chest",
+            "directions": 4
+        },
+        {
+            "name": "carp_spots_groin",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_chest.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_chest.png
new file mode 100644
index 00000000000..a2474a0a875
Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_chest.png differ
diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_groin.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_groin.png
new file mode 100644
index 00000000000..3609430dd36
Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_groin.png differ
diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png
deleted file mode 100644
index 14d66a043b7..00000000000
Binary files a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_chest.png b/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_chest.png
new file mode 100644
index 00000000000..16419bd2a43
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_chest.png differ
diff --git a/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_groin.png b/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_groin.png
new file mode 100644
index 00000000000..478128878a8
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_groin.png differ
diff --git a/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_torso.png b/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_torso.png
deleted file mode 100644
index 569056bfb93..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/abomination_torso.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/meta.json
index 37253f37a5b..6571f752d83 100644
--- a/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/meta.json
+++ b/Resources/Textures/_EE/Mobs/Customization/Shadow/abomination_torso.rsi/meta.json
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "copyright": "Drawn by Luminal",
+    "copyright": "Drawn by Luminal. The division of the torso into chest and groin was done by Sparison.",
     "license": "CC-BY-SA-3.0",
     "size": {
         "x": 32,
@@ -8,7 +8,11 @@
     },
     "states": [
         {
-            "name": "abomination_torso",
+            "name": "abomination_chest",
+            "directions": 4
+        },
+        {
+            "name": "abomination_groin",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/chest.png b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/chest.png
new file mode 100644
index 00000000000..d4781d693c9
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/chest.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/groin.png b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/groin.png
new file mode 100644
index 00000000000..9c77d171de8
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/groin.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/head_f.png b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/head_f.png
rename to Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/head.png
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/head_m.png b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/head_m.png
deleted file mode 100644
index 51fd702c018..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/meta.json b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/meta.json
index 3a6c008a575..f493c241bc6 100644
--- a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/meta.json
+++ b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/meta.json
@@ -2,15 +2,10 @@
     "version": 1,
     "size": { "x": 32, "y": 32 },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/commit/ff85aaa11a953e24728f76205b279cfcd531df0e",
+    "copyright": "https://github.com/tgstation/tgstation/commit/ff85aaa11a953e24728f76205b279cfcd531df0e. Chest and Groin by WWDP",
     "states": [
         {
-            "name": "head_f",
-            "directions": 4,
-            "delays": [[1.0], [1.0], [1.0], [1.0]]
-        },
-        {
-            "name": "head_m",
+            "name": "head",
             "directions": 4,
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         },
@@ -55,12 +50,12 @@
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         },
         {
-            "name": "torso_f",
+            "name": "chest",
             "directions": 4,
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         },
         {
-            "name": "torso_m",
+            "name": "groin",
             "directions": 4,
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         }
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/torso_f.png b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/torso_f.png
deleted file mode 100644
index ab1032d711e..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/torso_m.png b/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/torso_m.png
deleted file mode 100644
index ab1032d711e..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Shadow/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/chest.png b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/chest.png
new file mode 100644
index 00000000000..696db078414
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/chest.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/groin.png b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/groin.png
new file mode 100644
index 00000000000..0f556d67025
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/groin.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/head_f.png b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/head_f.png
rename to Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/head.png
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/head_m.png b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/head_m.png
deleted file mode 100644
index db8e4447281..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/meta.json b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/meta.json
index ad73ea7e92b..8b1a7b1df80 100644
--- a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/meta.json
+++ b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/meta.json
@@ -5,15 +5,10 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/commit/c9338f72126114446dfbff206b458b92a324fbe3",
+    "copyright": "https://github.com/tgstation/tgstation/commit/c9338f72126114446dfbff206b458b92a324fbe3. Chest and Groin by WWDP",
     "states": [
         {
-            "name": "head_f",
-            "directions": 4,
-            "delays": [[1.0], [1.0], [1.0], [1.0]]
-        },
-        {
-            "name": "head_m",
+            "name": "head",
             "directions": 4,
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         },
@@ -58,12 +53,12 @@
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         },
         {
-            "name": "torso_f",
+            "name": "chest",
             "directions": 4,
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         },
         {
-            "name": "torso_m",
+            "name": "groin",
             "directions": 4,
             "delays": [[1.0], [1.0], [1.0], [1.0]]
         }
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/torso_f.png b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/torso_f.png
deleted file mode 100644
index bf279e6c5be..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/torso_m.png b/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/torso_m.png
deleted file mode 100644
index bf279e6c5be..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Shadowling/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/chest.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/chest.png
new file mode 100644
index 00000000000..4a1951bd54c
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/chest.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/chest_female.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..3daa3f2c54d
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/groin.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/groin.png
new file mode 100644
index 00000000000..b8f69e86a95
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/groin.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/groin_female.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..3fc2326f19a
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head_m.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head_m.png
rename to Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head.png
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head_f.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head_f.png
rename to Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/head_female.png
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/meta.json b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/meta.json
index 13e804ad544..15e70007923 100644
--- a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/meta.json
+++ b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/meta.json
@@ -1,18 +1,18 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Creator was not supplied, oldest reference tracked to Cael Aislinn in commit https://github.com/ParadiseSS13/Paradise/commit/9e4539fdce01f00ed7e47ca1174a1470ac5fe77c. Small changes made by SX-7. Names are as provided, sans torso_f front which is a combined version of modified torso_m front, and modified torso_f",
+    "copyright": "Creator was not supplied, oldest reference tracked to Cael Aislinn in commit https://github.com/ParadiseSS13/Paradise/commit/9e4539fdce01f00ed7e47ca1174a1470ac5fe77c. Small changes made by SX-7. Names are as provided, sans torso_f front which is a combined version of modified torso_m front, and modified torso_f. Changed by WWDP",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "head_f",
+            "name": "head",
             "directions": 4
         },
         {
-            "name": "head_m",
+            "name": "head_female",
             "directions": 4
         },
         {
@@ -48,11 +48,19 @@
             "directions": 4
         },
         {
-            "name": "torso_f",
+            "name": "chest",
             "directions": 4
         },
         {
-            "name": "torso_m",
+            "name": "chest_female",
+            "directions": 4
+        },
+        {
+            "name": "groin",
+            "directions": 4
+        },
+        {
+            "name": "groin_female",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/torso_f.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/torso_f.png
deleted file mode 100644
index c18fc1458ce..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/torso_m.png b/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/torso_m.png
deleted file mode 100644
index f5650c6f527..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/chest.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/chest.png
new file mode 100644
index 00000000000..55ff13ab88a
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/chest.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/groin.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/groin.png
new file mode 100644
index 00000000000..472b014c52e
Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/groin.png differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_f.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_f.png
rename to Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head.png
diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_m.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_m.png
deleted file mode 100644
index 0b25058887f..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/head_m.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/meta.json b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/meta.json
index bc0a4e93b3d..581d0f2ed85 100644
--- a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/meta.json
+++ b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi",
+    "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi. Changed by WWDP",
     "size": {
         "x": 32,
         "y": 32
@@ -11,11 +11,7 @@
             "name": "full"
         },
         {
-            "name": "head_f",
-            "directions": 4
-        },
-        {
-            "name": "head_m",
+            "name": "head",
             "directions": 4
         },
         {
@@ -51,11 +47,11 @@
             "directions": 4
         },
         {
-            "name": "torso_f",
+            "name": "chest",
             "directions": 4
         },
         {
-            "name": "torso_m",
+            "name": "groin",
             "directions": 4
         },
         {
diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_f.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_f.png
deleted file mode 100644
index 001b5ce85e9..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_m.png b/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_m.png
deleted file mode 100644
index 001b5ce85e9..00000000000
Binary files a/Resources/Textures/_EE/Mobs/Species/Xelthia/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble.png
deleted file mode 100644
index c4e4d11c0a0..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble_chest.png
new file mode 100644
index 00000000000..4158236d7aa
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble_groin.png
new file mode 100644
index 00000000000..da986fcbd28
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/bubble_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly.png
deleted file mode 100644
index 5b064936760..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly_chest.png
new file mode 100644
index 00000000000..fe4f5884df5
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly_groin.png
new file mode 100644
index 00000000000..d64f28d3aba
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionafirefly_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph.png
deleted file mode 100644
index 5bfa35053af..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph_chest.png
new file mode 100644
index 00000000000..9031f9609bb
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph_groin.png
new file mode 100644
index 00000000000..f08797b7ed1
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/dionalivingnymph_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1.png
deleted file mode 100644
index 32b70406fe4..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1_chest.png
new file mode 100644
index 00000000000..ff114dec951
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1_groin.png
new file mode 100644
index 00000000000..b3091d8915d
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl1_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2.png
deleted file mode 100644
index 210a9193bb4..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2_chest.png
new file mode 100644
index 00000000000..928129192d1
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2_groin.png
new file mode 100644
index 00000000000..159160b4a99
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/fishbowl2_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json
index a8258a53aea..76a4e6707a7 100644
--- a/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json
+++ b/Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Drawn and coded by Carousel for Impstation",
+    "copyright": "Drawn and coded by Carousel for Impstation. The division of the torso into chest and groin was done by Sparison.",
     "size": {
       "x": 32,
       "y": 32
@@ -34,7 +34,7 @@
         ]
       },
       {
-        "name": "bubble",
+        "name": "bubble_chest",
         "directions": 4,
         "delays": [
           [
@@ -64,7 +64,37 @@
         ]
       },
       {
-        "name": "fishbowl1",
+        "name": "bubble_groin",
+        "directions": 4,
+        "delays": [
+          [
+            0.4,
+            0.4,
+            0.4,
+            0.4
+          ],
+          [
+            0.4,
+            0.4,
+            0.4,
+            0.4
+          ],
+          [
+            0.4,
+            0.4,
+            0.4,
+            0.4
+          ],
+          [
+            0.4,
+            0.4,
+            0.4,
+            0.4
+          ]
+        ]
+      },
+      {
+        "name": "fishbowl1_chest",
         "directions": 4,
         "delays": [
           [
@@ -98,7 +128,7 @@
         ]
       },
       {
-        "name": "fishbowl2",
+        "name": "fishbowl1_groin",
         "directions": 4,
         "delays": [
           [
@@ -132,7 +162,113 @@
         ]
       },
       {
-        "name": "dionalivingnymph",
+        "name": "fishbowl2_chest",
+        "directions": 4,
+        "delays": [
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ],
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ],
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ],
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ]
+        ]
+      },
+      {
+        "name": "fishbowl2_groin",
+        "directions": 4,
+        "delays": [
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ],
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ],
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ],
+          [
+            0.4,
+            0.3,
+            0.2,
+            0.3,
+            0.4
+          ]
+        ]
+      },
+      {
+        "name": "dionalivingnymph_chest",
+        "directions": 4,
+        "delays": [
+          [
+            0.6,
+            0.2,
+            0.2,
+            0.2,
+            0.4,
+            0.3
+          ],
+          [
+            0.6,
+            0.2,
+            0.2,
+            0.2,
+            0.4,
+            0.3
+          ],
+          [
+            0.6,
+            0.2,
+            0.2,
+            0.2,
+            0.4,
+            0.3
+          ],
+          [
+            0.6,
+            0.2,
+            0.2,
+            0.2,
+            0.4,
+            0.3
+          ]
+        ]
+      },
+      {
+        "name": "dionalivingnymph_groin",
         "directions": 4,
         "delays": [
           [
@@ -216,7 +352,45 @@
         ]
       },
       {
-        "name": "dionafirefly",
+        "name": "dionafirefly_chest",
+        "directions": 4,
+        "delays": [
+          [
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3
+          ],
+          [
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3
+          ],
+          [
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3
+          ],
+          [
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3,
+            0.3
+          ]
+        ]
+      },
+      {
+        "name": "dionafirefly_groin",
         "directions": 4,
         "delays": [
           [
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_body_primary_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_body_primary_colorable.png
deleted file mode 100644
index 11242d5f456..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_body_primary_colorable.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_body_secondary_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_body_secondary_colorable.png
deleted file mode 100644
index 23373b37e64..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_body_secondary_colorable.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_chest_primary_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_chest_primary_colorable.png
new file mode 100644
index 00000000000..570f32f0ae8
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_chest_primary_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_chest_secondary_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_chest_secondary_colorable.png
new file mode 100644
index 00000000000..15f95f9ee7f
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_chest_secondary_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_groin_primary_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_groin_primary_colorable.png
new file mode 100644
index 00000000000..231548a9e38
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_groin_primary_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_groin_secondary_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_groin_secondary_colorable.png
new file mode 100644
index 00000000000..2e2cc1ff797
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/flowers_groin_secondary_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/leaf_cover_chest_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/leaf_cover_chest_colorable.png
new file mode 100644
index 00000000000..e2c5cb4026a
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/leaf_cover_chest_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/leaf_cover_groin_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/leaf_cover_groin_colorable.png
new file mode 100644
index 00000000000..a5ebeb55c70
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/leaf_cover_groin_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/meta.json
index 1ad168c5883..0f37bd3f392 100644
--- a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/meta.json
+++ b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/meta.json
@@ -1,18 +1,26 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "flowers_body, flowers_head, leaf_cover, thorns_body, thorns_head from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe, modified by EmoGarbage and other from https://github.com/TauCetiStation/TauCetiClassic/blob/a8c097fd0e749dcd6f66f05cf5325e51f6b081dd/icons/mob/human_face.dmi, modified by Doop",
+  "copyright": "flowers_body, flowers_head, leaf_cover, thorns_body, thorns_head from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/commit/38051f45d3b26bd31f6e292239f43adb36ff01fe, modified by EmoGarbage and other from https://github.com/TauCetiStation/TauCetiClassic/blob/a8c097fd0e749dcd6f66f05cf5325e51f6b081dd/icons/mob/human_face.dmi, modified by Doop. The division of the torso into chest and groin was done by Sparison.",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "flowers_body_primary_colorable",
+      "name": "flowers_chest_primary_colorable",
       "directions": 4
     },
     {
-      "name": "flowers_body_secondary_colorable",
+      "name": "flowers_groin_primary_colorable",
+      "directions": 4
+    },
+    {
+      "name": "flowers_chest_secondary_colorable",
+      "directions": 4
+    },
+    {
+      "name": "flowers_groin_secondary_colorable",
       "directions": 4
     },
     {
@@ -24,11 +32,19 @@
       "directions": 4
     },
     {
-      "name": "leaf_cover_colorable",
+      "name": "leaf_cover_chest_colorable",
+      "directions": 4
+    },
+    {
+      "name": "leaf_cover_groin_colorable",
+      "directions": 4
+    },
+    {
+      "name": "thorns_chest_colorable",
       "directions": 4
     },
     {
-      "name": "thorns_body_colorable",
+      "name": "thorns_groin_colorable",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_body_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_body_colorable.png
deleted file mode 100644
index 5eef7f4a7a9..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_body_colorable.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_chest_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_chest_colorable.png
new file mode 100644
index 00000000000..7dc0d222e1d
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_chest_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_groin_colorable.png b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_groin_colorable.png
new file mode 100644
index 00000000000..1b158011145
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/diona.rsi/thorns_groin_colorable.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/dionamoss_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/dionamoss_chest.png
new file mode 100644
index 00000000000..6fcca7d555d
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/dionamoss_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/dionamoss_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/dionamoss_groin.png
new file mode 100644
index 00000000000..aedf4322364
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi/dionamoss_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1.png
deleted file mode 100644
index a89b8f14589..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1_chest.png
new file mode 100644
index 00000000000..30973c86bfc
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1_groin.png
new file mode 100644
index 00000000000..797df618ca6
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/abdomenbasic1_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/meta.json
index 09cd3e9ec43..f5a59204ccc 100644
--- a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/meta.json
+++ b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "sprites by carousel for impstation",
+  "copyright": "sprites by carousel for impstation. The division of the torso into chest and groin was done by Sparison",
 
   "size": {
     "x": 32,
@@ -29,7 +29,11 @@
       "directions": 4
     },
     {
-      "name": "abdomenbasic1",
+      "name": "abdomenbasic1_chest",
+      "directions": 4
+    },
+    {
+      "name": "abdomenbasic1_groin",
       "directions": 4
     },
     {
@@ -89,7 +93,11 @@
       "directions": 4
     },
     {
-      "name": "widow1",
+      "name": "widow1_chest",
+      "directions": 4
+    },
+    {
+      "name": "widow1_groin",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1.png
deleted file mode 100644
index 4e658c9ba24..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1_chest.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1_chest.png
new file mode 100644
index 00000000000..d452149a502
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1_chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1_groin.png b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1_groin.png
new file mode 100644
index 00000000000..84bb6a5f22f
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Customization/markingsbundle2.rsi/widow1_groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/chest.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/chest.png
new file mode 100644
index 00000000000..9d36a6c5521
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/chest.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/chest_female.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/chest_female.png
new file mode 100644
index 00000000000..d37c323c584
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/chest_female.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/groin.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/groin.png
new file mode 100644
index 00000000000..610343cef72
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/groin.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/groin_female.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/groin_female.png
new file mode 100644
index 00000000000..af15e2fe0d8
Binary files /dev/null and b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/groin_female.png differ
diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json
index 45bc565f8aa..401e01fc12e 100644
--- a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json
+++ b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Art by Widgetbeck",
+    "copyright": "Art by Widgetbeck. Changed by WWDP",
     "size": {
         "x": 32,
         "y": 32
@@ -47,11 +47,19 @@
             "directions": 4
         },
         {
-            "name": "torso_m",
+            "name": "chest",
             "directions": 4
         },
         {
-            "name": "torso_f",
+            "name": "chest_female",
+            "directions": 4
+        },
+        {
+            "name": "groin",
+            "directions": 4
+        },
+        {
+            "name": "groin_female",
             "directions": 4
         },
         {
diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_f.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_f.png
deleted file mode 100644
index ac55287b975..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_m.png b/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_m.png
deleted file mode 100644
index 8f485e0f9c4..00000000000
Binary files a/Resources/Textures/_Impstation/Mobs/Species/Thaven/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/equipped-BACKPACK.png b/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 3a87d34c79b..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/icon.png b/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/icon.png
deleted file mode 100644
index 4a9e4b5bcf3..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/inhand-left.png
deleted file mode 100644
index a6f35ee9b27..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/inhand-right.png
deleted file mode 100644
index 23741a49050..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/meta.json
deleted file mode 100644
index ea6f207f3ab..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/Back/Backpacks/abductor.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by gabova, modified for goobstation by LuciferMkshelter",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/equipped-BACKPACK.png b/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/equipped-BACKPACK.png
deleted file mode 100644
index f581c4466f1..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/icon.png b/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/icon.png
deleted file mode 100644
index d0624cb256c..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/inhand-left.png
deleted file mode 100644
index ceeab5463d5..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/inhand-right.png
deleted file mode 100644
index 1d9a614b165..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/meta.json
deleted file mode 100644
index fce8c90ce86..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/Back/Duffels/abductor.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/equipped-BELT.png b/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/equipped-BELT.png
deleted file mode 100644
index 11943a5f1ec..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/icon.png b/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/icon.png
deleted file mode 100644
index 6ff630277a9..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/inhand-left.png
deleted file mode 100644
index 680ef7b80d6..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/inhand-right.png
deleted file mode 100644
index 93d18816407..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/meta.json
deleted file mode 100644
index 4b328a42419..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/Belt/abductor.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Paradise Station",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/alt-equipped-EARS.png b/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/alt-equipped-EARS.png
deleted file mode 100644
index a910737357f..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/alt-equipped-EARS.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/icon_alt.png b/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/icon_alt.png
deleted file mode 100644
index cfef3f9aa73..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/icon_alt.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/meta.json
deleted file mode 100644
index a36cd58203e..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/Ears/Headsets/abductor.rsi/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon_alt"
-    },
-    {
-      "name": "alt-equipped-EARS",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/equipped-HELMET.png b/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/equipped-HELMET.png
deleted file mode 100644
index 86c8a825611..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/icon.png b/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/icon.png
deleted file mode 100644
index d9231368fa8..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/inhand-left.png
deleted file mode 100644
index 7f65cf04ce4..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/inhand-right.png
deleted file mode 100644
index 09ad234b0d7..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/meta.json
deleted file mode 100644
index c854d626bb0..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/Head/Helmets/abductor.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/combat-equipped-OUTERCLOTHING.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/combat-equipped-OUTERCLOTHING.png
deleted file mode 100644
index 734d4b1821d..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/combat-equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/combat-icon.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/combat-icon.png
deleted file mode 100644
index 5f0065ebd72..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/combat-icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index d635b546615..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/icon.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/icon.png
deleted file mode 100644
index acc306f3080..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/inhand-left.png
deleted file mode 100644
index a63891365cb..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/inhand-right.png
deleted file mode 100644
index 67abf95f498..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/meta.json
deleted file mode 100644
index dd7e931493a..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Armor/abductor.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from ParadiseStation, inhand sprites by LuciferMkshelter",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-OUTERCLOTHING",
-            "directions": 4
-        },
-        {
-            "name": "combat-icon"
-        },
-        {
-            "name": "combat-equipped-OUTERCLOTHING",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index ebf6f00d5b9..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/icon.png b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/icon.png
deleted file mode 100644
index 0276b3769a9..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/meta.json
deleted file mode 100644
index 6bebf8457cd..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/OuterClothing/Coats/abductor.rsi/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, modified by LuciferMkshelter",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/equipped-INNERCLOTHING.png
deleted file mode 100644
index 0574cccf7f0..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/icon.png b/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/icon.png
deleted file mode 100644
index 0f7c2076e3e..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/inhand-left.png
deleted file mode 100644
index 92524a42e76..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/inhand-right.png
deleted file mode 100644
index 49919599a1f..00000000000
Binary files a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/meta.json
deleted file mode 100644
index dc799daf87e..00000000000
--- a/Resources/Textures/_Shitmed/Clothing/Uniforms/Jumpsuit/abductor.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-INNERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Effects/teleportation.rsi/meta.json b/Resources/Textures/_Shitmed/Effects/teleportation.rsi/meta.json
deleted file mode 100644
index 81b13694c6e..00000000000
--- a/Resources/Textures/_Shitmed/Effects/teleportation.rsi/meta.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-NC-SA-3.0",
-	"copyright": "BDragon1727; from https://bdragon1727.itch.io/free-smoke-fx-pixel-2",
-	"size": {
-		"x": 64,
-		"y": 64
-	},
-	"states": [
-		{
-			"name": "teleportation",
-            "delays": [
-              [
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1
-              ]
-            ]
-		},
-    {
-			"name": "teleportation-entity",
-            "delays": [
-              [
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1
-              ]
-            ]
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Effects/teleportation.rsi/teleportation-entity.png b/Resources/Textures/_Shitmed/Effects/teleportation.rsi/teleportation-entity.png
deleted file mode 100644
index 4556c21f63b..00000000000
Binary files a/Resources/Textures/_Shitmed/Effects/teleportation.rsi/teleportation-entity.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Effects/teleportation.rsi/teleportation.png b/Resources/Textures/_Shitmed/Effects/teleportation.rsi/teleportation.png
deleted file mode 100644
index d22f4dd84ba..00000000000
Binary files a/Resources/Textures/_Shitmed/Effects/teleportation.rsi/teleportation.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/empty.png b/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/empty.png
deleted file mode 100644
index e48d9d4a403..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/empty.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/exit.png b/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/exit.png
deleted file mode 100644
index 9e5dbd58567..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/exit.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/implant.png b/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/implant.png
deleted file mode 100644
index 8d94cd1740c..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/implant.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/meta.json
deleted file mode 100644
index 45b91eef359..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/meta.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from tgstation, redrawn by darkrell",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "empty"
-		},
-		{
-			"name": "exit"
-		},
-		{
-			"name": "send"
-		},
-		{
-			"name": "take"
-		},
-		{
-			"name": "implant"
-		},
-		{
-			"name": "send-yourself"
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/send-yourself.png b/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/send-yourself.png
deleted file mode 100644
index 254b17a2f2f..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/send-yourself.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/send.png b/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/send.png
deleted file mode 100644
index bdf278665e2..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/send.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/take.png b/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/take.png
deleted file mode 100644
index dfd123e030a..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Actions/actions_abductor.rsi/take.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/eyes.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/eyes.png
deleted file mode 100644
index 8cf9fa9e191..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/eyes.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/eyes_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/eyes_hover.png
deleted file mode 100644
index 72a30d73b84..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/eyes_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/groin.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/groin.png
deleted file mode 100644
index 2c1a3debdaa..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/groin.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/groin_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/groin_hover.png
deleted file mode 100644
index 313b6a1124c..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/groin_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/head.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/head.png
deleted file mode 100644
index 9c645d2353c..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/head_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/head_hover.png
deleted file mode 100644
index 3c03f2aebe1..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/head_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftarm.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftarm.png
deleted file mode 100644
index 32661f5c6a1..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftarm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftarm_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftarm_hover.png
deleted file mode 100644
index a9b2c960cec..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftarm_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot.png
deleted file mode 100644
index 07da8e67b75..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot_hover.png
deleted file mode 100644
index 2c9f9e38df4..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftfoot_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/lefthand.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/lefthand.png
deleted file mode 100644
index a0251efb2c6..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/lefthand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/lefthand_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/lefthand_hover.png
deleted file mode 100644
index 3ff52eae555..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/lefthand_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftleg.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftleg.png
deleted file mode 100644
index 99dc24ce62e..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftleg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftleg_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftleg_hover.png
deleted file mode 100644
index f2c2979e418..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/leftleg_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/mouth.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/mouth.png
deleted file mode 100644
index 202f411874e..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/mouth.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/mouth_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/mouth_hover.png
deleted file mode 100644
index a5014f42ca3..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/mouth_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightarm.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightarm.png
deleted file mode 100644
index 223afaacad0..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightarm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightarm_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightarm_hover.png
deleted file mode 100644
index 7121c80830d..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightarm_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot.png
deleted file mode 100644
index d1c687c6815..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot_hover.png
deleted file mode 100644
index 60897a28805..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightfoot_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/righthand.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/righthand.png
deleted file mode 100644
index e71f8de80ed..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/righthand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/righthand_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/righthand_hover.png
deleted file mode 100644
index d51910da173..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/righthand_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightleg.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightleg.png
deleted file mode 100644
index 5f7b6836105..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightleg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightleg_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightleg_hover.png
deleted file mode 100644
index b0936de0a09..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/rightleg_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/torso.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/torso.png
deleted file mode 100644
index 44297c96c32..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/torso.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/torso_hover.png b/Resources/Textures/_Shitmed/Interface/Targeting/Doll/torso_hover.png
deleted file mode 100644
index 70f5e5969c0..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Doll/torso_hover.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_7.png
deleted file mode 100644
index 0bb632ba388..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_8.png
deleted file mode 100644
index c23961f396b..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/meta.json
deleted file mode 100644
index 6acd4a2c24b..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/head.rsi/head_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_7.png
deleted file mode 100644
index 74b58c642bb..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_8.png
deleted file mode 100644
index 4d024c61f7f..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/meta.json
deleted file mode 100644
index 2c34f86c28e..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png
deleted file mode 100644
index efc7380c270..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png
deleted file mode 100644
index a00a6b1822e..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/meta.json
deleted file mode 100644
index dab3ed611da..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png
deleted file mode 100644
index 9822dfba4cb..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png
deleted file mode 100644
index bdaec2557cb..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/meta.json
deleted file mode 100644
index 9396f537f80..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png
deleted file mode 100644
index 7d2ed496616..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png
deleted file mode 100644
index 2b33680d438..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/meta.json
deleted file mode 100644
index f7d5a595258..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png
deleted file mode 100644
index d36a43c441d..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png
deleted file mode 100644
index 75bd581d69b..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/meta.json
deleted file mode 100644
index 887c60f37cc..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/rightarm.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/meta.json
deleted file mode 100644
index eb19b5d4c47..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png
deleted file mode 100644
index 35eec2905a5..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png
deleted file mode 100644
index 9f894b1bfb3..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/meta.json
deleted file mode 100644
index ce1b1f37e7b..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png
deleted file mode 100644
index ebc654d70e9..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png
deleted file mode 100644
index 06ab1d2519d..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/meta.json
deleted file mode 100644
index 61c5b77862c..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_7.png
deleted file mode 100644
index 87e8f18ef82..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_8.png
deleted file mode 100644
index 797e0683e8b..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/meta.json
deleted file mode 100644
index 7dded85e45f..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png
deleted file mode 100644
index 9c4ee1f9038..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png
deleted file mode 100644
index 70ccb309add..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/meta.json b/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/meta.json
deleted file mode 100644
index 7baeebd0801..00000000000
--- a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/meta.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_7.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_7.png
deleted file mode 100644
index c289a454bdb..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_8.png b/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_8.png
deleted file mode 100644
index eefec17cf60..00000000000
Binary files a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_8.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
deleted file mode 100644
index cdecf550def..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from and modified by deltanedas (github) for GoobStation",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "tail"
-        },
-        {
-            "name": "torso"
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png
deleted file mode 100644
index bb0b9458102..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png
deleted file mode 100644
index ab0f5ff82f0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain-inhand-left.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain-inhand-left.png
deleted file mode 100644
index 1afdd259fa2..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain-inhand-right.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain-inhand-right.png
deleted file mode 100644
index 166e898468c..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain.png
deleted file mode 100644
index 3fd5c73551f..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/brain.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/ears.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/ears.png
deleted file mode 100644
index 090a6bb132e..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/ears.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/eyeballs.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/eyeballs.png
deleted file mode 100644
index 0938381ab20..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/eyeballs.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/heart-off.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/heart-off.png
deleted file mode 100644
index d3255454541..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/heart-off.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/heart-on.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/heart-on.png
deleted file mode 100644
index 218bffa9374..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/heart-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/kidney-l.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/kidney-l.png
deleted file mode 100644
index 8b3ca6a8150..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/kidney-l.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/kidney-r.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/kidney-r.png
deleted file mode 100644
index eb7d0c2ec89..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/kidney-r.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/liver.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/liver.png
deleted file mode 100644
index c733759604b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/liver.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/lung-l.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/lung-l.png
deleted file mode 100644
index 01583e96d83..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/lung-l.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/lung-r.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/lung-r.png
deleted file mode 100644
index 45c1dd001b6..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/lung-r.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/meta.json
deleted file mode 100644
index aa9781c5d33..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/meta.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Darkrell - 🌟Starlight🌟",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "brain"
-    },
-    {
-      "name": "brain-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "brain-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "ears"
-    },
-    {
-      "name": "eyeballs"
-    },
-    {
-      "name": "heart-off"
-    },
-    {
-      "name": "heart-on",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "kidney-l"
-    },
-    {
-      "name": "kidney-r"
-    },
-    {
-      "name": "liver"
-    },
-    {
-      "name": "lung-l"
-    },
-    {
-      "name": "lung-r"
-    },
-    {
-      "name": "stomach"
-    },
-    {
-      "name": "muscle"
-    },
-    {
-      "name": "nerve"
-    },
-    {
-      "name": "vessel"
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/muscle.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/muscle.png
deleted file mode 100644
index 8482dc7fe3b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/muscle.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/nerve.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/nerve.png
deleted file mode 100644
index c723e8db51d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/nerve.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/stomach.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/stomach.png
deleted file mode 100644
index b2ef803febb..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/stomach.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/vessel.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/vessel.png
deleted file mode 100644
index 93ed2263e71..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/organs.rsi/vessel.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/full.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/full.png
deleted file mode 100644
index f600e1c301d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/head.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/head.png
deleted file mode 100644
index dd234ddc192..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/head.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_arm.png
deleted file mode 100644
index a90b02ff719..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_foot.png
deleted file mode 100644
index 482b172b291..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_hand.png
deleted file mode 100644
index 4e029eb15e1..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_leg.png
deleted file mode 100644
index 53c91e5d124..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/l_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/meta.json
deleted file mode 100644
index 37b45bc6c74..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/meta.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "copyright": "Taked From Paradise Station",
-  "license": "CC-BY-SA-3.0",
-  "states": [
-    {
-      "name": "full"
-    },
-    {
-      "name": "head",
-      "directions": 4
-    },
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "l_foot",
-      "directions": 4
-    },
-    {
-      "name": "l_hand",
-      "directions": 4
-    },
-    {
-      "name": "l_leg",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_foot",
-      "directions": 4
-    },
-    {
-      "name": "r_hand",
-      "directions": 4
-    },
-    {
-      "name": "r_leg",
-      "directions": 4
-    },
-    {
-      "name": "torso",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_arm.png
deleted file mode 100644
index 58e9c3115e5..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_foot.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_foot.png
deleted file mode 100644
index 3499e91fe40..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_foot.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_hand.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_hand.png
deleted file mode 100644
index 193f7e1a33a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_hand.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_leg.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_leg.png
deleted file mode 100644
index 3d6926e290a..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/r_leg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/torso.png b/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/torso.png
deleted file mode 100644
index 61954018b28..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Abductor/parts.rsi/torso.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/egg.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/egg.png
deleted file mode 100644
index 280f418b63b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/egg.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/emp.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/emp.png
deleted file mode 100644
index c157a533a23..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/emp.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/gland.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/gland.png
deleted file mode 100644
index 091b27a5800..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/gland.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/health.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/health.png
deleted file mode 100644
index 091b27a5800..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/health.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/meta.json
deleted file mode 100644
index 3013d7e3189..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/meta.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "egg"
-    },
-    {
-      "name": "emp"
-    },
-    {
-      "name": "gland"
-    },
-    {
-      "name": "health"
-    },
-    {
-      "name": "mindshock"
-    },
-    {
-      "name": "slime"
-    },
-    {
-      "name": "spider"
-    },
-    {
-      "name": "vent"
-    },
-    {
-      "name": "viral"
-    },
-    {
-      "name": "species"
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/mindshock.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/mindshock.png
deleted file mode 100644
index e04bb29967b..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/mindshock.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/slime.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/slime.png
deleted file mode 100644
index a766f7a452d..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/slime.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/species.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/species.png
deleted file mode 100644
index 5803b3840e7..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/species.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/spider.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/spider.png
deleted file mode 100644
index 4feb39496d5..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/spider.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/vent.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/vent.png
deleted file mode 100644
index cccaf14e0cf..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/vent.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/viral.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/viral.png
deleted file mode 100644
index 1266110afc5..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Dubious/organs.rsi/viral.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png
deleted file mode 100644
index d2838e8b7d4..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/l_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/meta.json
deleted file mode 100644
index 27215dfbca6..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Agoichi (823598558690934824)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "l_arm",
-      "directions": 4
-    },
-    {
-      "name": "r_arm",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png b/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png
deleted file mode 100644
index a85b505f90e..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Misc/Pizza/parts.rsi/r_arm.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-inhand-left.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-inhand-left.png
deleted file mode 100644
index 2e4fdc47c02..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-inhand-right.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-inhand-right.png
deleted file mode 100644
index 5b9eaa8bae0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-off.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-off.png
deleted file mode 100644
index 5116f6b54a7..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-off.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-on.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-on.png
deleted file mode 100644
index 650ad85bc92..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/heart-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/meta.json
deleted file mode 100644
index bfd6996bddb..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Space/Cobra/organs.rsi/meta.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by wyvernrer (337793232195026944)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-    "states": [
-        {
-            "name": "heart-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "heart-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "heart-off"
-        },
-        {
-            "name": "heart-on",
-            "delays": [
-                [
-                    0.6,
-                    0.1,
-                    0.1
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-inhand-left.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-inhand-left.png
deleted file mode 100644
index 0fb1681adc9..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-inhand-right.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-inhand-right.png
deleted file mode 100644
index 93f085a9c87..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-off.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-off.png
deleted file mode 100644
index 2024f29a919..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-off.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-on.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-on.png
deleted file mode 100644
index 652a9533a29..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/heart-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/meta.json
deleted file mode 100644
index bfd6996bddb..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Space/Goliath/organs.rsi/meta.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by wyvernrer (337793232195026944)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-    "states": [
-        {
-            "name": "heart-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "heart-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "heart-off"
-        },
-        {
-            "name": "heart-on",
-            "delays": [
-                [
-                    0.6,
-                    0.1,
-                    0.1
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeball-l.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeball-l.png
deleted file mode 100644
index 14e728707a9..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeball-l.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeball-r.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeball-r.png
deleted file mode 100644
index d18f4d45725..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeball-r.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeballs-inhand-left.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeballs-inhand-left.png
deleted file mode 100644
index d0187579a30..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeballs-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeballs-inhand-right.png b/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeballs-inhand-right.png
deleted file mode 100644
index 4dfafd118d0..00000000000
Binary files a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/eyeballs-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/meta.json b/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/meta.json
deleted file mode 100644
index a9447f20cda..00000000000
--- a/Resources/Textures/_Shitmed/Mobs/Species/Space/LaserRaptor/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by wyvernrer (337793232195026944)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-    "states": [
-        {
-            "name": "eyeballs-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "eyeballs-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "eyeball-l"
-        },
-        {
-            "name": "eyeball-r"
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/icon.png b/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/icon.png
deleted file mode 100644
index e085dfa617b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/inhand-left.png
deleted file mode 100644
index 03cb7baaf79..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/inhand-right.png
deleted file mode 100644
index 677f3fba372..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/meta.json
deleted file mode 100644
index 2a1676a5bc2..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Misc/gizmo.rsi/meta.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "copyright": "Taked From tg station, animated by darkrell",
-  "license": "CC-BY-SA-3.0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "directions": 1,
-      "delays": [
-        [
-          1.3,
-          0.1,
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/body-overlay-2.png b/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/body-overlay-2.png
deleted file mode 100644
index 340478f3db1..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/body-overlay-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/body-overlay-4.png b/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/body-overlay-4.png
deleted file mode 100644
index d540a663b83..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/body-overlay-4.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/equipped-BELT.png b/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/equipped-BELT.png
deleted file mode 100644
index 773e6c31e19..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/handcuff.png b/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/handcuff.png
deleted file mode 100644
index 0c903fb1add..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/handcuff.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/inhand-left.png
deleted file mode 100644
index 87e32514032..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/inhand-right.png
deleted file mode 100644
index 5398f722edd..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/meta.json
deleted file mode 100644
index d74cd96093e..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Misc/handcuffs.rsi/meta.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "darkrell",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "handcuff",
-      "directions": 1,
-      "delays": [
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-	  {
-      "name": "body-overlay-2",
-      "directions": 4,
-      "delays": [
-        [
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "body-overlay-4",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/crowbar.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/crowbar.rsi/abductor.png
deleted file mode 100644
index fd1dc741c40..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/crowbar.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/crowbar.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/crowbar.rsi/meta.json
deleted file mode 100644
index 827f937ffc6..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/crowbar.rsi/meta.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "abductor",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/abductor.png
deleted file mode 100644
index 17b4068ac85..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/meta.json
deleted file mode 100644
index dc1069cabec..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "abductor"
-    },
-    {
-      "name": "override-abductor"
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/override-abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/override-abductor.png
deleted file mode 100644
index ab0b32d1522..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/multitool.rsi/override-abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/screwdriver.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/screwdriver.rsi/abductor.png
deleted file mode 100644
index 194e737d73a..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/screwdriver.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/screwdriver.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/screwdriver.rsi/meta.json
deleted file mode 100644
index 70709ceecfa..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/screwdriver.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "abductor",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/icon.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/icon.png
deleted file mode 100644
index f52d7758625..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/inhand-left-flame.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/inhand-left-flame.png
deleted file mode 100644
index 2975c479be7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/inhand-left-flame.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/inhand-right-flame.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/inhand-right-flame.png
deleted file mode 100644
index 2975c479be7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/inhand-right-flame.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/meta.json
deleted file mode 100644
index 1e04e76c506..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/meta.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "welder_flame",
-      "delays": [
-        [
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left-flame",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-flame",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/welder_flame.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/welder_flame.png
deleted file mode 100644
index de3b96a5df3..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/welder.rsi/welder_flame.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wirecutters.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wirecutters.rsi/abductor.png
deleted file mode 100644
index 40f2e50b173..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wirecutters.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wirecutters.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wirecutters.rsi/meta.json
deleted file mode 100644
index 70b8e98ccac..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wirecutters.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "abductor"
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-equipped-BELT.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-equipped-BELT.png
deleted file mode 100644
index 1098786fe96..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-inhand-left.png
deleted file mode 100644
index de88d4cb2ae..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-inhand-right.png
deleted file mode 100644
index a9c34665f69..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor.png
deleted file mode 100644
index ffcfa99b3b5..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/meta.json
deleted file mode 100644
index 74db73ac8fc..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Abductor/wrench.rsi/meta.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "abductor",
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "abductor-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "abductor-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "abductor-equipped-BELT",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png
deleted file mode 100644
index 32e3da4497f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png
deleted file mode 100644
index 7df819a183e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/adv-retractor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json
deleted file mode 100644
index ef5ff42d00c..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "adv-retractor"
-		},
-		{
-      "name": "adv-retractor-on"
-		},
-		{
-			"name": "off-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "on-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "off-inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "on-inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/off-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/off-inhand-left.png
deleted file mode 100644
index 9a93d2bb5fc..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/off-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/off-inhand-right.png
deleted file mode 100644
index 6444d084235..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/on-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/on-inhand-left.png
deleted file mode 100644
index 4b706b9a7b7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/on-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/on-inhand-right.png
deleted file mode 100644
index 15edb16a789..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/adv-retractor.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/abductor.png
deleted file mode 100644
index 8409c74669e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png
deleted file mode 100644
index ac425d8014c..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/bone-gel.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png
deleted file mode 100644
index 2cd6321ee66..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png
deleted file mode 100644
index 549de0c4134..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json
deleted file mode 100644
index 8518d33c574..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bone-gel.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprite taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "bone-gel"
-		},
-		{
-			"name": "abductor"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor-inhand-left.png
deleted file mode 100644
index df08791434a..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor-inhand-right.png
deleted file mode 100644
index 5f3265a1bcd..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor.png
deleted file mode 100644
index 64a1b5cb912..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png
deleted file mode 100644
index 08b79677c86..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/bonesetter.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-left.png
deleted file mode 100644
index 5dbbacced17..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-right.png
deleted file mode 100644
index 3b9942e76d2..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json
deleted file mode 100644
index a8f8cf01edf..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/bonesetter.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprites taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "bonesetter"
-		},
-        {
-			"name": "abductor"
-		},
-        {
-			"name": "abductor-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "abductor-inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor-inhand-left.png
deleted file mode 100644
index cd9a4a32c38..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor-inhand-right.png
deleted file mode 100644
index 16465a51fe9..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor.png
deleted file mode 100644
index b46375b3750..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png
deleted file mode 100644
index f82e7f12a0b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png
deleted file mode 100644
index dcc6bd69467..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png
deleted file mode 100644
index 1c1cc9c4d80..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json
deleted file mode 100644
index 82f481838ed..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprites taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "cautery"
-		},
-		{
-			"name": "abductor",
-            "delays": [
-              [
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1
-              ]
-            ]
-		},
-        {
-            "name": "abductor-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "abductor-inhand-right",
-            "directions": 4
-        },
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/abductor.png
deleted file mode 100644
index 306f2e9bc61..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png
deleted file mode 100644
index 816095a7fc0..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/circular-saw.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png
deleted file mode 100644
index fb5a065550e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png
deleted file mode 100644
index c0e064d10b1..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json
deleted file mode 100644
index 3b5a4099bf4..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/circular-saw.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-    "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprites taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "circular-saw"
-		},
-        {
-            "name": "abductor"
-        },
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png
deleted file mode 100644
index 1119569bdd7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/drapes.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png
deleted file mode 100644
index 7531299f2a4..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png
deleted file mode 100644
index 57fea9b7e25..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json
deleted file mode 100644
index 9c30d1b15d5..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drapes.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "drapes"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor-inhand-left.png
deleted file mode 100644
index 1d6acaade9d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor-inhand-right.png
deleted file mode 100644
index 5d1dab26dc5..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor.png
deleted file mode 100644
index 04ef4fe562a..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/drill.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/drill.png
deleted file mode 100644
index 1f141fb217b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/drill.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png
deleted file mode 100644
index e2108b95a74..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png
deleted file mode 100644
index 991fbea280d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/meta.json
deleted file mode 100644
index c61ef0d2b3b..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/drill.rsi/meta.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprites taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "drill"
-		},
-        {
-			"name": "abductor",
-            "delays": [
-              [
-                0.1,
-                0.1,
-                0.1
-              ]
-            ]
-		},
-        {
-            "name": "abductor-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "abductor-inhand-right",
-            "directions": 4
-        },
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png
deleted file mode 100644
index d0a512e94e7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png
deleted file mode 100644
index 2cd5b0e97c0..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/e-cautery.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png
deleted file mode 100644
index 1ffa9e522ae..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png
deleted file mode 100644
index fa95ce487dd..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json
deleted file mode 100644
index 849c63e8fa9..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "e-cautery"
-		},
-		{
-            "name": "e-cautery-on"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "on-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "on-inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/on-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/on-inhand-left.png
deleted file mode 100644
index 93324740250..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/on-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/on-inhand-right.png
deleted file mode 100644
index 398a9b81b78..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-cautery.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png
deleted file mode 100644
index 04a27c34bbb..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel-on.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png
deleted file mode 100644
index 1fbf799b60d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/e-scalpel.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json
deleted file mode 100644
index 3bc01a1fd63..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/meta.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Modified on state taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "e-scalpel"
-		},
-		{
-            "name": "e-scalpel-on",
-            "delays": [
-                [
-                    0.1,
-                    0.1
-                ]
-            ]
-		},
-		{
-			"name": "off-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "on-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "off-inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "on-inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/off-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/off-inhand-left.png
deleted file mode 100644
index 151705c9588..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/off-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/off-inhand-right.png
deleted file mode 100644
index 70a64d2b0e6..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/on-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/on-inhand-left.png
deleted file mode 100644
index df0208dfb74..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/on-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/on-inhand-right.png
deleted file mode 100644
index 432693ff19d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/abductor.png
deleted file mode 100644
index ae396931a44..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png
deleted file mode 100644
index 951d323a52f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/hemostat.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png
deleted file mode 100644
index eb331bac35e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png
deleted file mode 100644
index b83b2b02c0b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json
deleted file mode 100644
index ec1d8d35d2c..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/hemostat.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprites taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "hemostat"
-		},
-        {
-			"name": "abductor"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png
deleted file mode 100644
index 961c3c641a7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/manipulation.rsi/insertion.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json
deleted file mode 100644
index af2b78c1ea8..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/manipulation.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"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/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool-inhand-left.png
deleted file mode 100644
index 0f49fe263b4..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool-inhand-right.png
deleted file mode 100644
index dbe0f3595a7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool.png
deleted file mode 100644
index f3b34a39bbf..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/cmotool.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil-inhand-left.png
deleted file mode 100644
index 90cd76871c2..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil-inhand-right.png
deleted file mode 100644
index 784701acedb..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil.png
deleted file mode 100644
index 27e794f922d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/evil.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png
deleted file mode 100644
index 4f9d45bdb9f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png
deleted file mode 100644
index 70464f12119..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json
deleted file mode 100644
index 277c06a67e9..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/meta.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b7c3ac536391a3dfe3046f3b5197721af4564d90",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "omnimed"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-                {
-			"name": "evil"
-		},
-		{
-			"name": "evil-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "evil-inhand-right",
-			"directions": 4
-		},
-                {
-			"name": "cmotool"
-		},
-		{
-			"name": "cmotool-inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "cmotool-inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png
deleted file mode 100644
index 9e0031744da..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi/omnimed.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/abductor.png
deleted file mode 100644
index c844178868b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png
deleted file mode 100644
index a23bdae4c5b..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png
deleted file mode 100644
index cced67007f5..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json
deleted file mode 100644
index 4d7fe1fad24..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprites taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "retractor"
-		},
-        {
-			"name": "abductor"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png
deleted file mode 100644
index 24e04fe613a..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/retractor.rsi/retractor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor-inhand-left.png
deleted file mode 100644
index 4bfa3b7e2a6..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor-inhand-right.png
deleted file mode 100644
index 6950a919e4f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor.png
deleted file mode 100644
index 000cb518d40..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png
deleted file mode 100644
index 726e388eca1..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png
deleted file mode 100644
index ed4b405d90c..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json
deleted file mode 100644
index 16abf33cd29..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at https://github.com/tgstation/tgstation/commit/67d7577947b5079408dce1b7646fdd6c3df13bb5. Abductor sprites taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/b55bef2ed28b8bde30883fb14311b221ab0dc977",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "scalpel"
-		},
-		{
-			"name": "abductor",
-            "delays": [
-              [
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1
-              ]
-            ]
-		},        
-        {
-            "name": "abductor-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "abductor-inhand-right",
-            "directions": 4
-        },
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png b/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png
deleted file mode 100644
index 44ec06e4631..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/base.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/base.png
deleted file mode 100644
index 0c0a27629bd..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/icon.png
deleted file mode 100644
index 0c0a27629bd..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/inhand-left.png
deleted file mode 100644
index 323f23940b5..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/inhand-right.png
deleted file mode 100644
index 9637fdb5f77..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-0.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-0.png
deleted file mode 100644
index 71e2fc19cc9..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-0.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-1.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-1.png
deleted file mode 100644
index 766f117976f..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-2.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-2.png
deleted file mode 100644
index baef9ac9b7c..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-3.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-3.png
deleted file mode 100644
index fc1ffbd4645..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-3.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-4.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-4.png
deleted file mode 100644
index 4f784d855c2..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/mag-unshaded-4.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/meta.json
deleted file mode 100644
index 5ffab676472..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/alien.rsi/meta.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Paradise Station",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-          "name": "mag-unshaded-0",
-          "delays": [
-            [
-              0.3,
-              0.3
-            ]
-          ]
-        },
-        {
-            "name": "mag-unshaded-1"
-        },
-        {
-            "name": "mag-unshaded-2"
-        },
-        {
-            "name": "mag-unshaded-3"
-        },
-        {
-            "name": "mag-unshaded-4"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/base.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/base.png
deleted file mode 100644
index a108515409e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/base.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/equipped-BACKPACK.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/equipped-BACKPACK.png
deleted file mode 100644
index ca3c0a345cf..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/equipped-SUITSTORAGE.png
deleted file mode 100644
index ca3c0a345cf..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/icon.png
deleted file mode 100644
index 6c46a5f0b7a..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/inhand-left.png
deleted file mode 100644
index 1bf46a66cab..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/inhand-right.png
deleted file mode 100644
index cb8ceeb1344..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-1.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-1.png
deleted file mode 100644
index b7cdc1f6f2d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-2.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-2.png
deleted file mode 100644
index ecd3016a7d2..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-3.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-3.png
deleted file mode 100644
index d11324fc766..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-3.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-4.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-4.png
deleted file mode 100644
index dcca96f4851..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/mag-unshaded-4.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/meta.json
deleted file mode 100644
index a5e52f17256..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/meta.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, modified by LuciferMkshelter",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-unshaded-1"
-        },
-        {
-            "name": "mag-unshaded-2"
-        },
-        {
-            "name": "mag-unshaded-3"
-        },
-        {
-            "name": "mag-unshaded-4"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "wielded-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "wielded-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "equipped-BACKPACK",
-            "directions": 4
-        },
-        {
-            "name": "equipped-SUITSTORAGE",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/wielded-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/wielded-inhand-left.png
deleted file mode 100644
index 87aba142387..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/wielded-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/wielded-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/wielded-inhand-right.png
deleted file mode 100644
index f13debc4a64..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Battery/decloner.rsi/wielded-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/cbbolt.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/cbbolt.png
deleted file mode 100644
index 17a3e176f70..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/cbbolt.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/declone.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/declone.png
deleted file mode 100644
index a58e39c967d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/declone.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact.png
deleted file mode 100644
index 98b6ad640b9..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
deleted file mode 100644
index 66e72b208a6..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d modified by darkrell",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "declone"
-    },
-    {
-      "name": "cbbolt",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "sniperlaser"
-    },
-    {
-      "name": "impact",
-      "delays": [
-        [
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002
-        ]
-      ]
-    },
-    {
-      "name": "trace",
-      "delays": [
-        [
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle",
-      "delays": [
-        [
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002,
-          0.006250002
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle.png
deleted file mode 100644
index ba0c99c7b12..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/sniperlaser.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/sniperlaser.png
deleted file mode 100644
index 98d6931e9d6..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/sniperlaser.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/trace.png b/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/trace.png
deleted file mode 100644
index f293573a333..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Guns/Projectiles/projectiles.rsi/trace.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/icon.png
deleted file mode 100644
index b7a1515f7d2..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/inhand-left.png
deleted file mode 100644
index 2975c479be7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/inhand-right.png
deleted file mode 100644
index 2975c479be7..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/meta.json
deleted file mode 100644
index 87ecb3fd832..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/silencer.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "version": 1,
-    "copyright": "Taken From Paradise Station",
-    "license": "CC-BY-SA-3.0",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-equipped-BACKPACK.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-equipped-BACKPACK.png
deleted file mode 100644
index ea688dff751..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-equipped-SUITSTORAGE.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-equipped-SUITSTORAGE.png
deleted file mode 100644
index ea688dff751..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-icon.png
deleted file mode 100644
index 2d71f6bd07c..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-inhand-left.png
deleted file mode 100644
index 823d7cc1824..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-inhand-right.png
deleted file mode 100644
index 42aecdec0e6..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/cuffs-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-equipped-BACKPACK.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-equipped-BACKPACK.png
deleted file mode 100644
index 3e69640577d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-equipped-SUITSTORAGE.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-equipped-SUITSTORAGE.png
deleted file mode 100644
index 3e69640577d..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-icon.png
deleted file mode 100644
index d83aecbdd9e..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-inhand-left.png
deleted file mode 100644
index f652ce377a3..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-inhand-right.png
deleted file mode 100644
index 1cb5cc73ba0..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/damage-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/icon.png
deleted file mode 100644
index 95c353ebea2..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/meta.json b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/meta.json
deleted file mode 100644
index 8890d2a4723..00000000000
--- a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/meta.json
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-    "version": 1,
-    "copyright": "Taked From Paradise Station, animated by darkrell",
-    "license": "CC-BY-SA-3.0",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "sleep-icon",
-            "delays": [
-              [
-                1,
-                0.15,
-                0.15,
-                0.15,
-                0.15,
-                0.15
-              ]
-            ]
-        },
-        {
-            "name": "stun-icon",
-            "delays": [
-              [
-                1,
-                0.15,
-                0.15,
-                0.15,
-                0.15,
-                0.15,
-                0.15,
-                0.15,
-                1
-              ]
-            ]
-        },
-        {
-            "name": "damage-icon",
-            "delays": [
-              [
-                0.2,
-                0.2,
-                0.2,
-                0.2,
-                0.2,
-                0.2,
-                0.2,
-                0.2,
-                0.2
-              ]
-            ]
-        },
-        {
-            "name": "cuffs-icon",
-            "delays": [
-              [
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1,
-                0.1
-              ]
-            ]
-        },
-        {
-            "name": "sleep-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "sleep-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "sleep-equipped-SUITSTORAGE",
-            "directions": 4
-        },
-        {
-            "name": "sleep-equipped-BACKPACK",
-            "directions": 4
-        },
-        {
-            "name": "stun-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "stun-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "stun-equipped-SUITSTORAGE",
-            "directions": 4
-        },
-        {
-            "name": "stun-equipped-BACKPACK",
-            "directions": 4
-        },
-        {
-            "name": "damage-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "damage-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "damage-equipped-SUITSTORAGE",
-            "directions": 4
-        },
-        {
-            "name": "damage-equipped-BACKPACK",
-            "directions": 4
-        },
-        {
-            "name": "cuffs-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "cuffs-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "cuffs-equipped-SUITSTORAGE",
-            "directions": 4
-        },
-        {
-            "name": "cuffs-equipped-BACKPACK",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-equipped-BACKPACK.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-equipped-BACKPACK.png
deleted file mode 100644
index 04e11837df3..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-equipped-SUITSTORAGE.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-equipped-SUITSTORAGE.png
deleted file mode 100644
index 04e11837df3..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-icon.png
deleted file mode 100644
index f77989069fb..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-inhand-left.png
deleted file mode 100644
index 0948e80b1d6..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-inhand-right.png
deleted file mode 100644
index 9a2937e2a72..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/sleep-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-equipped-BACKPACK.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-equipped-BACKPACK.png
deleted file mode 100644
index 77780768165..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-equipped-SUITSTORAGE.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-equipped-SUITSTORAGE.png
deleted file mode 100644
index 77780768165..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-equipped-SUITSTORAGE.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-icon.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-icon.png
deleted file mode 100644
index ce5cecd1668..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-icon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-inhand-left.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-inhand-left.png
deleted file mode 100644
index e81100cdca9..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-inhand-right.png b/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-inhand-right.png
deleted file mode 100644
index 6464e445736..00000000000
Binary files a/Resources/Textures/_Shitmed/Objects/Weapons/Melee/wonderprod.rsi/stun-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Furniture/Tables/abductor_optable.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Furniture/Tables/abductor_optable.rsi/meta.json
deleted file mode 100644
index 1155dc6ab37..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Furniture/Tables/abductor_optable.rsi/meta.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 1,
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "copyright": "Taked From Paradise Station",
-    "license": "CC-BY-SA-3.0",
-    "states": [
-      {
-        "name": "operating_table",
-        "directions": 1,
-        "delays": [
-          [
-            1.2,
-            0.2,
-            0.6,
-            0.2
-          ]
-        ]
-      }
-    ]
-  }
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Structures/Furniture/Tables/abductor_optable.rsi/operating_table.png b/Resources/Textures/_Shitmed/Structures/Furniture/Tables/abductor_optable.rsi/operating_table.png
deleted file mode 100644
index 1cb97c0d01a..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Furniture/Tables/abductor_optable.rsi/operating_table.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/console.png b/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/console.png
deleted file mode 100644
index 4bbe0aebb1c..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/console.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/eye.png b/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/eye.png
deleted file mode 100644
index aeb2ea48798..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/eye.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/meta.json
deleted file mode 100644
index 8cded395ac5..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Machines/abductor_camera_console.rsi/meta.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "copyright": "Taked From TG Station",
-  "license": "CC-BY-SA-3.0",
-  "states": [
-    {
-      "name": "console",
-      "directions": 1,
-      "delays": [
-        [
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08
-        ]
-      ]
-    },
-    {
-      "name": "eye",
-      "directions": 1,
-      "delays": [
-        [
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08,
-          0.08
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/abductor_console.rsi/console.png b/Resources/Textures/_Shitmed/Structures/Machines/abductor_console.rsi/console.png
deleted file mode 100644
index 077774ed790..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/abductor_console.rsi/console.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/abductor_console.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Machines/abductor_console.rsi/meta.json
deleted file mode 100644
index b6ca9ed8143..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Machines/abductor_console.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "copyright": "Taked From Paradise Station",
-  "license": "CC-BY-SA-3.0",
-  "states": [
-    {
-      "name": "console",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/autodoc.rsi/idle.png b/Resources/Textures/_Shitmed/Structures/Machines/autodoc.rsi/idle.png
deleted file mode 100644
index 7db1e709c8f..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/autodoc.rsi/idle.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/autodoc.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Machines/autodoc.rsi/meta.json
deleted file mode 100644
index 95dd4ae5322..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Machines/autodoc.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from CDDA MSXOtto+ at https://github.com/I-am-Erk/CDDA-Tilesets/blob/b90e13f7bdb470390fa4b0c7a4262298fc9bf890/gfx/MShockXotto%2B/pngs_tiles_32x32/furniture/f_autodoc/f_autodoc.png",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "idle"
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_fill.png b/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_fill.png
deleted file mode 100644
index 1e45b366221..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_fill.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_idleoff.png b/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_idleoff.png
deleted file mode 100644
index 73bab51916c..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_idleoff.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_idleon.png b/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_idleon.png
deleted file mode 100644
index f47f93eb86a..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_idleon.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_openpanel.png b/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_openpanel.png
deleted file mode 100644
index cc174c7d8b9..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_openpanel.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_panelopen.png b/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_panelopen.png
deleted file mode 100644
index d4c4de1f8c4..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_panelopen.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_unfill.png b/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_unfill.png
deleted file mode 100644
index 6aa57f247e2..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/limbgrower_unfill.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/meta.json
deleted file mode 100644
index 1b5f86463ff..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Machines/limbgrower.rsi/meta.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station at commit 85c26c1",
-  "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/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/full.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/full.png
deleted file mode 100644
index d2b58d8316c..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/meta.json
deleted file mode 100644
index 09f516e549f..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/meta.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tg station",
-  "states": [
-    {
-      "name": "full",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "state_0",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "state_1",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "state_2",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "state_3",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "state_4",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "state_5",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "state_6",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "state_7",
-      "directions": 4,
-      "delays": [
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ],
-        [
-          1.0
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_0.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_0.png
deleted file mode 100644
index f9d627cfeff..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_0.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_1.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_1.png
deleted file mode 100644
index 9ac57ea4a09..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_2.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_2.png
deleted file mode 100644
index f9d627cfeff..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_3.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_3.png
deleted file mode 100644
index 9ac57ea4a09..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_3.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_4.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_4.png
deleted file mode 100644
index cad43b52010..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_4.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_5.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_5.png
deleted file mode 100644
index 504808cb548..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_5.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_6.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_6.png
deleted file mode 100644
index cad43b52010..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_6.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_7.png b/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_7.png
deleted file mode 100644
index 504ff0a056c..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Tables/abductor_table.rsi/state_7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/full.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/full.png
deleted file mode 100644
index db7ad030136..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/full.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/meta.json
deleted file mode 100644
index c1c5406df84..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/meta.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "copyright": "Taked From TG Station",
-    "license": "CC-BY-SA-3.0",
-   "states": [
-        {
-            "name": "full"
-        },
-        {
-            "name": "state0",
-            "directions": 4
-        },
-        {
-            "name": "state1",
-            "directions": 4
-        },
-        {
-            "name": "state2",
-            "directions": 4
-        },
-        {
-            "name": "state3",
-            "directions": 4
-        },
-        {
-            "name": "state4",
-            "directions": 4
-        },
-        {
-            "name": "state5",
-            "directions": 4
-        },
-        {
-            "name": "state6",
-            "directions": 4
-        },
-        {
-            "name": "state7",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state0.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state0.png
deleted file mode 100644
index d682fb258b6..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state0.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state1.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state1.png
deleted file mode 100644
index 0c401f7f2af..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state2.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state2.png
deleted file mode 100644
index d682fb258b6..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state2.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state3.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state3.png
deleted file mode 100644
index 0c401f7f2af..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state3.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state4.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state4.png
deleted file mode 100644
index a535ff7bd85..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state4.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state5.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state5.png
deleted file mode 100644
index deba050657d..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state5.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state6.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state6.png
deleted file mode 100644
index a535ff7bd85..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state6.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state7.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state7.png
deleted file mode 100644
index cdddc213742..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor.rsi/state7.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/meta.json
deleted file mode 100644
index 25bd1eecb2b..00000000000
--- a/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "copyright": "Taked From TG Station",
-    "license": "CC-BY-SA-3.0",
-    "states": [
-        {
-            "name": "state0"
-        },
-        {
-            "name": "state1"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/state0.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/state0.png
deleted file mode 100644
index 3424d2d9f6d..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/state0.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/state1.png b/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/state1.png
deleted file mode 100644
index cccb0de590e..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/Walls/abductor_diagonal.rsi/state1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/idle.png b/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/idle.png
deleted file mode 100644
index 719af89e73f..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/idle.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/meta.json
deleted file mode 100644
index 46d30b6a838..00000000000
--- a/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/meta.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "copyright": "Taked From Paradise Station",
-  "license": "CC-BY-SA-3.0",
-  "states": [
-    {
-      "name": "idle",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "offline",
-      "directions": 1
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/offline.png b/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/offline.png
deleted file mode 100644
index a32a2a350b5..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/abductor_alien_pad.rsi/offline.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/experimentator_0.png b/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/experimentator_0.png
deleted file mode 100644
index ecb162cd2b6..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/experimentator_0.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/experimentator_1.png b/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/experimentator_1.png
deleted file mode 100644
index 3b098701855..00000000000
Binary files a/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/experimentator_1.png and /dev/null differ
diff --git a/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/meta.json b/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/meta.json
deleted file mode 100644
index aacdf0a0829..00000000000
--- a/Resources/Textures/_Shitmed/Structures/abductor_experimentator.rsi/meta.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tg",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "experimentator_0",
-      "directions": 1
-    },
-    {
-      "name": "experimentator_1",
-      "directions": 1,
-      "delays": [
-        [
-          0.2,
-          0.2
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_Shitmed/Tiles/abductor_tile.png b/Resources/Textures/_Shitmed/Tiles/abductor_tile.png
deleted file mode 100644
index ddd944e8849..00000000000
Binary files a/Resources/Textures/_Shitmed/Tiles/abductor_tile.png and /dev/null differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/left_arm.png b/Resources/Textures/_White/Body/Bone/human.rsi/left_arm.png
new file mode 100644
index 00000000000..63e2a9bf066
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/left_arm.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/left_foot.png b/Resources/Textures/_White/Body/Bone/human.rsi/left_foot.png
new file mode 100644
index 00000000000..86ae0dd0321
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/left_foot.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/left_hand.png b/Resources/Textures/_White/Body/Bone/human.rsi/left_hand.png
new file mode 100644
index 00000000000..c84ebbfe47a
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/left_hand.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/left_leg.png b/Resources/Textures/_White/Body/Bone/human.rsi/left_leg.png
new file mode 100644
index 00000000000..3078253cc07
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/left_leg.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/meta.json b/Resources/Textures/_White/Body/Bone/human.rsi/meta.json
new file mode 100644
index 00000000000..b211cbc777a
--- /dev/null
+++ b/Resources/Textures/_White/Body/Bone/human.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-4.0",
+  "copyright": "Gersoon (@gersoon458) for WWhiteDreamProject, 18.12.2025",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "skull"
+        },
+        {
+            "name": "rib_cage"
+        },
+        {
+            "name": "pelvis"
+        },
+        {
+            "name": "left_arm"
+        },
+        {
+            "name": "right_arm"
+        },
+        {
+            "name": "left_leg"
+        },
+        {
+            "name": "right_leg"
+        },
+        {
+            "name": "left_hand"
+        },
+        {
+            "name": "right_hand"
+        },
+        {
+            "name": "left_foot"
+        },
+        {
+            "name": "right_foot"
+        }
+    ]
+}
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/pelvis.png b/Resources/Textures/_White/Body/Bone/human.rsi/pelvis.png
new file mode 100644
index 00000000000..3b67c5f40f5
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/pelvis.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/rib_cage.png b/Resources/Textures/_White/Body/Bone/human.rsi/rib_cage.png
new file mode 100644
index 00000000000..08bcb8b59ab
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/rib_cage.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/right_arm.png b/Resources/Textures/_White/Body/Bone/human.rsi/right_arm.png
new file mode 100644
index 00000000000..b1f2297e01a
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/right_arm.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/right_foot.png b/Resources/Textures/_White/Body/Bone/human.rsi/right_foot.png
new file mode 100644
index 00000000000..1542568286c
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/right_foot.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/right_hand.png b/Resources/Textures/_White/Body/Bone/human.rsi/right_hand.png
new file mode 100644
index 00000000000..9e207992321
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/right_hand.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/right_leg.png b/Resources/Textures/_White/Body/Bone/human.rsi/right_leg.png
new file mode 100644
index 00000000000..f13a5fff77a
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/right_leg.png differ
diff --git a/Resources/Textures/_White/Body/Bone/human.rsi/skull.png b/Resources/Textures/_White/Body/Bone/human.rsi/skull.png
new file mode 100644
index 00000000000..d7703ce98f9
Binary files /dev/null and b/Resources/Textures/_White/Body/Bone/human.rsi/skull.png differ
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/torso.rsi/torso_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/chest_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/groin.rsi/groin_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/groin_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/head.rsi/head_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/head_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftarm.rsi/leftarm_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftarm_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftfoot.rsi/leftfoot_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftfoot_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/lefthand.rsi/lefthand_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/lefthand_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/leftleg.rsi/leftleg_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/leftleg_zero.png
diff --git a/Resources/Textures/_White/Interface/Alerts/body_status.rsi/meta.json b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/meta.json
new file mode 100644
index 00000000000..91089669db4
--- /dev/null
+++ b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/meta.json
@@ -0,0 +1,242 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/commit/c7e14784b35b1a136351c396d3a546f461ee2451",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "chest_none"
+        },
+        {
+            "name": "chest_zero"
+        },
+        {
+            "name": "chest_mild"
+        },
+        {
+            "name": "chest_moderate"
+        },
+        {
+            "name": "chest_severe"
+        },
+        {
+            "name": "chest_excruciating"
+        },
+        {
+            "name": "chest_mortal"
+        },
+        {
+            "name": "groin_none"
+        },
+        {
+            "name": "groin_zero"
+        },
+        {
+            "name": "groin_mild"
+        },
+        {
+            "name": "groin_moderate"
+        },
+        {
+            "name": "groin_severe"
+        },
+        {
+            "name": "groin_excruciating"
+        },
+        {
+            "name": "groin_mortal"
+        },
+        {
+            "name": "head_none"
+        },
+        {
+            "name": "head_zero"
+        },
+        {
+            "name": "head_mild"
+        },
+        {
+            "name": "head_moderate"
+        },
+        {
+            "name": "head_severe"
+        },
+        {
+            "name": "head_excruciating"
+        },
+        {
+            "name": "head_mortal"
+        },
+        {
+            "name": "leftarm_none"
+        },
+        {
+            "name": "leftarm_zero"
+        },
+        {
+            "name": "leftarm_mild"
+        },
+        {
+            "name": "leftarm_moderate"
+        },
+        {
+            "name": "leftarm_severe"
+        },
+        {
+            "name": "leftarm_excruciating"
+        },
+        {
+            "name": "leftarm_mortal"
+        },
+        {
+            "name": "leftfoot_none"
+        },
+        {
+            "name": "leftfoot_zero"
+        },
+        {
+            "name": "leftfoot_mild"
+        },
+        {
+            "name": "leftfoot_moderate"
+        },
+        {
+            "name": "leftfoot_severe"
+        },
+        {
+            "name": "leftfoot_excruciating"
+        },
+        {
+            "name": "leftfoot_mortal"
+        },
+        {
+            "name": "lefthand_none"
+        },
+        {
+            "name": "lefthand_zero"
+        },
+        {
+            "name": "lefthand_mild"
+        },
+        {
+            "name": "lefthand_moderate"
+        },
+        {
+            "name": "lefthand_severe"
+        },
+        {
+            "name": "lefthand_excruciating"
+        },
+        {
+            "name": "lefthand_mortal"
+        },
+        {
+            "name": "leftleg_none"
+        },
+        {
+            "name": "leftleg_zero"
+        },
+        {
+            "name": "leftleg_mild"
+        },
+        {
+            "name": "leftleg_moderate"
+        },
+        {
+            "name": "leftleg_severe"
+        },
+        {
+            "name": "leftleg_excruciating"
+        },
+        {
+            "name": "leftleg_mortal"
+        },
+        {
+            "name": "rightarm_none"
+        },
+        {
+            "name": "rightarm_zero"
+        },
+        {
+            "name": "rightarm_mild"
+        },
+        {
+            "name": "rightarm_moderate"
+        },
+        {
+            "name": "rightarm_severe"
+        },
+        {
+            "name": "rightarm_excruciating"
+        },
+        {
+            "name": "rightarm_mortal"
+        },
+        {
+            "name": "rightfoot_none"
+        },
+        {
+            "name": "rightfoot_zero"
+        },
+        {
+            "name": "rightfoot_mild"
+        },
+        {
+            "name": "rightfoot_moderate"
+        },
+        {
+            "name": "rightfoot_severe"
+        },
+        {
+            "name": "rightfoot_excruciating"
+        },
+        {
+            "name": "rightfoot_mortal"
+        },
+        {
+            "name": "righthand_none"
+        },
+        {
+            "name": "righthand_zero"
+        },
+        {
+            "name": "righthand_mild"
+        },
+        {
+            "name": "righthand_moderate"
+        },
+        {
+            "name": "righthand_severe"
+        },
+        {
+            "name": "righthand_excruciating"
+        },
+        {
+            "name": "righthand_mortal"
+        },
+        {
+            "name": "rightleg_none"
+        },
+        {
+            "name": "rightleg_zero"
+        },
+        {
+            "name": "rightleg_mild"
+        },
+        {
+            "name": "rightleg_moderate"
+        },
+        {
+            "name": "rightleg_severe"
+        },
+        {
+            "name": "rightleg_excruciating"
+        },
+        {
+            "name": "rightleg_mortal"
+        }
+    ]
+}
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightarm.rsi/rightarm_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightarm_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightfoot.rsi/rightfoot_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightfoot_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/righthand.rsi/righthand_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/righthand_zero.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_excruciating.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_4.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_excruciating.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_mild.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_1.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_mild.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_moderate.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_2.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_moderate.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_mortal.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_5.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_mortal.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_none.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_6.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_none.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_severe.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_3.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_severe.png
diff --git a/Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png b/Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_zero.png
similarity index 100%
rename from Resources/Textures/_Shitmed/Interface/Targeting/Status/rightleg.rsi/rightleg_0.png
rename to Resources/Textures/_White/Interface/Alerts/body_status.rsi/rightleg_zero.png
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/chest.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/chest.png
new file mode 100644
index 00000000000..77b2be5811f
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/chest.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/eyes.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/eyes.png
new file mode 100644
index 00000000000..8a04cc22441
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/eyes.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/groin.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/groin.png
new file mode 100644
index 00000000000..130ae87d098
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/groin.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/head.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/head.png
new file mode 100644
index 00000000000..15ac8c0b265
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/head.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_arm.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_arm.png
new file mode 100644
index 00000000000..c0fe125fe0a
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_arm.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_foot.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_foot.png
new file mode 100644
index 00000000000..c621479b7d6
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_foot.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_hand.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_hand.png
new file mode 100644
index 00000000000..1f1961458a5
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_hand.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_leg.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_leg.png
new file mode 100644
index 00000000000..20c4bdf1c5f
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/left_leg.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/mouth.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/mouth.png
new file mode 100644
index 00000000000..bcacefee79a
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/mouth.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_arm.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_arm.png
new file mode 100644
index 00000000000..e7cf336a8c5
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_arm.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_foot.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_foot.png
new file mode 100644
index 00000000000..ca2b7b1f3de
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_foot.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_hand.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_hand.png
new file mode 100644
index 00000000000..6f348674928
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_hand.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_leg.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_leg.png
new file mode 100644
index 00000000000..d3ba81d9624
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/right_leg.png differ
diff --git a/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/tail.png b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/tail.png
new file mode 100644
index 00000000000..4bbc2bb490e
Binary files /dev/null and b/Resources/Textures/_White/Interface/Xenomorph/TargetDoll/tail.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json
index 373ddf5e7d6..686359f657c 100644
--- a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json
+++ b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/meta.json
@@ -8,43 +8,67 @@
     "copyright": "Taken from TGStation at commit https://github.com/tgstation/tgstation/tree/e9cc620e9f908e18949031c6e1b5811e3fc5af4e/icons/mob/species/lizard",
     "states": [
         {
-            "name": "spines_aquatic",
+            "name": "spines_aquatic_chest",
             "directions": 4
         },
         {
-            "name": "spines_aquatic_alt",
+            "name": "spines_aquatic_groin",
             "directions": 4
         },
         {
-            "name": "spines_long",
+            "name": "spines_aquatic_head",
             "directions": 4
         },
         {
-            "name": "spines_long_alt",
+            "name": "spines_aquatic_tail",
             "directions": 4
         },
         {
-            "name": "spines_longmembrane",
+            "name": "spines_long_chest",
             "directions": 4
         },
         {
-            "name": "spines_longmembrane_alt",
+            "name": "spines_long_groin",
             "directions": 4
         },
         {
-            "name": "spines_short",
+            "name": "spines_long_tail",
             "directions": 4
         },
         {
-            "name": "spines_short_alt",
+            "name": "spines_longmembrane_chest",
             "directions": 4
         },
         {
-            "name": "spines_shortmembrane",
+            "name": "spines_longmembrane_groin",
             "directions": 4
         },
         {
-            "name": "spines_shortmembrane_alt",
+            "name": "spines_longmembrane_tail",
+            "directions": 4
+        },
+        {
+            "name": "spines_short_chest",
+            "directions": 4
+        },
+        {
+            "name": "spines_short_groin",
+            "directions": 4
+        },
+        {
+            "name": "spines_short_tail",
+            "directions": 4
+        },
+        {
+            "name": "spines_shortmembrane_chest",
+            "directions": 4
+        },
+        {
+            "name": "spines_shortmembrane_groin",
+            "directions": 4
+        },
+        {
+            "name": "spines_shortmembrane_tail",
             "directions": 4
         },
         {
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic.png
deleted file mode 100644
index a509055d408..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_alt.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_alt.png
deleted file mode 100644
index 464925367d0..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_alt.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_chest.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_chest.png
new file mode 100644
index 00000000000..674a824bb1d
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_chest.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_groin.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_groin.png
new file mode 100644
index 00000000000..a2c88b62d0d
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_groin.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_head.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_head.png
new file mode 100644
index 00000000000..1dbfcf006ae
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_head.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_tail.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_tail.png
new file mode 100644
index 00000000000..dddeca1120b
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_aquatic_tail.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long.png
deleted file mode 100644
index 3d5762733bc..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_alt.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_alt.png
deleted file mode 100644
index fcd0bc04906..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_alt.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_chest.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_chest.png
new file mode 100644
index 00000000000..ae7e58dad0a
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_chest.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_groin.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_groin.png
new file mode 100644
index 00000000000..e033428b25b
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_groin.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_tail.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_tail.png
new file mode 100644
index 00000000000..ba153db75d9
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_long_tail.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane.png
deleted file mode 100644
index 62ea0aa54c1..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_alt.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_alt.png
deleted file mode 100644
index c83b40d231c..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_alt.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_chest.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_chest.png
new file mode 100644
index 00000000000..4e11d05f1c1
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_chest.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_groin.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_groin.png
new file mode 100644
index 00000000000..20b4377d4a4
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_groin.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_tail.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_tail.png
new file mode 100644
index 00000000000..180a314eaca
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_longmembrane_tail.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short.png
deleted file mode 100644
index f8f74378aae..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_alt.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_alt.png
deleted file mode 100644
index 392f7e8152f..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_alt.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_chest.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_chest.png
new file mode 100644
index 00000000000..c559fbddb6b
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_chest.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_groin.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_groin.png
new file mode 100644
index 00000000000..acba4191dcf
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_groin.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_tail.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_tail.png
new file mode 100644
index 00000000000..cc576de00ea
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_short_tail.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane.png
deleted file mode 100644
index 322df8a8657..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_alt.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_alt.png
deleted file mode 100644
index 826d5ba7116..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_alt.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_chest.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_chest.png
new file mode 100644
index 00000000000..8c1ccc14562
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_chest.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_groin.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_groin.png
new file mode 100644
index 00000000000..2bc65c46dd0
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_groin.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_tail.png b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_tail.png
new file mode 100644
index 00000000000..6c33cfe3003
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/reptilian.rsi/spines_shortmembrane_tail.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff.png b/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff.png
deleted file mode 100644
index 8fde1c8b8f6..00000000000
Binary files a/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff_chest.png b/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff_chest.png
new file mode 100644
index 00000000000..14d084a1ee5
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff_chest.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff_groin.png b/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff_groin.png
new file mode 100644
index 00000000000..ba3d2eeaed8
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/fluff_groin.png differ
diff --git a/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/meta.json b/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/meta.json
index c2ece1c1b79..552fad8454e 100644
--- a/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/meta.json
+++ b/Resources/Textures/_White/Mobs/Customization/resomi_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2",
+  "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large drawn by Ubaser. Wagging tail by SonicDC. Splotch modified from Sharp by KittenColony(github). Frills neckfull come from: https://github.com/Bubberstation/Bubberstation/commit/8bc6b83404803466a560b694bf22ef3c0ac266a2. The division of the torso into chest and groin was done by Sparison.",
   "size": {
     "x": 32,
     "y": 32
@@ -32,7 +32,11 @@
             "directions": 4
         },
         {
-            "name": "fluff",
+            "name": "fluff_chest",
+            "directions": 4
+        },
+        {
+            "name": "fluff_groin",
             "directions": 4
         },
         {
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/full_slim.png b/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/full_slim.png
deleted file mode 100644
index 2eff97e6b8a..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/full_slim.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/meta.json b/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/meta.json
deleted file mode 100644
index f5ccdc86601..00000000000
--- a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/meta.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "version": 2,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by @canceredpussy(Discord)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "full_slim"
-        },
-        {
-            "name": "head_slim_f",
-            "directions": 4
-        },
-        {
-            "name": "l_arm_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_foot_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_hand_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_leg_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_arm_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_foot_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_hand_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_leg_slim",
-            "directions": 4
-        },
-        {
-            "name": "torso_slim_f",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/torso_slim_f.png b/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/torso_slim_f.png
deleted file mode 100644
index a16c50eb80d..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Harpy/parts.rsi/torso_slim_f.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/head_slim.png b/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/head_slim.png
deleted file mode 100644
index 4270c572ec3..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/head_slim.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/meta.json b/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/meta.json
deleted file mode 100644
index c2593d5e832..00000000000
--- a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/meta.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-    "version": 2,
-    "license": "CC-BY-SA-4.0",
-    "copyright": "by WWDP TEAM",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "head_slim",
-            "directions": 4
-        },
-        {
-            "name": "head_slim_f",
-            "directions": 4
-        },
-        {
-            "name": "l_arm_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_foot_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_hand_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_leg_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_arm_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_foot_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_hand_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_leg_slim",
-            "directions": 4
-        },
-        {
-            "name": "torso_slim",
-            "directions": 4
-        },
-        {
-            "name": "torso_slim_f",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/torso_slim.png b/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/torso_slim.png
deleted file mode 100644
index 678b30b071e..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/torso_slim.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/torso_slim_f.png b/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/torso_slim_f.png
deleted file mode 100644
index 8577bf57eae..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Human/parts.rsi/torso_slim_f.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/full_slim.png b/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/full_slim.png
deleted file mode 100644
index ade187d9d3e..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/full_slim.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_foot_digi.png b/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_foot_digi.png
deleted file mode 100644
index eca8d473c25..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_foot_digi.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_leg_digi.png b/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_leg_digi.png
deleted file mode 100644
index ce2650f04e7..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/l_leg_digi.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json b/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json
deleted file mode 100644
index 6e1f368968e..00000000000
--- a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/meta.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Digi from https://github.com/tgstation/tgstation/blob/08898964e67a0d517ca4e47eec7039394b694ac2/icons/mob/species/lizard/bodyparts.dmi | Edited by PuroSlavKing (Github). Slim by canceredpussy (discord)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "l_foot_digi",
-            "directions": 4
-        },
-        {
-            "name": "l_leg_digi",
-            "directions": 4
-        },
-        {
-            "name": "r_foot_digi",
-            "directions": 4
-        },
-        {
-            "name": "r_leg_digi",
-            "directions": 4
-        },
-        {
-            "name": "full_slim"
-        },
-        {
-            "name": "head_slim_f",
-            "directions": 4
-        },
-        {
-            "name": "l_arm_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_foot_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_hand_slim",
-            "directions": 4
-        },
-        {
-            "name": "l_leg_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_arm_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_foot_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_hand_slim",
-            "directions": 4
-        },
-        {
-            "name": "r_leg_slim",
-            "directions": 4
-        },
-        {
-            "name": "torso_slim_f",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_foot_digi.png b/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_foot_digi.png
deleted file mode 100644
index 82a92c0f297..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_foot_digi.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_leg_digi.png b/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_leg_digi.png
deleted file mode 100644
index 7bd62f01305..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/r_leg_digi.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/torso_slim_f.png b/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/torso_slim_f.png
deleted file mode 100644
index 7f825920041..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Reptilian/parts.rsi/torso_slim_f.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/chest.png b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/chest.png
new file mode 100644
index 00000000000..c0f6f0c190a
Binary files /dev/null and b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/chest.png differ
diff --git a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/groin.png b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/groin.png
index daa4b2d6e1c..1053b44ecf2 100644
Binary files a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/groin.png and b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/groin.png differ
diff --git a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head_m.png b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head_m.png
rename to Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head.png
diff --git a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head_f.png b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head_female.png
similarity index 100%
rename from Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head_f.png
rename to Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/head_female.png
diff --git a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/meta.json b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/meta.json
index fda56a1f8d6..fe8e30ce8c4 100644
--- a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/meta.json
+++ b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by EmoGarbage",
+    "copyright": "Created by EmoGarbage. Changed by WWDP",
     "size": {
         "x": 32,
         "y": 32
@@ -11,11 +11,11 @@
             "name": "full"
         },
         {
-            "name": "head_f",
+            "name": "head",
             "directions": 4
         },
         {
-            "name": "head_m",
+            "name": "head_female",
             "directions": 4
         },
         {
@@ -51,11 +51,7 @@
             "directions": 4
         },
         {
-            "name": "torso_f",
-            "directions": 4
-        },
-        {
-            "name": "torso_m",
+            "name": "chest",
             "directions": 4
         },
         {
diff --git a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/torso_f.png b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/torso_f.png
deleted file mode 100644
index f84d8e389d0..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/torso_f.png and /dev/null differ
diff --git a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/torso_m.png b/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/torso_m.png
deleted file mode 100644
index f84d8e389d0..00000000000
Binary files a/Resources/Textures/_White/Mobs/Species/Resomi/parts.rsi/torso_m.png and /dev/null differ
diff --git a/Resources/Textures/_White/Shaders/pain_blink.swsl b/Resources/Textures/_White/Shaders/pain_blink.swsl
new file mode 100644
index 00000000000..5c2708688ff
--- /dev/null
+++ b/Resources/Textures/_White/Shaders/pain_blink.swsl
@@ -0,0 +1,54 @@
+light_mode unshaded;
+
+uniform sampler2D SCREEN_TEXTURE;
+uniform highp float strength;
+uniform sampler2D overlay_texture;
+
+// Function to convert RGB to HSV.
+highp vec3 rgb2hsv(highp vec3 c)
+{
+    highp vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
+    highp vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
+    highp vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
+
+    highp float d = q.x - min(q.w, q.y);
+    /* float e = 1.0e-10; */
+    highp float e = 0.0000000001;
+    return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
+}
+
+// Function to convert HSV to RGB.
+highp vec3 hsv2rgb(highp vec3 c)
+{
+    highp vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+    highp vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+    return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+}
+
+void fragment() {
+	highp vec2 uv = FRAGCOORD.xy * SCREEN_PIXEL_SIZE;
+    highp vec4 sceneColor = zTextureSpec(SCREEN_TEXTURE, uv);
+
+    highp vec3 color = vec3(0.75, 0.02, 0.02);
+    highp vec4 textureColor = zTextureSpec(overlay_texture, uv);
+    color = mix(color, textureColor.rgb, textureColor.a * strength);
+
+    highp vec3 hsvColor = rgb2hsv(color);
+    highp vec3 hsvSceneColor = rgb2hsv(sceneColor.rgb);
+
+    if (hsvColor.y > 0.05 && hsvColor.z != 0.0)
+    {
+        hsvSceneColor.x = hsvColor.x;
+    }
+
+    hsvSceneColor.y = (hsvSceneColor.y < hsvColor.y) ?
+        mix(hsvColor.y, hsvColor.y, 0.75) : mix(hsvSceneColor.y, hsvColor.y, strength * 0.1);
+
+    hsvSceneColor.z = (mix(hsvSceneColor.z, hsvColor.z, 0.85) <= hsvSceneColor.z) ?
+        mix(hsvSceneColor.z, hsvColor.z, 0.85) : mix(hsvSceneColor.z, hsvColor.z, strength * 0.1);
+
+    sceneColor.rgb = mix(sceneColor.rgb, hsv2rgb(hsvSceneColor), strength);
+
+    // Output to screen
+    COLOR = sceneColor;
+}
diff --git a/Resources/Textures/_White/image.png b/Resources/Textures/_White/image.png
new file mode 100644
index 00000000000..fc46bbbf94b
Binary files /dev/null and b/Resources/Textures/_White/image.png differ
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 798bc51f5b9..a313e394d88 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -70,21 +70,27 @@ binds:
 - function: CameraRotateLeft
   type: State
   key: NumpadNum7
+  mod1: Control # WD EDIT
 - function: CameraRotateRight
   type: State
   key: NumpadNum9
+  mod1: Control # WD EDIT
 - function: CameraReset
   type: State
   key: NumpadNum8
+  mod1: Control # WD EDIT
 - function: ZoomOut
   type: State
   key: NumpadNum4
+  mod1: Control # WD EDIT
 - function: ZoomIn
   type: State
   key: NumpadNum6
+  mod1: Control # WD EDIT
 - function: ResetZoom
   type: State
   key: NumpadNum5
+  mod1: Control # WD EDIT
 # Misc
 - function: ShowEscapeMenu
   type: State
@@ -586,11 +592,6 @@ binds:
 - function: Hotbar9
   type: State
   key: Num9
-# WD EDIT START
-- function: LookUp
-  type: State
-  key: Space
-# WD EDIT END
 - function: MappingUnselect
   type: State
   key: MouseRight
@@ -624,4 +625,28 @@ binds:
   type: State
   key: MouseRight
   canFocus: true
+# WD EDIT START
+- function: LookUp
+  type: State
+  key: Space
+# Target doll
+- function: TargetDollHead
+  type: State
+  key: NumpadNum8
+- function: TargetDollChest
+  type: State
+  key: NumpadNum5
+- function: TargetDollRightArm
+  type: State
+  key: NumpadNum4
+- function: TargetDollLeftArm
+  type: State
+  key: NumpadNum6
+- function: TargetDollRightLeg
+  type: State
+  key: NumpadNum1
+- function: TargetDollLeftLeg
+  type: State
+  key: NumpadNum3
+# WD EDIT END