diff --git a/Content.Client/Smoking/MatchstickSystem.cs b/Content.Client/Smoking/MatchstickSystem.cs
index 9c241a2a8b1..42b8b32b33e 100644
--- a/Content.Client/Smoking/MatchstickSystem.cs
+++ b/Content.Client/Smoking/MatchstickSystem.cs
@@ -1,5 +1,9 @@
+// Shitmed Change Start
+
 using Content.Shared.Smoking.Systems;
 
 namespace Content.Client.Smoking;
 
 public sealed class MatchstickSystem : SharedMatchstickSystem;
+
+// Shitmed Change End
\ No newline at end of file
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 5952fc003a5..a2ef54c6133 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -165,7 +165,8 @@ public override HashSet<EntityUid> GibPart(
         var ev = new BeingGibbedEvent(gibs);
         RaiseLocalEvent(partId, ref ev);
 
-        QueueDel(partId);
+        if (gibs.Any())
+            QueueDel(partId);
 
         return gibs;
     }
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index f40783ffb5c..f68ce386b28 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -2,17 +2,21 @@
 using Content.Server.Ghost.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
-using Content.Shared._Shitmed.Body.Organ; // Shitmed Change
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Pointing;
 
+// Shitmed Change
+using Content.Shared._Shitmed.Body.Organ;
+using Content.Server._Shitmed.DelayedDeath;
+using Content.Shared.Body.Systems;
+
 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();
@@ -30,6 +34,7 @@ private void HandleRemoval(EntityUid uid, BrainComponent _, ref OrganRemovedFrom
 
             // Prevents revival, should kill the user within a given timespan too.
             EnsureComp<DebrainedComponent>(args.OldBody);
+            EnsureComp<DelayedDeathComponent>(args.OldBody);
             HandleMind(uid, args.OldBody);
         }
         private void HandleAddition(EntityUid uid, BrainComponent _, ref OrganAddedToBodyEvent args)
@@ -38,6 +43,8 @@ private void HandleAddition(EntityUid uid, BrainComponent _, ref OrganAddedToBod
                 return;
 
             RemComp<DebrainedComponent>(args.Body);
+            if (_bodySystem.TryGetBodyOrganEntityComps<HeartComponent>(args.Body, out var _))
+                RemComp<DelayedDeathComponent>(args.Body);
             HandleMind(args.Body, uid);
         }
         // Shitmed Change End
diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs
index 9f56bedb4c3..420aaae8500 100644
--- a/Content.Server/Body/Systems/RespiratorSystem.cs
+++ b/Content.Server/Body/Systems/RespiratorSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
-using Content.Shared._Shitmed.Body.Components; // GoobStation
+using Content.Shared._Shitmed.Body.Components; // Shitmed Change
 using Content.Shared._Shitmed.Body.Organ; // Shitmed Change
 using Content.Server.Chat.Systems;
 using Content.Server.EntityEffects.EffectConditions;
@@ -21,6 +21,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
+
 namespace Content.Server.Body.Systems;
 
 [UsedImplicitly]
@@ -73,7 +74,7 @@ public override void Update(float frameTime)
 
             respirator.NextUpdate += respirator.UpdateInterval;
 
-            if (_mobState.IsDead(uid) || HasComp<BreathingImmunityComponent>(uid)) // GoobStation: BreathingImmunity
+            if (_mobState.IsDead(uid) || HasComp<BreathingImmunityComponent>(uid)) // Shitmed: BreathingImmunity
                 continue;
 
             // Begin DeltaV Code: Addition: 
@@ -86,7 +87,7 @@ public override void Update(float frameTime)
             // End DeltaV Code
             UpdateSaturation(uid, multiplier * (float) respirator.UpdateInterval.TotalSeconds, respirator); // DeltaV: use multiplier instead of negating
 
-            if (!_mobState.IsIncapacitated(uid) || HasComp<DebrainedComponent>(uid)) // Shitmed Change - Cannot breathe in crit or when no brain.
+            if (!_mobState.IsIncapacitated(uid) && !HasComp<DebrainedComponent>(uid)) // Shitmed Change - Cannot breathe in crit or when no brain.
             {
                 switch (respirator.Status)
                 {
@@ -304,7 +305,7 @@ private void TakeSuffocationDamage(Entity<RespiratorComponent> ent)
             }
         }
 
-        _damageableSys.TryChangeDamage(ent, ent.Comp.Damage, interruptsDoAfters: false);
+        _damageableSys.TryChangeDamage(ent, HasComp<DebrainedComponent>(ent) ? ent.Comp.Damage * 4.5f : ent.Comp.Damage, interruptsDoAfters: false);
     }
 
     private void StopSuffocation(Entity<RespiratorComponent> ent)
diff --git a/Content.Server/Light/EntitySystems/MatchboxSystem.cs b/Content.Server/Light/EntitySystems/MatchboxSystem.cs
index e4925c610dd..5b1d98beca4 100644
--- a/Content.Server/Light/EntitySystems/MatchboxSystem.cs
+++ b/Content.Server/Light/EntitySystems/MatchboxSystem.cs
@@ -2,7 +2,7 @@
 using Content.Server.Storage.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Smoking;
-using Content.Shared.Smoking.Components;
+using Content.Shared.Smoking.Components; // Shitmed Change
 
 namespace Content.Server.Light.EntitySystems
 {
diff --git a/Content.Server/Light/EntitySystems/MatchstickSystem.cs b/Content.Server/Light/EntitySystems/MatchstickSystem.cs
index 6748fa9ce66..2219fb0588c 100644
--- a/Content.Server/Light/EntitySystems/MatchstickSystem.cs
+++ b/Content.Server/Light/EntitySystems/MatchstickSystem.cs
@@ -3,8 +3,8 @@
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Smoking;
-using Content.Shared.Smoking.Components;
-using Content.Shared.Smoking.Systems;
+using Content.Shared.Smoking.Components; // Shitmed Change
+using Content.Shared.Smoking.Systems; // Shitmed Change
 using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -13,7 +13,7 @@
 
 namespace Content.Server.Light.EntitySystems
 {
-    public sealed class MatchstickSystem : SharedMatchstickSystem
+    public sealed class MatchstickSystem : SharedMatchstickSystem // Shitmed Change
     {
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -85,15 +85,16 @@ public void Ignite(Entity<MatchstickComponent> matchstick, EntityUid user)
             _audio.PlayPvs(component.IgniteSound, matchstick, AudioParams.Default.WithVariation(0.125f).WithVolume(-0.125f));
 
             // Change state
-            SetState((matchstick, component), SmokableState.Lit);
+            SetState((matchstick, component), SmokableState.Lit); // Shitmed Change
             _litMatches.Add(matchstick);
             matchstick.Owner.SpawnTimer(component.Duration * 1000, delegate
             {
-                SetState((matchstick, component), SmokableState.Burnt);
+                SetState((matchstick, component), SmokableState.Burnt); // Shitmed Change
                 _litMatches.Remove(matchstick);
             });
         }
 
+        // Shitmed Change Start
         public override bool SetState(Entity<MatchstickComponent> ent, SmokableState value)
         {
             if (!base.SetState(ent, value))
@@ -101,6 +102,8 @@ public override bool SetState(Entity<MatchstickComponent> ent, SmokableState val
 
             var (uid, component) = ent;
 
+        // Shitmed Change End
+
             if (_lights.TryGetLight(uid, out var pointLightComponent))
             {
                 _lights.SetEnabled(uid, component.CurrentState == SmokableState.Lit, pointLightComponent);
@@ -124,7 +127,8 @@ public override bool SetState(Entity<MatchstickComponent> ent, SmokableState val
                 _appearance.SetData(uid, SmokingVisuals.Smoking, component.CurrentState, appearance);
             }
 
-            return true;
+
+            return true; // Shitmed Change
         }
     }
 }
diff --git a/Content.Server/_Shitmed/Body/Organ/HeartSystem.cs b/Content.Server/_Shitmed/Body/Organ/HeartSystem.cs
new file mode 100644
index 00000000000..6a76fee77b3
--- /dev/null
+++ b/Content.Server/_Shitmed/Body/Organ/HeartSystem.cs
@@ -0,0 +1,38 @@
+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/DelayedDeath/DelayedDeathComponent.cs b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathComponent.cs
new file mode 100644
index 00000000000..a844816c8ae
--- /dev/null
+++ b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathComponent.cs
@@ -0,0 +1,16 @@
+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;
+}
diff --git a/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs
new file mode 100644
index 00000000000..33517bc0480
--- /dev/null
+++ b/Content.Server/_Shitmed/DelayedDeath/DelayedDeathSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Mobs.Systems;
+using Robust.Shared.Prototypes;
+namespace Content.Server._Shitmed.DelayedDeath;
+
+public partial class DelayedDeathSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly IPrototypeManager _prototypes = default!;
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        using var query = EntityQueryEnumerator<DelayedDeathComponent>();
+        while (query.MoveNext(out var ent, out var component))
+        {
+            component.DeathTimer += frameTime;
+
+            if (component.DeathTimer >= component.DeathTime && !_mobState.IsDead(ent))
+            {
+                var damage = new DamageSpecifier(_prototypes.Index<DamageTypePrototype>("Bloodloss"), 150);
+                _damageable.TryChangeDamage(ent, damage, partMultiplier: 0f);
+            }
+        }
+    }
+}
diff --git a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
index d8c52e3bdf7..34e02772c0b 100644
--- a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
+++ b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
@@ -47,8 +47,10 @@ public override void Initialize()
 
         SubscribeLocalEvent<SurgeryToolComponent, AfterInteractEvent>(OnToolAfterInteract);
         SubscribeLocalEvent<SurgeryTargetComponent, SurgeryStepDamageEvent>(OnSurgeryStepDamage);
-        SubscribeLocalEvent<SurgeryDamageChangeEffectComponent, SurgeryStepEvent>(OnSurgeryDamageChange);
-        SubscribeLocalEvent<SurgerySpecialDamageChangeEffectComponent, SurgeryStepEvent>(OnSurgerySpecialDamageChange);
+        // You might be wondering "why aren't we using StepEvent for these two?" reason being that StepEvent fires off regardless of success on the previous functions
+        // so this would heal entities even if you had a used or incorrect organ.
+        SubscribeLocalEvent<SurgerySpecialDamageChangeEffectComponent, SurgeryStepDamageChangeEvent>(OnSurgerySpecialDamageChange);
+        SubscribeLocalEvent<SurgeryDamageChangeEffectComponent, SurgeryStepDamageChangeEvent>(OnSurgeryDamageChange);
         SubscribeLocalEvent<SurgeryStepEmoteEffectComponent, SurgeryStepEvent>(OnStepScreamComplete);
         SubscribeLocalEvent<SurgeryStepSpawnEffectComponent, SurgeryStepEvent>(OnStepSpawnComplete);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
@@ -129,15 +131,8 @@ private void OnToolAfterInteract(Entity<SurgeryToolComponent> ent, ref AfterInte
     private void OnSurgeryStepDamage(Entity<SurgeryTargetComponent> ent, ref SurgeryStepDamageEvent args) =>
         SetDamage(args.Body, args.Damage, args.PartMultiplier, args.User, args.Part);
 
-    private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> ent, ref SurgeryStepEvent args)
+    private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> ent, ref SurgeryStepDamageChangeEvent args)
     {
-        // This unintentionally punishes the user if they have an organ in another hand that is already used.
-        // Imo surgery shouldn't let you automatically pick tools on both hands anyway, it should only use the one you've got in your selected hand.
-        if (ent.Comp.IsConsumable
-            && args.Tools.Where(tool => TryComp<OrganComponent>(tool, out var organComp)
-            && !_body.TrySetOrganUsed(tool, true, organComp)).Any())
-            return;
-
         var damageChange = ent.Comp.Damage;
         if (HasComp<ForcedSleepingComponent>(args.Body))
             damageChange = damageChange * ent.Comp.SleepModifier;
@@ -145,17 +140,12 @@ private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> en
         SetDamage(args.Body, damageChange, 0.5f, args.User, args.Part);
     }
 
-    private void OnSurgerySpecialDamageChange(Entity<SurgerySpecialDamageChangeEffectComponent> ent, ref SurgeryStepEvent args)
+    private void OnSurgerySpecialDamageChange(Entity<SurgerySpecialDamageChangeEffectComponent> ent, ref SurgeryStepDamageChangeEvent args)
     {
-        if (ent.Comp.IsConsumable
-            && args.Tools.Where(tool => TryComp<OrganComponent>(tool, out var organComp)
-            && !_body.TrySetOrganUsed(tool, true, organComp)).Any())
-            return;
-
         if (ent.Comp.DamageType == "Rot")
             _rot.ReduceAccumulator(args.Body, TimeSpan.FromSeconds(2147483648)); // BEHOLD, SHITCODE THAT I JUST COPY PASTED. I'll redo it at some point, pinky swear :)
         else if (ent.Comp.DamageType == "Eye"
-            && TryComp(args.Body, out BlindableComponent? blindComp)
+            && TryComp(ent, out BlindableComponent? blindComp)
             && blindComp.EyeDamage > 0)
             _blindableSystem.AdjustEyeDamage((args.Body, blindComp), -blindComp!.EyeDamage);
     }
diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs
index e2f6eb16123..4a1847120a2 100644
--- a/Content.Shared/Body/Organ/OrganComponent.cs
+++ b/Content.Shared/Body/Organ/OrganComponent.cs
@@ -15,6 +15,13 @@ public sealed partial class OrganComponent : Component, ISurgeryToolComponent //
     [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
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index 7ecc13fbcab..f246c381b7f 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -385,6 +385,7 @@ public virtual HashSet<EntityUid> GibPart(
             if (IsPartRoot(bodyEnt, partId, part: part))
                 return gibs;
 
+            ChangeSlotState((partId, part), true);
             RemovePartChildren((partId, part), bodyEnt);
             foreach (var organ in GetPartOrgans(partId, part))
             {
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index 6fc559cc6b0..c356c4be81d 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;
+using Content.Shared.Damage; // Shitmed Change
 using Robust.Shared.Containers;
 
 namespace Content.Shared.Body.Systems;
@@ -20,10 +21,17 @@ private void AddOrgan(
 
         if (organEnt.Comp.Body is not null)
         {
+            organEnt.Comp.OriginalBody = organEnt.Comp.Body; // Shitmed Change
             var addedInBodyEv = new OrganAddedToBodyEvent(bodyUid, parentPartUid);
             RaiseLocalEvent(organEnt, ref addedInBodyEv);
         }
 
+        // Shitmed Change Start
+        if (TryComp(parentPartUid, out DamageableComponent? damageable)
+            && damageable.TotalDamage > 200)
+            TrySetOrganUsed(organEnt, true, organEnt.Comp);
+        // Shitmed Change End
+
         Dirty(organEnt, organEnt.Comp);
     }
 
@@ -211,14 +219,14 @@ public bool TryGetBodyOrganEntityComps<T>(
     }
 
     // Shitmed Change Start
-    
+
     public bool TrySetOrganUsed(EntityUid organId, bool used, OrganComponent? organ = null)
     {
         if (!Resolve(organId, ref organ)
-            || organ.Used == true)
+            || organ.Used == used)
             return false;
 
-        organ.Used = true;
+        organ.Used = used;
         Dirty(organId, organ);
         return true;
     }
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index b28b0ca891d..0389edbef25 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -106,13 +106,13 @@ private void EnablePart(Entity<BodyPartComponent> partEnt)
     public void ChangeSlotState(Entity<BodyPartComponent> partEnt, bool disable)
     {
         if (partEnt.Comp.Body is not null
-            && TryComp<InventoryComponent>(partEnt.Comp.Body, out var inventory) // GoobStation: Prevent error for non-humanoids
+            && 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.SetSlotStatus(partEnt.Comp.Body.Value, containerName, disable, inventory); // GoobStation: pass inventory
+                _inventorySystem.SetSlotStatus(partEnt.Comp.Body.Value, containerName, disable, inventory);
                 var ev = new RefreshInventorySlotsEvent(containerName);
                 RaiseLocalEvent(partEnt.Comp.Body.Value, ev);
             }
@@ -567,7 +567,7 @@ public bool CanAttachPart(
     }
 
     /// <summary>
-    /// GoobStation: Returns true if this parentId supports attaching a new part to the specified slot.
+    /// Shitmed Change: Returns true if this parentId supports attaching a new part to the specified slot.
     /// </summary>
     public bool CanAttachToSlot(
         EntityUid parentId,
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 95f80f86e43..574ffeedafb 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -338,10 +338,7 @@ public void SetSlotStatus(EntityUid uid, string slotName, bool isDisabled, Inven
                     _transform.AttachToGridOrMap(entityUid, transform);
                     _randomHelper.RandomOffset(entityUid, 0.5f);
                 }
-                //_containerSystem.ShutdownContainer(container);
             }
-            //else
-                //_containerSystem.EnsureContainer<ContainerSlot>(uid, slotName);
             slot.Disabled = isDisabled;
             break;
         }
diff --git a/Content.Shared/Smoking/Components/MatchstickComponent.cs b/Content.Shared/Smoking/Components/MatchstickComponent.cs
index 527553549b5..0d8c91bab5e 100644
--- a/Content.Shared/Smoking/Components/MatchstickComponent.cs
+++ b/Content.Shared/Smoking/Components/MatchstickComponent.cs
@@ -1,3 +1,5 @@
+// Shitmed Change Start
+
 using Content.Shared.Smoking.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
@@ -26,3 +28,5 @@ public sealed partial class MatchstickComponent : Component
     [DataField(required: true)]
     public SoundSpecifier IgniteSound = default!;
 }
+
+// Shitmed Change End
\ No newline at end of file
diff --git a/Content.Shared/Smoking/Systems/SharedMatchstickSystem.cs b/Content.Shared/Smoking/Systems/SharedMatchstickSystem.cs
index bda75c42d29..684a9647066 100644
--- a/Content.Shared/Smoking/Systems/SharedMatchstickSystem.cs
+++ b/Content.Shared/Smoking/Systems/SharedMatchstickSystem.cs
@@ -1,3 +1,4 @@
+// Shitmed Change Start
 using Content.Shared.Smoking.Components;
 
 namespace Content.Shared.Smoking.Systems;
@@ -13,4 +14,5 @@ public virtual bool SetState(Entity<MatchstickComponent> ent, SmokableState stat
         Dirty(ent);
         return true;
     }
-}
+} 
+// Shitmed Change End
diff --git a/Content.Shared/_Shitmed/Body/Components/BreathingImmunityComponent.cs b/Content.Shared/_Shitmed/Body/Components/BreathingImmunityComponent.cs
index 7add1f261ed..b5cdac8614f 100644
--- a/Content.Shared/_Shitmed/Body/Components/BreathingImmunityComponent.cs
+++ b/Content.Shared/_Shitmed/Body/Components/BreathingImmunityComponent.cs
@@ -1,8 +1,8 @@
 namespace Content.Shared._Shitmed.Body.Components;
 
 /// <summary>
-/// GoobStation: Disables a mobs need for air when this component is added.
-/// It will neither breathe nor take airloss damage.
+///     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/Organ/DebrainedComponent.cs b/Content.Shared/_Shitmed/Body/Organ/DebrainedComponent.cs
index 9d07ca797d5..9f6e4d92c0b 100644
--- a/Content.Shared/_Shitmed/Body/Organ/DebrainedComponent.cs
+++ b/Content.Shared/_Shitmed/Body/Organ/DebrainedComponent.cs
@@ -4,4 +4,3 @@ namespace Content.Shared._Shitmed.Body.Organ;
 
 [RegisterComponent]
 public sealed partial class DebrainedComponent : Component;
-// TODO: Add a timer to kill the entity if they don't get a new brain in time.
diff --git a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs
index 199870fa6d3..8a9627e89e1 100644
--- a/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs
+++ b/Content.Shared/_Shitmed/Body/Systems/SharedBodySystem.PartAppearance.cs
@@ -22,8 +22,8 @@ private void InitializePartAppearances()
 
         SubscribeLocalEvent<BodyPartAppearanceComponent, ComponentStartup>(OnPartAppearanceStartup);
         SubscribeLocalEvent<BodyPartAppearanceComponent, AfterAutoHandleStateEvent>(HandleState);
-        SubscribeLocalEvent<BodyComponent, BodyPartAttachedEvent>(OnPartAttachedToBody);
-        SubscribeLocalEvent<BodyComponent, BodyPartDroppedEvent>(OnPartDroppedFromBody);
+        SubscribeLocalEvent<BodyComponent, BodyPartAddedEvent>(OnPartAttachedToBody);
+        SubscribeLocalEvent<BodyComponent, BodyPartRemovedEvent>(OnPartDroppedFromBody);
     }
 
     private void OnPartAppearanceStartup(EntityUid uid, BodyPartAppearanceComponent component, ComponentStartup args)
@@ -131,7 +131,7 @@ public void ModifyMarkings(EntityUid uid,
     private void HandleState(EntityUid uid, BodyPartAppearanceComponent component, ref AfterAutoHandleStateEvent args) =>
         ApplyPartMarkings(uid, component);
 
-    private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref BodyPartAttachedEvent args)
+    private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref BodyPartAddedEvent args)
     {
         if (!TryComp(args.Part, out BodyPartAppearanceComponent? partAppearance)
             || !TryComp(uid, out HumanoidAppearanceComponent? bodyAppearance))
@@ -143,7 +143,7 @@ private void OnPartAttachedToBody(EntityUid uid, BodyComponent component, ref Bo
         UpdateAppearance(uid, partAppearance);
     }
 
-    private void OnPartDroppedFromBody(EntityUid uid, BodyComponent component, ref BodyPartDroppedEvent args)
+    private void OnPartDroppedFromBody(EntityUid uid, BodyComponent component, ref BodyPartRemovedEvent args)
     {
         if (TerminatingOrDeleted(uid)
             || TerminatingOrDeleted(args.Part)
@@ -166,7 +166,10 @@ protected void UpdateAppearance(EntityUid target,
             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);
@@ -177,7 +180,9 @@ protected void UpdateAppearance(EntityUid target,
         {
             _humanoid.SetLayerVisibility(target, visualLayer, true, true, bodyAppearance);
             foreach (var marking in markingList)
-                _humanoid.AddMarking(target, marking.MarkingId, marking.MarkingColors, false, true, bodyAppearance);
+            {
+                _humanoid.AddMarking(target, marking.MarkingId, marking.MarkingColors, true, true, bodyAppearance);
+            }
         }
 
         Dirty(target, bodyAppearance);
diff --git a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
index 0d0dbbfc39b..16292a54dbc 100644
--- a/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared._Shitmed.Medical.Surgery.Conditions;
 public sealed partial class SurgeryPartRemovedConditionComponent : Component
 {
     /// <summary>
-    /// GoobStation: Requires that the parent part can attach a new part to this slot.
+    ///     Requires that the parent part can attach a new part to this slot.
     /// </summary>
     [DataField(required: true)]
     public string Connection = string.Empty;
diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
index 9d3ff4255f6..d628e554cdd 100644
--- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
+++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
@@ -423,6 +423,12 @@ private void OnAddOrganStep(Entity<SurgeryAddOrganStepComponent> ent, ref Surger
                 && _body.InsertOrgan(args.Part, tool, insertedOrgan.SlotId, partComp, insertedOrgan))
             {
                 EnsureComp<OrganReattachedComponent>(tool);
+                if (_body.TrySetOrganUsed(tool, true, insertedOrgan)
+                    && insertedOrgan.OriginalBody != args.Body)
+                {
+                    var ev = new SurgeryStepDamageChangeEvent(args.User, args.Body, args.Part, ent);
+                    RaiseLocalEvent(ent, ref ev);
+                }
                 break;
             }
         }
@@ -593,26 +599,29 @@ private void OnSurgeryTargetStepChosen(Entity<SurgeryTargetComponent> ent, ref S
         if (!CanPerformStep(user, body, part, step, true, out _, out _, out var validTools))
             return;
 
-        // make the doafter longer for ghetto tools, or shorter for advanced ones
         var speed = 1f;
         var usedEv = new SurgeryToolUsedEvent(user, body);
-        foreach (var (tool, toolSpeed) in validTools!)
+        // We need to check for nullability because of surgeries that dont require a tool, like Cavity Implants
+        if (validTools?.Count > 0)
         {
-            RaiseLocalEvent(tool, ref usedEv);
-            if (usedEv.Cancelled)
-                return;
+            foreach (var (tool, toolSpeed) in validTools)
+            {
+                RaiseLocalEvent(tool, ref usedEv);
+                if (usedEv.Cancelled)
+                    return;
 
-            speed *= toolSpeed;
-        }
+                speed *= toolSpeed;
+            }
 
-        if (_net.IsServer)
-        {
-            foreach (var tool in validTools.Keys)
+            if (_net.IsServer)
             {
-                if (TryComp(tool, out SurgeryToolComponent? toolComp) &&
-                    toolComp.EndSound != null)
+                foreach (var tool in validTools.Keys)
                 {
-                    _audio.PlayEntity(toolComp.StartSound, user, tool);
+                    if (TryComp(tool, out SurgeryToolComponent? toolComp) &&
+                        toolComp.EndSound != null)
+                    {
+                        _audio.PlayEntity(toolComp.StartSound, user, tool);
+                    }
                 }
             }
         }
@@ -622,7 +631,7 @@ private void OnSurgeryTargetStepChosen(Entity<SurgeryTargetComponent> ent, ref S
 
         var ev = new SurgeryDoAfterEvent(args.Surgery, args.Step);
         // TODO: Move 2 seconds to a field of SurgeryStepComponent
-        var duration = 2f * speed;
+        var duration = 2f / speed;
         if (TryComp(user, out SurgerySpeedModifierComponent? surgerySpeedMod)
             && surgerySpeedMod is not null)
             duration = duration / surgerySpeedMod.SpeedModifier;
diff --git a/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageChangeEvent.cs b/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageChangeEvent.cs
new file mode 100644
index 00000000000..aca17499ce5
--- /dev/null
+++ b/Content.Shared/_Shitmed/Surgery/SurgeryStepDamageChangeEvent.cs
@@ -0,0 +1,9 @@
+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/Tools/BoneGelComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/BoneGelComponent.cs
index 456c507793e..4c479e9b036 100644
--- a/Content.Shared/_Shitmed/Surgery/Tools/BoneGelComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Tools/BoneGelComponent.cs
@@ -6,7 +6,9 @@ namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
 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/ISurgeryToolComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/ISurgeryToolComponent.cs
index c2b0676ffdf..ecf06bd4703 100644
--- a/Content.Shared/_Shitmed/Surgery/Tools/ISurgeryToolComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Tools/ISurgeryToolComponent.cs
@@ -5,13 +5,15 @@ public interface ISurgeryToolComponent
     [DataField]
     public string ToolName { get; }
 
-    // Mostly intended for discardable or non-reusable tools.
+    /// <summary>
+    ///     Field intended for discardable or non-reusable tools.
+    /// </summary>
     [DataField]
     public bool? Used { get; set; }
 
     /// <summary>
-    /// GoobStation: 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.
+    ///     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/SurgeryToolComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolComponent.cs
index 0295d5192b9..6c78e9e3789 100644
--- a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolComponent.cs
@@ -16,8 +16,8 @@ public sealed partial class SurgeryToolComponent : Component
 }
 
 /// <summary>
-/// GoobStation: 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.
+///     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
index 4d1c1048653..0c2ff64722c 100644
--- a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolConditionsSystem.cs
+++ b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolConditionsSystem.cs
@@ -9,7 +9,7 @@
 namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
 
 /// <summary>
-/// GoobStation: Prevents using esword or welder when off, laser when no charges.
+///  Prevents using esword or welder when off, laser when no charges.
 /// </summary>
 public sealed class SurgeryToolConditionsSystem : EntitySystem
 {
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolExamineSystem.cs b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolExamineSystem.cs
index 7426d4f88fa..753623127bb 100644
--- a/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolExamineSystem.cs
+++ b/Content.Shared/_Shitmed/Surgery/Tools/SurgeryToolExamineSystem.cs
@@ -7,7 +7,7 @@
 namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
 
 /// <summary>
-/// GoobStation: Examining a surgical or ghetto tool shows everything it can be used for.
+///     Examining a surgical or ghetto tool shows everything it can be used for.
 /// </summary>
 public sealed class SurgeryToolExamineSystem : EntitySystem
 {
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/TendingComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/TendingComponent.cs
index 51596ae0002..1d4d9325a63 100644
--- a/Content.Shared/_Shitmed/Surgery/Tools/TendingComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Tools/TendingComponent.cs
@@ -3,7 +3,7 @@
 namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
 
 /// <summary>
-/// GoobStation: Like Hemostat but lets ghetto tools be used differently for clamping and tending wounds.
+///     Like Hemostat but lets ghetto tools be used differently for clamping and tending wounds.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class TendingComponent : Component, ISurgeryToolComponent
diff --git a/Content.Shared/_Shitmed/Surgery/Tools/TweezersComponent.cs b/Content.Shared/_Shitmed/Surgery/Tools/TweezersComponent.cs
index 068fb5bf463..0b5f6f65e07 100644
--- a/Content.Shared/_Shitmed/Surgery/Tools/TweezersComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Tools/TweezersComponent.cs
@@ -3,7 +3,7 @@
 namespace Content.Shared._Shitmed.Medical.Surgery.Tools;
 
 /// <summary>
-/// GoobStation: Like Hemostat but lets ghetto tools be used differently for clamping and removing organs.
+///     Like Hemostat but lets ghetto tools be used differently for clamping and removing organs.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 public sealed partial class TweezersComponent : Component, ISurgeryToolComponent
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index a5d964a5240..28f4f4b5780 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -41,7 +41,7 @@
     - state: lung-l
     - state: lung-r
   - type: Organ
-    slotId: lungs # GoobStation
+    slotId: lungs # Shitmed
   - type: Lung
   - type: Metabolizer
     removeEmpty: true
@@ -74,7 +74,7 @@
   - type: Sprite
     state: stomach
   - type: Organ
-    slotId: stomach # GoobStation
+    slotId: stomach # Shitmed
   - type: SolutionContainerManager
     solutions:
       stomach:
@@ -118,14 +118,14 @@
   - type: Sprite
     state: liver
   - type: Organ
-    slotId: liver # GoobStation
+    slotId: liver # Shitmed
   - type: Metabolizer
     maxReagents: 1
     metabolizerTypes: [ Animal ]
     groups:
     - id: Alcohol
       rateModifier: 0.1
-  - type: Liver # GoobStation
+  - type: Liver # Shitmed
   - type: Tag # goob edit
     tags:
     - Meat
@@ -144,7 +144,7 @@
   - type: Sprite
     state: heart-on
   - type: Organ
-    slotId: heart # GoobStation
+    slotId: heart # Shitmed
   - type: Metabolizer
     maxReagents: 2
     metabolizerTypes: [ Animal ]
@@ -152,18 +152,15 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
-<<<<<<< HEAD
-  - type: Item
-    size: Small
-    heldPrefix: heart
-=======
-  - type: Heart # GoobStation
+  - type: Heart # Shitmed
   - type: Tag # goob edit
     tags:
     - Meat
     - Organ
     - Heart
->>>>>>> f00571107f (surgery update (animal and moth surgery) (#882))
+  - type: Item
+    size: Small
+    heldPrefix: heart
 
 - type: entity
   id: OrganAnimalKidneys
@@ -176,7 +173,7 @@
     - state: kidney-l
     - state: kidney-r
   - type: Organ
-    slotId: kidneys # GoobStation
+    slotId: kidneys # Shitmed
   - type: Metabolizer
     maxReagents: 5
     metabolizerTypes: [ Animal ]
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index 1a610f18514..04796164674 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -34,7 +34,7 @@
   - type: Sprite
     sprite: Mobs/Species/Arachnid/organs.rsi
     state: stomach
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: stomach
   - type: Stomach
     updateInterval: 1.5
@@ -63,7 +63,7 @@
     layers:
       - state: lung-l
       - state: lung-r
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: lungs
   - type: Lung
   - type: Metabolizer
@@ -109,17 +109,14 @@
     - id: Medicine
     - id: Poison
     - id: Narcotic
-<<<<<<< HEAD
-=======
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: heart
-  - type: Heart # GoobStation: Lets you transplant spider hearts into other species
+  - type: Heart # Shitmed: Lets you transplant spider hearts into other species
   - type: Tag # goob edit
     tags:
     - Meat
     - Organ
     - Heart
->>>>>>> f00571107f (surgery update (animal and moth surgery) (#882))
 
 - type: entity
   id: OrganArachnidLiver
@@ -140,17 +137,14 @@
     groups:
     - id: Alcohol
       rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink
-<<<<<<< HEAD
-=======
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: liver
-  - type: Liver # GoobStation
+  - type: Liver # Shitmed
   - type: Tag # goob edit
     tags:
     - Meat
     - Organ
     - Liver
->>>>>>> f00571107f (surgery update (animal and moth surgery) (#882))
 
 - type: entity
   id: OrganArachnidKidneys
@@ -183,20 +177,17 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
-<<<<<<< HEAD
-  - type: Item
-    size: Small
-    heldPrefix: eyeballs
-=======
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: eyes
-  - type: Eyes # GoobStation
+  - type: Eyes # Shitmed
   - type: Tag # goob edit
     tags:
     - Meat
     - Organ
     - Eyes
->>>>>>> f00571107f (surgery update (animal and moth surgery) (#882))
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
 
 - type: entity
   id: OrganArachnidTongue
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 45d8e4d533a..369581645a3 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -36,9 +36,9 @@
     heldPrefix: brain
   - type: Sprite
     state: brain
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: Brain
-  - type: Brain # GoobStation
+  - type: Brain # Shitmed
   - type: SolutionContainerManager
     solutions:
       organ:
@@ -65,7 +65,7 @@
     layers:
       - state: eyeball-l
       - state: eyeball-r
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: eyes
   - type: Tag # goob edit
     tags:
@@ -90,7 +90,7 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: stomach
   - type: Stomach
   - type: Metabolizer
@@ -117,7 +117,7 @@
   components:
   - type: Sprite
     state: lungs
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: lungs
   - type: Lung 
   - type: Metabolizer
diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
index 4c9c47d13a5..969470b07c2 100644
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -2,7 +2,7 @@
   id: OrganMothStomach
   parent: [OrganAnimalStomach, OrganHumanStomach]
   categories: [ HideSpawnMenu ]
-  name: moth stomach # GoobStation
+  name: moth stomach # Shitmed
   components:
   - type: Stomach
     specialDigestible:
diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
index daabdcc716f..84450ad74dd 100644
--- a/Resources/Prototypes/Body/Organs/slime.yml
+++ b/Resources/Prototypes/Body/Organs/slime.yml
@@ -37,7 +37,7 @@
       size: Small
       heldPrefix: brain
 
-      
+
 - type: entity
   id: OrganSlimeLungs
   parent: BaseHumanOrgan
@@ -49,7 +49,7 @@
     layers:
       - state: lung-l-slime
       - state: lung-r-slime
-  - type: Organ # GoobStation
+  - type: Organ # Shitmed
     slotId: lungs
   - type: Lung
     alert: LowNitrogen
diff --git a/Resources/Prototypes/Body/Organs/vox.yml b/Resources/Prototypes/Body/Organs/vox.yml
index 4036ae011dc..e3fda8a57be 100644
--- a/Resources/Prototypes/Body/Organs/vox.yml
+++ b/Resources/Prototypes/Body/Organs/vox.yml
@@ -3,7 +3,7 @@
   parent: OrganHumanLungs
   description: "The blue, anaerobic lungs of a vox, they intake nitrogen to breathe. Any form of gaseous oxygen is lethally toxic if breathed in."
   suffix: "vox"
-  name: vox lungs # GoobStation
+  name: vox lungs # Shitmed
   components:
   - type: Sprite
     sprite: Mobs/Species/Vox/organs.rsi
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index 3b0f2540963..a0e5e341cba 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -26,6 +26,14 @@
     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
@@ -33,7 +41,7 @@
   name: cyborg left arm
   components:
   - type: BodyPart
-    partType: Hand
+    partType: Arm # Shitmed Change
     symmetry: Left
   - type: Sprite
     state: borg_l_arm
@@ -51,7 +59,7 @@
   name: cyborg right arm
   components:
   - type: BodyPart
-    partType: Hand
+    partType: Arm # Shitmed Change
     symmetry: Right
   - type: Sprite
     state: borg_r_arm
@@ -80,6 +88,7 @@
     - Trash
     - BorgLeg
     - BorgLLeg
+  - type: MovementBodyPart # Shitmed Change
 
 - type: entity
   id: RightLegBorg
@@ -98,6 +107,7 @@
     - Trash
     - BorgLeg
     - BorgRLeg
+  - type: MovementBodyPart # Shitmed Change
 
 - type: entity
   id: LightHeadBorg
diff --git a/Resources/Prototypes/Body/Prototypes/arachnid.yml b/Resources/Prototypes/Body/Prototypes/arachnid.yml
index 7036d7babf8..43062719303 100644
--- a/Resources/Prototypes/Body/Prototypes/arachnid.yml
+++ b/Resources/Prototypes/Body/Prototypes/arachnid.yml
@@ -23,7 +23,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
     right arm:
       part: RightArmArachnid
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/diona.yml b/Resources/Prototypes/Body/Prototypes/diona.yml
index 691f055ff43..01335587b4e 100644
--- a/Resources/Prototypes/Body/Prototypes/diona.yml
+++ b/Resources/Prototypes/Body/Prototypes/diona.yml
@@ -16,7 +16,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
       organs:
         stomach: OrganDionaStomachNymph
         lungs: OrganDionaLungsNymph
diff --git a/Resources/Prototypes/Body/Prototypes/dwarf.yml b/Resources/Prototypes/Body/Prototypes/dwarf.yml
index a580a02531b..5dc18ef739c 100644
--- a/Resources/Prototypes/Body/Prototypes/dwarf.yml
+++ b/Resources/Prototypes/Body/Prototypes/dwarf.yml
@@ -17,7 +17,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
       organs:
         heart: OrganDwarfHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Prototypes/gingerbread.yml b/Resources/Prototypes/Body/Prototypes/gingerbread.yml
index eaf6cf06da7..c5823dbce6b 100644
--- a/Resources/Prototypes/Body/Prototypes/gingerbread.yml
+++ b/Resources/Prototypes/Body/Prototypes/gingerbread.yml
@@ -17,7 +17,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
       organs:
         heart: OrganHumanHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Prototypes/human.yml b/Resources/Prototypes/Body/Prototypes/human.yml
index 8b601530a9d..00f1a3c31b5 100644
--- a/Resources/Prototypes/Body/Prototypes/human.yml
+++ b/Resources/Prototypes/Body/Prototypes/human.yml
@@ -18,7 +18,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
       organs:
         heart: OrganHumanHeart
         lungs: OrganHumanLungs
diff --git a/Resources/Prototypes/Body/Prototypes/moth.yml b/Resources/Prototypes/Body/Prototypes/moth.yml
index 7bd7f0774c3..c28192e249c 100644
--- a/Resources/Prototypes/Body/Prototypes/moth.yml
+++ b/Resources/Prototypes/Body/Prototypes/moth.yml
@@ -23,7 +23,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
     right arm:
       part: RightArmMoth
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/primate.yml b/Resources/Prototypes/Body/Prototypes/primate.yml
index 3b34fcab2ec..db7a1f6680a 100644
--- a/Resources/Prototypes/Body/Prototypes/primate.yml
+++ b/Resources/Prototypes/Body/Prototypes/primate.yml
@@ -3,7 +3,7 @@
   name: "primate"
   root: torso
   slots:
-    head: # GoobStation: put pun pun into a humans body
+    head: # Shitmed: put pun pun into a humans body
       part: HeadAnimal
       connections:
       - torso
@@ -15,7 +15,7 @@
       connections:
       - hands
       - legs
-      - head # GoobStation
+      - head # Shitmed
       organs:
         lungs: OrganAnimalLungs
         stomach: OrganAnimalStomach
diff --git a/Resources/Prototypes/Body/Prototypes/reptilian.yml b/Resources/Prototypes/Body/Prototypes/reptilian.yml
index 234351059c4..7f53d3e3ceb 100644
--- a/Resources/Prototypes/Body/Prototypes/reptilian.yml
+++ b/Resources/Prototypes/Body/Prototypes/reptilian.yml
@@ -23,7 +23,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
     right arm:
       part: RightArmReptilian
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/skeleton.yml b/Resources/Prototypes/Body/Prototypes/skeleton.yml
index f622c133aaf..856518cc98c 100644
--- a/Resources/Prototypes/Body/Prototypes/skeleton.yml
+++ b/Resources/Prototypes/Body/Prototypes/skeleton.yml
@@ -14,7 +14,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
     right arm:
       part: RightArmSkeleton
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/slime.yml b/Resources/Prototypes/Body/Prototypes/slime.yml
index ff7d9d62d62..b74c239b850 100644
--- a/Resources/Prototypes/Body/Prototypes/slime.yml
+++ b/Resources/Prototypes/Body/Prototypes/slime.yml
@@ -14,7 +14,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
       organs:
         core: SentientSlimeCore
         lungs: OrganSlimeLungs
diff --git a/Resources/Prototypes/Body/Prototypes/vox.yml b/Resources/Prototypes/Body/Prototypes/vox.yml
index 54f66af81ba..d919a2a91a3 100644
--- a/Resources/Prototypes/Body/Prototypes/vox.yml
+++ b/Resources/Prototypes/Body/Prototypes/vox.yml
@@ -17,7 +17,7 @@
       - left arm
       - right leg
       - left leg
-      - head # GoobStation
+      - head # Shitmed
       organs:
         heart: OrganHumanHeart
         lungs: OrganVoxLungs
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
index 7bba170657b..0d2262b2000 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -30,7 +30,7 @@
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key: # GoobStation
+      enum.SurgeryUIKey.Key: # Shitmed
         type: SurgeryBui
   - type: Sprite
     scale: 0.9, 0.9
diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
index e56d01d357d..2a7d3a79896 100644
--- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
+++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml
@@ -180,4 +180,4 @@
       types:
         Slash: 200
 
-# Shitmed Change End
\ No newline at end of file
+# Shitmed Change End
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index ac0a4b79b48..11a3a8d0c6c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -560,7 +560,7 @@
     - Mouse
   - type: Body
     prototype: Mothroach
-  - type: SurgeryTarget # GoobStation
+  - type: SurgeryTarget # Shitmed
   - type: TypingIndicator
     proto: moth
   - type: Destructible
@@ -579,7 +579,7 @@
     interfaces:
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
-      enum.SurgeryUIKey.Key: # GoobStation
+      enum.SurgeryUIKey.Key: # Shitmed
         type: SurgeryBui
   - type: InventorySlots
   - type: Inventory
@@ -869,8 +869,8 @@
     - Passive
   - type: Body
     prototype: AnimalRuminant
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
@@ -951,8 +951,8 @@
       task: RuminantCompound
   - type: Body
     prototype: AnimalHemocyanin
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
@@ -1044,8 +1044,8 @@
     - Passive
   - type: Body
     prototype: AnimalRuminant
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
@@ -1267,8 +1267,8 @@
   abstract: true
   components:
   - type: CombatMode
-  - type: SurgeryTarget # GoobStation
-  - type: Targeting # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: Targeting # Shitmed
   - type: Inventory
     templateId: monkey
     speciesId: monkey
@@ -1323,7 +1323,7 @@
   - type: Body
     prototype: Primate
     requiredLegs: 1 # TODO: More than 1 leg
-  - type: UserInterface # GoobStation: Add SurgeryUIKey on top of stripping ui
+  - type: UserInterface # Shitmed: Add SurgeryUIKey on top of stripping ui
     interfaces:
       enum.StrippingUiKey.Key:
         type: StrippableBoundUserInterface
@@ -1643,8 +1643,8 @@
   components:
   - type: Body
     prototype: Mouse
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
@@ -2335,8 +2335,8 @@
   - type: CombatMode
   - type: Body
     prototype: AnimalHemocyanin
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 6b8c3d8810c..52d9de26b28 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -86,10 +86,10 @@
       interactFailureString: petting-failure-carp
       interactFailureSound:
         path: /Audio/Effects/bite.ogg
-    - type: Body # GoobStation: Special carp organs
+    - type: Body # Shitmed: Special carp organs
       prototype: Carp
-    - type: SurgeryTarget # GoobStation
-    - type: UserInterface # GoobStation
+    - type: SurgeryTarget # Shitmed
+    - type: UserInterface # Shitmed
       interfaces:
         enum.SurgeryUIKey.Key:
           type: SurgeryBui
@@ -258,8 +258,8 @@
     - type: Body
       prototype: Bloodsucker
       requiredLegs: 1
-    - type: SurgeryTarget # GoobStation
-    - type: UserInterface # GoobStation
+    - type: SurgeryTarget # Shitmed
+    - type: UserInterface # Shitmed
       interfaces:
         enum.SurgeryUIKey.Key:
           type: SurgeryBui
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 931bf46a4ce..ac0c40676c0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -60,8 +60,8 @@
   - type: Body
     prototype: Rat
     requiredLegs: 1 # TODO: More than 1 leg
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
@@ -249,8 +249,8 @@
   - type: Body
     prototype: Rat
     requiredLegs: 1 # TODO: More than 1 leg
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index 37c1b2612fc..d822ee888a3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -93,8 +93,8 @@
   - type: Body
     prototype: Slimes
     requiredLegs: 1
-  - type: SurgeryTarget # GoobStation
-  - type: UserInterface # GoobStation
+  - type: SurgeryTarget # Shitmed
+  - type: UserInterface # Shitmed
     interfaces:
       enum.SurgeryUIKey.Key:
         type: SurgeryBui
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 2116405f142..8fc9f09bb15 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -78,9 +78,9 @@
   - type: DeleteOnTrigger
   - type: StaticPrice
     price: 0
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 0.45
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
     endSound:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
index fd64bffcbff..45f90f9603b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml
@@ -42,9 +42,9 @@
     damage:
       types:
         Piercing: 3
-  - type: Tending # GoobStation
+  - type: Tending # Shitmed
     speed: 0.55
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
     endSound:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index b6d1ddecb22..c1c3fc9877c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -8,9 +8,9 @@
   - type: Item # TODO add inhand sprites for all utensils
     sprite: Objects/Misc/utensils.rsi
   - type: SpaceGarbage
-  - type: Tweezers # GoobStation: Any utensil can poorly remove organs
+  - type: Tweezers # Shitmed: Any utensil can poorly remove organs
     speed: 0.2
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
     endSound:
@@ -57,7 +57,7 @@
     damage:
       types:
         Piercing: 5
-  - type: Tweezers # GoobStation: Forks are better than spoons
+  - type: Tweezers # Shitmed: Forks are better than spoons
     speed: 0.35
 
 - type: entity
@@ -71,7 +71,7 @@
   - type: Utensil
     types:
     - Fork
-  - type: Tweezers # GoobStation: Forks are better than spoons
+  - type: Tweezers # Shitmed: Forks are better than spoons
     speed: 0.35
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index c92f1b52530..fe7e0400af6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -40,11 +40,11 @@
   - type: Item
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     storedRotation: -90
-  - type: Retractor # GoobStation: Same as wirecutters
+  - type: Retractor # Shitmed: Same as wirecutters
     speed: 0.35
   - type: Hemostat
     speed: 0.6
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
     endSound:
@@ -96,9 +96,9 @@
         Piercing: 2
   - type: Item
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
-  - type: BoneSaw # GoobStation
+  - type: BoneSaw # Shitmed
     speed: 0.35
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index c36f6587407..e3c358b47af 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -136,7 +136,7 @@
     damage:
       types:
         Slash: 12
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 1.25
 
 - type: entity
@@ -149,7 +149,7 @@
     state: laser
   - type: Item
     heldPrefix: laser
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 1.5
   # TODO: prevent bleeding from incisions
 
@@ -188,15 +188,15 @@
     heldPrefix: hemostat
     sprite: Objects/Specific/Medical/Surgery/scissors.rsi # Shitmed Change
     storedRotation: 90
-  # Shitmed CHange
+  # Shitmed Change
   - type: SurgeryTool
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
     endSound:
       path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
   - type: Hemostat
-  - type: Tweezers # GoobStation
-  - type: Tending # GoobStation
+  - type: Tweezers # Shitmed
+  - type: Tending # Shitmed
 
 # Bone setter - Shitmed Change
 - type: entity
@@ -272,7 +272,7 @@
       path: /Audio/Weapons/bladeslice.ogg
   - type: Tool
     speedModifier: 0.5
-  - type: BoneSaw # GoobStation
+  - type: BoneSaw # Shitmed
     speed: 0.5
 
 - type: entity
@@ -293,7 +293,7 @@
       path: /Audio/Items/drill_hit.ogg
   - type: Tool
     speedModifier: 1.5
-  - type: BoneSaw # GoobStation
+  - type: BoneSaw # Shitmed
     speed: 1.5
 
 - type: entity
@@ -310,7 +310,7 @@
     attackRate: 1.5
   - type: Tool
     speedModifier: 2.0
-  - type: BoneSaw # GoobStation
+  - type: BoneSaw # Shitmed
     speed: 2
 
 # ORGANS - SHITMED
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index 78ba586fd5a..3fddd6b2884 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -31,9 +31,9 @@
       Steel: 15
   # FIXME: Used isnt actually implemented so its still unlimited.
   # Uncomment this when its implemented, and make sure it handles StackComponent right
-  #- type: Hemostat # GoobStation
+  #- type: Hemostat # Shitmed
   #  speed: 0.15
-  #- type: SurgeryTool # GoobStation
+  #- type: SurgeryTool # Shitmed
   #  used: true
   #  startSound:
   #    path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
index bb2a7450beb..31a6b8ef060 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
@@ -41,9 +41,9 @@
     size: Normal
     shape:
     - 0,0,0,1
-  - type: Tweezers # GoobStation
+  - type: Tweezers # Shitmed
     speed: 0.55
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound: /Audio/Items/crowbar.ogg
 
 # Standard (grey) Crowbar
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 6a3abea2c03..94f501260b8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -88,9 +88,9 @@
     radius: 1.1 #smallest possible
     color: orange
   - type: ItemTogglePointLight
-  - type: Cautery # GoobStation
+  - type: Cautery # Shitmed
     speed: 0.45
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       collection: lighterOnSounds
     endSound:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index 3c2d3a28746..46be9da7f83 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -41,9 +41,9 @@
     unlitIcon: match_unlit
     litIcon: match_lit
     burntIcon: match_burnt
-  - type: Cautery # GoobStation
+  - type: Cautery # Shitmed
     speed: 0.2
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/Weapons/Guns/Hits/energy_meat1.ogg
     endSound:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 77cc64eb680..d872b82b93b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -43,11 +43,11 @@
       Steel: 100
   - type: StaticPrice
     price: 30
-  - type: Retractor # GoobStation
+  - type: Retractor # Shitmed
     speed: 0.35
-  - type: Hemostat # GoobStation
+  - type: Hemostat # Shitmed
     speed: 0.6
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/Items/wirecutter.ogg
       params:
@@ -100,11 +100,11 @@
       Steel: 100
   - type: StaticPrice
     price: 30
-  - type: Retractor # GoobStation
+  - type: Retractor # Shitmed
     speed: 0.45
-  - type: Tending # GoobStation
+  - type: Tending # Shitmed
     speed: 0.65
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       collection: Screwdriver
     endSound:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index adf76533961..b834068ee9e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -105,9 +105,9 @@
     price: 40
   - type: IgnitionSource
     temperature: 700
-  - type: Cautery # GoobStation
+  - type: Cautery # Shitmed
     speed: 0.7
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       collection: Welder
     endSound:
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 7832a03b96d..3e3d9ade859 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -30,9 +30,9 @@
   - type: Appearance
   - type: StaticPrice
     price: 500
-  - type: Cautery # GoobStation
+  - type: Cautery # Shitmed
     speed: 0.9
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     endSound:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
 
@@ -70,9 +70,9 @@
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
-  - type: Cautery # GoobStation
+  - type: Cautery # Shitmed
     speed: 0.9
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     endSound:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
index 44889209696..8b4cbe5b967 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
@@ -21,10 +21,10 @@
     size: Normal
     sprite: Objects/Weapons/Melee/armblade.rsi
   - type: Prying
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 0.3
-  - type: BoneSaw # GoobStation
+  - type: BoneSaw # Shitmed
     speed: 0.75
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/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 64f4393ba93..48d840ef870 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -47,9 +47,9 @@
         maxVol: 300
   - type: UseDelay
     delay: 1
-  - type: BoneSaw # GoobStation
+  - type: BoneSaw # Shitmed
     speed: 0.5 # TODO: arm-mounted version becomes 0.65
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/Weapons/chainsawwield.ogg
     endSound:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 04d982aec79..72a8c957c62 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -71,11 +71,11 @@
   - type: Reflect
   - type: IgnitionSource
     temperature: 700
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 0.75
-  - type: Cautery # GoobStation: you have to be very, very careful to cauterize with it
+  - type: Cautery # Shitmed: you have to be very, very careful to cauterize with it
     speed: 0.2
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/Weapons/ebladehum.ogg
     endSound:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index e00e812f879..7f0ec0fea18 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -50,11 +50,11 @@
     stealGroup: FireAxe
   - type: IgniteOnMeleeHit
     fireStacks: -4
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 0.3
-  - type: BoneSaw # GoobStation
+  - type: BoneSaw # Shitmed
     speed: 0.5
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 219a5aba9cb..cca26e92138 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -27,9 +27,9 @@
       - Slicing
     useSound:
       path: /Audio/Items/Culinary/chop.ogg
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 0.65
-  - type: SurgeryTool # GoobStation
+  - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/scalpel1.ogg
     endSound:
@@ -81,9 +81,9 @@
     guides:
     - Chef
     - FoodRecipes
-  - type: Scalpel # GoobStation
+  - type: Scalpel # Shitmed
     speed: 0.3
-  - type: BoneSaw # GoobStation: Better than tg 25% because its a cleaver its meant to hack off limbs
+  - type: BoneSaw # Shitmed: Better than tg 25% because its a cleaver its meant to hack off limbs
     speed: 0.5
 
 - type: entity
diff --git a/Resources/Prototypes/_Goobstation/Body/Organs/Animal/space.yml b/Resources/Prototypes/_Shitmed/Body/Organs/Animal/space.yml
similarity index 100%
rename from Resources/Prototypes/_Goobstation/Body/Organs/Animal/space.yml
rename to Resources/Prototypes/_Shitmed/Body/Organs/Animal/space.yml
diff --git a/Resources/Prototypes/_Goobstation/Body/Parts/animal.yml b/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml
similarity index 94%
rename from Resources/Prototypes/_Goobstation/Body/Parts/animal.yml
rename to Resources/Prototypes/_Shitmed/Body/Parts/animal.yml
index 005a1744099..91c452ee961 100644
--- a/Resources/Prototypes/_Goobstation/Body/Parts/animal.yml
+++ b/Resources/Prototypes/_Shitmed/Body/Parts/animal.yml
@@ -15,7 +15,7 @@
   id: BaseCarpPart
   components:
   - type: Sprite
-    sprite: _Goobstation/Mobs/Aliens/Carps/carp_parts.rsi
+    sprite: _Shitmed/Mobs/Aliens/Carps/carp_parts.rsi
 
 - type: entity
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/_Goobstation/Body/Prototypes/Animal/carp.yml b/Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/carp.yml
similarity index 100%
rename from Resources/Prototypes/_Goobstation/Body/Prototypes/Animal/carp.yml
rename to Resources/Prototypes/_Shitmed/Body/Prototypes/Animal/carp.yml
diff --git a/Resources/Prototypes/_Goobstation/status_effects.yml b/Resources/Prototypes/_Shitmed/status_effects.yml
similarity index 93%
rename from Resources/Prototypes/_Goobstation/status_effects.yml
rename to Resources/Prototypes/_Shitmed/status_effects.yml
index 5e62d994021..7ffdb3e907c 100644
--- a/Resources/Prototypes/_Goobstation/status_effects.yml
+++ b/Resources/Prototypes/_Shitmed/status_effects.yml
@@ -1,3 +1,3 @@
 - type: statusEffect
   id: BreathingImmunity
-  alwaysAllowed: true # Used by space animal lungs to work on anything
+  alwaysAllowed: true # Used by space animal lungs to work on anything
\ No newline at end of file
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index 1eeaf93b095..293b3c8311f 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -36,7 +36,7 @@
 
 - type: statusEffect
   id: PressureImmunity
-  alwaysAllowed: true # GoobStation: Used by space animal heart to work on anything
+  alwaysAllowed: true # Shitmed: Used by space animal heart to work on anything
 
 - type: statusEffect
   id: Muted
diff --git a/Resources/Textures/_Goobstation/Mobs/Aliens/Carps/carp_parts.rsi/meta.json b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
similarity index 100%
rename from Resources/Textures/_Goobstation/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
rename to Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/meta.json
diff --git a/Resources/Textures/_Goobstation/Mobs/Aliens/Carps/carp_parts.rsi/tail.png b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Mobs/Aliens/Carps/carp_parts.rsi/tail.png
rename to Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/tail.png
diff --git a/Resources/Textures/_Goobstation/Mobs/Aliens/Carps/carp_parts.rsi/torso.png b/Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png
similarity index 100%
rename from Resources/Textures/_Goobstation/Mobs/Aliens/Carps/carp_parts.rsi/torso.png
rename to Resources/Textures/_Shitmed/Mobs/Aliens/Carps/carp_parts.rsi/torso.png