From 01269be2606a7bfd60742d38930397c473cada35 Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Fri, 10 Jan 2025 13:05:06 -0500 Subject: [PATCH] Add Anesthesia to NO2, Nocturine, and ChloralHydrate --- Content.Shared/_DV/Surgery/AnesthesiaComponent.cs | 7 ++----- .../Prototypes/Entities/Mobs/NPCs/simplemob.yml | 2 ++ Resources/Prototypes/Entities/Mobs/Species/base.yml | 1 + Resources/Prototypes/Reagents/gases.yml | 12 ++++++++++++ Resources/Prototypes/Reagents/narcotics.yml | 5 +++++ Resources/Prototypes/Reagents/toxins.yml | 10 ++++++++++ Resources/Prototypes/_DV/status_effects.yml | 3 +++ 7 files changed, 35 insertions(+), 5 deletions(-) diff --git a/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs b/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs index 6a8e4fdd598..944adc2036e 100644 --- a/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs +++ b/Content.Shared/_DV/Surgery/AnesthesiaComponent.cs @@ -1,12 +1,9 @@ using Robust.Shared.GameStates; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; namespace Content.Shared._DV.Surgery; /// /// Exists for use as a status effect. Allows surgical operations to not cause immense pain. /// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause] -public sealed partial class AnesthesiaComponent : Component -{ -} +[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 index f400680eb01..0525ec58586 100644 --- 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 index 65400ad69f5..969e8a24650 100644 --- 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 index caa2e5acdc6..634b2c473ed 100644 --- 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 index 370d294f246..4eeeb099974 100644 --- 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 index bf5193bb841..ee131747ce2 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -69,6 +69,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 index cf1e8e25639..2fe5275d05a 100644 --- 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