From: Admiral-Obvious-001 <89495925+Admiral-Obvious-001@users.noreply.github.com> Date: Tue, 29 Jul 2025 18:52:42 +0000 (-0700) Subject: Retry of Advanced Chem Tweaks (#38811) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0606ed585140c2e23b860421f7d5e2fb7bd18f1e;p=space-station-14.git Retry of Advanced Chem Tweaks (#38811) * Changed Head Branch Due To Broken Merge * Changed Head Branch Due To Broken Merge * Readds the removal of bic/advanced mix. * TFW Breaking changes break changes * TFW Breaking changes break changes --- diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index dfecb112d5..f0ea5581ae 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -142,10 +142,9 @@ metabolisms: Medicine: effects: - - !type:HealthChange + - !type:EvenHealthChange damage: - groups: - Brute: -2 + Brute: -1.5 - !type:HealthChange conditions: - !type:ReagentThreshold @@ -845,6 +844,7 @@ color: "#520e30" metabolisms: Medicine: + metabolismRate: 0.25 effects: - !type:HealthChange conditions: @@ -853,15 +853,15 @@ max: 30 damage: groups: - Toxin: -3 - Brute: 0.5 + Toxin: -1.5 + Brute: 0.25 - !type:HealthChange conditions: - !type:ReagentThreshold min: 30 damage: groups: - Toxin: -1 + Toxin: -0.5 Brute: 3 - !type:AdjustReagent conditions: @@ -971,18 +971,19 @@ color: "#e0a5b9" metabolisms: Medicine: + metabolismRate: 0.1 effects: - !type:HealthChange damage: types: - Caustic: -3 + Caustic: -0.6 # 6 per u - !type:HealthChange conditions: - !type:ReagentThreshold - min: 16 + min: 21 damage: types: - Heat: 2 + Heat: 0.2 - !type:Jitter conditions: - !type:ReagentThreshold @@ -1026,18 +1027,19 @@ color: "#283332" metabolisms: Medicine: + metabolismRate: 0.1 effects: - !type:HealthChange damage: types: - Slash: -3 + Slash: -0.6 # 6 Per u - !type:HealthChange conditions: - !type:ReagentThreshold - min: 12 + min: 21 damage: types: - Cold: 3 + Cold: 1.5 #15 per u - type: reagent id: Puncturase @@ -1049,19 +1051,20 @@ color: "#b9bf93" metabolisms: Medicine: + metabolismRate: 0.1 effects: - !type:HealthChange damage: types: - Piercing: -4 - Blunt: 0.1 + Piercing: -0.6 # 6 per u + Blunt: 0.05 # 0.5 per u - !type:HealthChange conditions: - !type:ReagentThreshold - min: 11 + min: 21 damage: types: - Blunt: 5 + Blunt: 1 # 10 per u plus base effect - type: reagent id: Bruizine @@ -1073,18 +1076,19 @@ color: "#ff3636" metabolisms: Medicine: + metabolismRate: 0.1 effects: - !type:HealthChange damage: types: - Blunt: -3.5 + Blunt: -0.6 # 6 per u - !type:HealthChange conditions: - !type:ReagentThreshold - min: 10.5 + min: 19 damage: types: - Poison: 4 + Poison: 1.5 # 15 per u - type: reagent id: Holywater @@ -1179,12 +1183,13 @@ color: "#8147ff" metabolisms: Medicine: + metabolismRate: 0.1 effects: # heals shocks and removes shock chems - !type:HealthChange damage: types: - Shock: -4 + Shock: -0.5 # 5 per u - !type:AdjustReagent reagent: Licoxide amount: -4 @@ -1198,14 +1203,14 @@ - !type:HealthChange conditions: - !type:ReagentThreshold - min: 12 + min: 15.5 damage: types: - Cold: 2 + Cold: 0.2 # 2 per u but lethal with cooling OD effect below - !type:AdjustTemperature conditions: - !type:ReagentThreshold - min: 12 + min: 15.5 amount: -30000 - !type:Jitter conditions: diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index f710f5c471..10508fc48b 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -445,39 +445,6 @@ products: Bruizine: 2 -- type: reaction - id: BicarLacerinol # mixing any two brute medications will make Razorium - impact: Medium - reactants: - Lacerinol: - amount: 1 - Bicaridine: - amount: 1 - products: - Razorium: 1 - -- type: reaction - id: BicarPuncturase # mixing any two brute medications will make Razorium - impact: Medium - reactants: - Puncturase: - amount: 1 - Bicaridine: - amount: 1 - products: - Razorium: 1 - -- type: reaction - id: BicarBruizine # mixing any two brute medications will make Razorium - impact: Medium - reactants: - Bruizine: - amount: 1 - Bicaridine: - amount: 1 - products: - Razorium: 1 - - type: reaction id: BruizineLacerinol # mixing any two brute medications will make Razorium impact: Medium