Replace ForcedSleep with Anesthesia for surgery (#2684)

* Replace ForcedSleeping with Anesthesia for surgery checks * Add Anesthesia to NO2, Nocturine, and ChloralHydrate
DeltaV-Station · Jan 11, 2025 · 056c98c · 056c98c
1 parent 6ebe75b
commit 056c98c
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 2 deletions.
diff --git a/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs b/Content.Server/_Shitmed/Medical/Surgery/SurgerySystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
+using Content.Shared._DV.Surgery; // DeltaV: expanded anesthesia
 using Content.Shared._Shitmed.Medical.Surgery;
 using Content.Shared._Shitmed.Medical.Surgery.Conditions;
 using Content.Shared._Shitmed.Medical.Surgery.Effects.Step;
@@ -143,7 +144,7 @@ private void OnSurgeryStepDamage(Entity<SurgeryTargetComponent> ent, ref Surgery
     private void OnSurgeryDamageChange(Entity<SurgeryDamageChangeEffectComponent> ent, ref SurgeryStepEvent args) // DeltaV
     {
         var damageChange = ent.Comp.Damage;
-        if (HasComp<ForcedSleepingComponent>(args.Body))
+        if (HasComp<AnesthesiaComponent>(args.Body)) // DeltaV: anesthesia
             damageChange = damageChange * ent.Comp.SleepModifier;
 
         SetDamage(args.Body, damageChange, 0.5f, args.User, args.Part);
@@ -162,7 +163,7 @@ private void OnSurgerySpecialDamageChange(Entity<SurgerySpecialDamageChangeEffec
 
     private void OnStepScreamComplete(Entity<SurgeryStepEmoteEffectComponent> ent, ref SurgeryStepEvent args)
     {
-        if (HasComp<ForcedSleepingComponent>(args.Body))
+        if (HasComp<AnesthesiaComponent>(args.Body)) // DeltaV: anesthesia
             return;
 
         _chat.TryEmoteWithChat(args.Body, ent.Comp.Emote);

diff --git a/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs b/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Surgery;
+
+/// <summary>
+///     Exists for use as a status effect. Allows surgical operations to not cause immense pain.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class AnesthesiaComponent : Component;
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -30,6 +30,7 @@
     - RadiationProtection
     - Drowsiness
     - Adrenaline
+    - Anesthesia # DeltaV - Anesthesia
   - type: Buckle
   - type: StandingState
   - type: Tag
@@ -108,6 +109,7 @@
     - RadiationProtection
     - Drowsiness
     - Adrenaline
+    - Anesthesia # DeltaV - Anesthesia
   - type: Bloodstream
     bloodMaxVolume: 150
   - type: MobPrice

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -142,6 +142,7 @@
     - SuppressAddiction # DeltaV - Psych med addictions system
     - InPain # DeltaV - Pain system
     - SuppressPain # DeltaV - Pain system
+    - Anesthesia # DeltaV - Anesthesia
   - type: Body
     prototype: Human
     requiredLegs: 2

diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
@@ -284,6 +284,18 @@
         component: ForcedSleeping
         time: 200 # This reeks, but I guess it works LMAO
         type: Add
+      - !type:GenericStatusEffect # DeltaV: anesthesia changes
+        conditions:
+        - !type:ReagentThreshold
+          reagent: NitrousOxide
+          min: 1
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
+        key: Anesthesia
+        component: Anesthesia
+        time: 200
+        type: Add
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold

diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
@@ -334,6 +334,11 @@
         component: ForcedSleeping
         refresh: false
         type: Add
+      - !type:GenericStatusEffect # DeltaV: anesthesia
+        key: Anesthesia
+        component: Anesthesia
+        refresh: false
+        type: Add
 
 - type: reagent
   id: MuteToxin

diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
@@ -70,6 +70,16 @@
         time: 4
         type: Add
         refresh: false
+      - !type:GenericStatusEffect # DeltaV: anesthesia
+        conditions:
+        - !type:ReagentThreshold
+          reagent: ChloralHydrate
+          min: 10
+        key: Anesthesia
+        component: Anesthesia
+        refresh: false
+        time: 4.0
+        type: Add
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold

diff --git a/Resources/Prototypes/_DV/status_effects.yml b/Resources/Prototypes/_DV/status_effects.yml
@@ -9,3 +9,6 @@
 
 - type: statusEffect
   id: SuppressPain
+
+- type: statusEffect
+  id: Anesthesia