From d6987343f7dd7be5d2eaecb5582f92d9afa146fa Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Thu, 4 Dec 2025 18:52:56 +0100 Subject: [PATCH] Change Ephedrine, Desoxyephedrine and Hyperzine properties (#41693) * merff (no numbness) * I can't feel a thing * Update self-damage and OD values * Missed a 5 --- .../Locale/en-US/store/uplink-catalog.ftl | 4 +- .../Entities/StatusEffects/body.yml | 4 + Resources/Prototypes/Reagents/narcotics.yml | 168 ++++++++++-------- 3 files changed, 104 insertions(+), 72 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index e7e6b42ae5..f3df1dcde0 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -403,10 +403,10 @@ uplink-nocturine-chemistry-bottle-name = Nocturine Bottle uplink-nocturine-chemistry-bottle-desc = A chemical that puts your target straight to sleep. uplink-stimpack-name = Hyperzine Injector -uplink-stimpack-desc = The legendary chemical produced by Donk Co. for the Syndicate. Injecting yourself with this will increase your run speed and let you recover from stuns faster for 30 seconds. +uplink-stimpack-desc = The legendary chemical produced by Donk Co. for the Syndicate. Injecting yourself with this will increase your run speed and let you recover from stuns faster for 60 seconds. uplink-stimkit-name = Hyperzine Injector Kit -uplink-stimkit-desc = A medkit containing 6 hyperzine microinjectors, which each inject you with enough hyperzine to last for 15 seconds. +uplink-stimkit-desc = A medkit containing 6 hyperzine microinjectors, which each inject you with enough hyperzine to last for 30 seconds. uplink-syndicate-segway-crate-name = Syndicate Segway uplink-syndicate-segway-crate-desc = Be an enemy of the corporation, in style! diff --git a/Resources/Prototypes/Entities/StatusEffects/body.yml b/Resources/Prototypes/Entities/StatusEffects/body.yml index 4c94804884..6b6f704a2c 100644 --- a/Resources/Prototypes/Entities/StatusEffects/body.yml +++ b/Resources/Prototypes/Entities/StatusEffects/body.yml @@ -27,3 +27,7 @@ - MobState - MobThresholds - type: PainNumbnessStatusEffect + +- type: entity + parent: PainNumbnessTraitStatusEffect + id: StatusEffectPainNumbness diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 48fc618857..aaaa62916c 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -4,43 +4,53 @@ group: Narcotics desc: reagent-desc-desoxyephedrine physicalDesc: reagent-physical-desc-translucent - contrabandSeverity: Major + contrabandSeverity: Minor flavor: bitter color: "#FAFAFA" boilingPoint: 212.0 # Dexosyephedrine vape when? meltingPoint: 170.0 metabolisms: Poison: + # Main effects effects: - !type:HealthChange damage: types: - Poison: 0.75 + Poison: 0.55 + Blunt: 0.5 + # OD - !type:HealthChange conditions: - !type:ReagentCondition reagent: Desoxyephedrine - min: 30 + min: 16 damage: types: - Poison: 2 # this is added to the base damage of the meth. + Poison: 3 # this is added to the base damage of the meth. Asphyxiation: 2 Narcotic: effects: + # Main effects - !type:MovementSpeedModifier - walkSpeedModifier: 1.35 - sprintSpeedModifier: 1.35 + walkSpeedModifier: 1.20 + sprintSpeedModifier: 1.20 + - !type:GenericStatusEffect + key: StaminaModifier # You are on meth. You keep going. + component: StaminaModifier + time: 3 + - !type:GenericStatusEffect + key: Adrenaline + component: IgnoreSlowOnDamage + time: 3 + # Side effects + - !type:Jitter - !type:GenericStatusEffect key: Stutter component: StutteringAccent - - !type:Jitter - !type:ModifyStatusEffect - effectProto: StatusEffectStunned - time: 3 - type: Remove - - !type:ModifyKnockdown - time: 3 - type: Remove + effectProto: StatusEffectPainNumbness + time: 2 + # Interactions - !type:ModifyStatusEffect conditions: - !type:ReagentCondition @@ -51,11 +61,12 @@ type: Remove Medicine: effects: + # Side effects - !type:ResetNarcolepsy conditions: - !type:ReagentCondition reagent: Desoxyephedrine - min: 20 + min: 5 - type: reagent id: Ephedrine @@ -63,7 +74,6 @@ group: Narcotics desc: reagent-desc-ephedrine physicalDesc: reagent-physical-desc-powdery - contrabandSeverity: Minor flavor: bitter color: "#D2FFFA" boilingPoint: 255.0 @@ -71,9 +81,25 @@ metabolisms: Narcotic: effects: + # Main effects - !type:MovementSpeedModifier - walkSpeedModifier: 1.25 - sprintSpeedModifier: 1.25 + walkSpeedModifier: 1.15 + sprintSpeedModifier: 1.15 + - !type:ModifyStatusEffect + effectProto: StatusEffectStunned + time: 1 + type: Remove + - !type:ModifyKnockdown + time: 1 + type: Remove + # Side effects + - !type:Jitter + - !type:PopupMessage + visualType: Medium + messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"] + type: Local + probability: 0.05 + # OD - !type:HealthChange conditions: - !type:ReagentCondition @@ -81,16 +107,9 @@ min: 20 damage: types: - Poison: 2 # this is added to the base damage of the meth. + Poison: 2 Asphyxiation: 2 - - !type:Jitter - - !type:ModifyStatusEffect - effectProto: StatusEffectStunned - time: 1 - type: Remove - - !type:ModifyKnockdown - time: 1 - type: Remove + # Interactions - !type:ModifyStatusEffect conditions: - !type:ReagentCondition @@ -99,18 +118,14 @@ effectProto: StatusEffectDrowsiness time: 10 type: Remove - - !type:PopupMessage - visualType: Medium - messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"] - type: Local - probability: 0.05 Medicine: effects: + # Side effects - !type:ResetNarcolepsy conditions: - !type:ReagentCondition reagent: Ephedrine - min: 30 + min: 15 - type: reagent id: Stimulants @@ -125,41 +140,38 @@ meltingPoint: 170.0 metabolisms: Narcotic: - metabolismRate: 1.0 effects: + # Main effects - !type:MovementSpeedModifier - walkSpeedModifier: 1.3 - sprintSpeedModifier: 1.3 - - !type:HealthChange - conditions: - - !type:ReagentCondition - reagent: Stimulants - min: 80 #please wait 3 minutes before using another stimpack - damage: - types: - Poison: 1 - - !type:AdjustReagent - conditions: - - !type:ReagentCondition - reagent: ChloralHydrate - min: 1 - reagent: ChloralHydrate - amount: -10 + walkSpeedModifier: 1.25 + sprintSpeedModifier: 1.25 - !type:ModifyStatusEffect effectProto: StatusEffectStunned - time: 3 + time: 3.5 type: Remove - !type:ModifyKnockdown - time: 3 + time: 3.5 type: Remove - - !type:GenericStatusEffect - key: StaminaModifier - component: StaminaModifier - time: 3 - !type:ModifyStatusEffect effectProto: StatusEffectForcedSleeping time: 3 type: Remove + - !type:GenericStatusEffect + key: Adrenaline + component: IgnoreSlowOnDamage + time: 3 + # Side effects + - !type:Jitter + # OD + - !type:HealthChange + conditions: + - !type:ReagentCondition + reagent: Stimulants + min: 50 + damage: + types: + Poison: 1 + # Interactions - !type:ModifyStatusEffect conditions: - !type:ReagentCondition @@ -168,22 +180,38 @@ effectProto: StatusEffectDrowsiness time: 10 type: Remove + - !type:AdjustReagent + conditions: + - !type:ReagentCondition + reagent: ChloralHydrate + min: 1 + reagent: ChloralHydrate + amount: -10 Medicine: - metabolismRate: 1.0 effects: - - !type:ResetNarcolepsy - - !type:SatiateHunger - factor: 1 - - !type:SatiateThirst - factor: 1 - - !type:HealthChange - conditions: - - !type:TotalDamageCondition - min: 70 # only heals when you're more dead than alive - damage: # heals at the same rate as tricordrazine, doesn't heal poison because if you OD'd I'm not giving you a safety net - groups: - Burn: -1 - Brute: -1 + # Main effects + - !type:ModifyBleed + amount: -1.5 + - !type:EvenHealthChange + conditions: + - !type:TotalDamageCondition + min: 70 # only heals when you're more dead than alive + damage: # Doesn't heal poison because if you OD'd I'm not giving you a safety net + Burn: -0.5 + Brute: -0.5 + - !type:HealthChange + conditions: + - !type:TotalDamageCondition + min: 95 # Just to bring you back from the brink of death + damage: + types: + Asphyxiation: -2 + # Side effects + - !type:ResetNarcolepsy + - !type:SatiateHunger + factor: 1 + - !type:SatiateThirst + factor: 1 - type: reagent id: THC -- 2.52.0