From 14e6ad66356e0abe1aed3fc31f3e51597e185354 Mon Sep 17 00:00:00 2001 From: Interrobang01 <113810873+Interrobang01@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:30:37 -0700 Subject: [PATCH] Reverted some of the mechanical changes of #16157 (#18555) * Reverted functional changes from PR 16157 * Unreverted Epinephrine recipe Diethylamine removal because really, Epinephrine is complicated enough. * Unreverted that Phenol change because 1. Phenol isn't actually used except in Epinephrine so it literally does not matter and 2. having Phenol use these common ingredients causes git add .fungit add . reaction conflicts to happen which is good * Reverted Diphesomethingsomething recipe change because Diphesomething is pretty useless and so doesn't need such an incredibly difficult recipe --- Resources/Prototypes/Reagents/medicine.yml | 2 +- .../Prototypes/Recipes/Reactions/chemicals.yml | 8 +++++--- .../Prototypes/Recipes/Reactions/medicine.yml | 14 +++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index f3b507fa9c..f78e11a294 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -918,7 +918,7 @@ - !type:HealthChange damage: types: - Caustic: -1 + Caustic: -3 - !type:HealthChange conditions: - !type:ReagentThreshold diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 8f85f2f4ea..73cba1db3c 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -6,7 +6,7 @@ Nitrogen: amount: 1 products: - Ammonia: 3 + Ammonia: 4 - type: reaction id: Diethylamine @@ -40,7 +40,7 @@ Oxygen: amount: 1 products: - Acetone: 3 + Acetone: 2 - type: reaction id: FoamingAgent @@ -358,6 +358,8 @@ id: SodiumCarbonate impact: Medium reactants: + Ammonia: + amount: 1 TableSalt: amount: 1 Carbon: @@ -365,4 +367,4 @@ Oxygen: amount: 1 products: - SodiumCarbonate: 3 + SodiumCarbonate: 4 diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index b1c83b88db..57f7e3fc88 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -108,8 +108,6 @@ id: Dexalin reactants: Oxygen: - amount: 1 - Hydrogen: amount: 2 Plasma: amount: 1 @@ -286,10 +284,8 @@ amount: 1 Plasma: amount: 1 - Fluorine: - amount: 1 products: - Lexorin: 3 + Lexorin: 2 - type: reaction id: Lipozine @@ -331,10 +327,8 @@ - type: reaction id: Ultravasculine reactants: - Dylovene: - amount: 1 - Sodium: - amount: 1 + Histamine: + amount: 2 Plasma: amount: 1 catalyst: true @@ -389,6 +383,8 @@ - type: reaction id: Sigynate + impact: Medium + minTemp: 370 reactants: SodiumCarbonate: amount: 1