From 8ee865a7a4e8bd6adfa453fe59babb5d72d43a14 Mon Sep 17 00:00:00 2001
From: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
Date: Tue, 26 Nov 2024 10:02:25 -0400
Subject: [PATCH] Minor Shitmed Bugfixes (#971)

* full fucking send

* ope forgot to remove the EE scripts

* fix test

* fix shitcode fail

* DELTA THAT VALUE IS NULLABLE

* whoopsie daysie

* fixed???

* chat is this real

* bugfixes

* more bugfixes

* goobmed
---
 .../_Shitmed/Surgery/SanitizedComponent.cs    | 10 ++++++++
 .../Surgery/SharedSurgerySystem.Steps.cs      | 13 ++++++----
 Resources/Prototypes/Body/Parts/silicon.yml   |  5 ++--
 .../_Shitmed/Body/Parts/cybernetic.yml        |  4 +++-
 .../_Shitmed/Body/Parts/generic.yml           | 24 +++++++++++++++++++
 5 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 Content.Shared/_Shitmed/Surgery/SanitizedComponent.cs

diff --git a/Content.Shared/_Shitmed/Surgery/SanitizedComponent.cs b/Content.Shared/_Shitmed/Surgery/SanitizedComponent.cs
new file mode 100644
index 0000000000..a9ebb11d37
--- /dev/null
+++ b/Content.Shared/_Shitmed/Surgery/SanitizedComponent.cs
@@ -0,0 +1,10 @@
+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
index ea7d184f2e..cc097358df 100644
--- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
+++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs
@@ -125,13 +125,16 @@ public abstract partial class SharedSurgerySystem
 
         //if (!HasComp<ForcedSleepingComponent>(args.Body))
         //    //RaiseLocalEvent(args.Body, new MoodEffectEvent("SurgeryPain"));
-            // No mood on Goob :(
+        // No mood on Goob :(
         if (!_inventory.TryGetSlotEntity(args.User, "gloves", out var _)
-        || !_inventory.TryGetSlotEntity(args.User, "mask", out var _))
+            || !_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);
+            if (!HasComp<SanitizedComponent>(args.User))
+            {
+                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);
+            }
         }
     }
 
diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml
index d10e7a6991..ba185c49c9 100644
--- a/Resources/Prototypes/Body/Parts/silicon.yml
+++ b/Resources/Prototypes/Body/Parts/silicon.yml
@@ -94,6 +94,7 @@
       left foot:
         id: "left foot"
         type: Foot
+  - type: MovementBodyPart
   - type: Sprite
     state: borg_l_leg
   - type: Icon
@@ -103,9 +104,6 @@
     - Trash
     - BorgLeg
     - BorgLLeg
-  - type: MovementBodyPart # Shitmed Change: 25% speed boost
-    walkSpeed: 3.125
-    sprintSpeed: 5.625
 
 - type: entity
   id: RightLegBorg
@@ -120,6 +118,7 @@
       right foot:
         id: "right foot"
         type: Foot
+  - type: MovementBodyPart
   - type: Sprite
     state: borg_r_leg
   - type: Icon
diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml b/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml
index 6e85a42b87..c4298ed57c 100644
--- a/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml
+++ b/Resources/Prototypes/_Shitmed/Body/Parts/cybernetic.yml
@@ -154,6 +154,7 @@
   - type: BodyPart
     onAdd:
     - type: NoSlip
+    - type: ProtectedFromStepTriggers
 
 - type: entity
   parent: RightLegCybernetic
@@ -166,4 +167,5 @@
     sprintSpeed: 5.625
   - type: BodyPart
     onAdd:
-    - type: NoSlip
\ No newline at end of file
+    - type: NoSlip
+    - type: ProtectedFromStepTriggers
diff --git a/Resources/Prototypes/_Shitmed/Body/Parts/generic.yml b/Resources/Prototypes/_Shitmed/Body/Parts/generic.yml
index d01c105fd6..2f82d6cbd5 100644
--- a/Resources/Prototypes/_Shitmed/Body/Parts/generic.yml
+++ b/Resources/Prototypes/_Shitmed/Body/Parts/generic.yml
@@ -3,12 +3,24 @@
   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
@@ -27,12 +39,24 @@
   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