From 38e55644f3a27d63f7be15b1d8e837a2d0457832 Mon Sep 17 00:00:00 2001 From: Sensum <121913313+HWSensum@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:30:38 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF=D1=82=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=B0=D0=B3=D1=83=D0=BB=D1=8F=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/modules/reagents/recipe/coagulant_recipe | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe diff --git a/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe b/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe new file mode 100644 index 00000000000..57187c74299 --- /dev/null +++ b/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe @@ -0,0 +1,11 @@ +/datum/chemical_reaction/medicine/coagulant + results = list(/datum/reagent/medicine/coagulant = 1) // чтобы жизнь мёдом не казалась + required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/water = 1) + required_temp = 300 + optimal_temp = 500 + overheat_temp = 620 + optimal_ph_min = 7 + optimal_ph_max = 9 + thermic_constant = 15 + H_ion_release = 0.20 + reaction_tags = REACTION_TAG_EASY | REACTION_TAG_HEALING From 3f736f67542feeee3b15c17bd536ffcd1ef9b618 Mon Sep 17 00:00:00 2001 From: Sensum <121913313+HWSensum@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:32:27 +0300 Subject: [PATCH 2/4] Update coagulant_recipe --- .../master_files/code/modules/reagents/recipe/coagulant_recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe b/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe index 57187c74299..ae944325044 100644 --- a/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe +++ b/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe @@ -8,4 +8,4 @@ optimal_ph_max = 9 thermic_constant = 15 H_ion_release = 0.20 - reaction_tags = REACTION_TAG_EASY | REACTION_TAG_HEALING + reaction_tags = REACTION_TAG_HARD | REACTION_TAG_HEALING From 4c79158ac9467f4a821a667034cdc31eb1447b43 Mon Sep 17 00:00:00 2001 From: Sensum <121913313+HWSensum@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:39:22 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=BE,=20=D1=87=D1=82=D0=BE=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=B4=D0=BE=D0=B3=D0=BB=D1=8F=D0=B4=D0=B5=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reagents/recipe/{coagulant_recipe => coagulant_recipe.dm} | 0 tgstation.dme | 1 + 2 files changed, 1 insertion(+) rename tff_modular/master_files/code/modules/reagents/recipe/{coagulant_recipe => coagulant_recipe.dm} (100%) diff --git a/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe b/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe.dm similarity index 100% rename from tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe rename to tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe.dm diff --git a/tgstation.dme b/tgstation.dme index 23c43f07d47..fb82d414eed 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7708,6 +7708,7 @@ #include "tff_modular\master_files\code\modules\mob\living\carbon\human\human_buckle.dm" #include "tff_modular\master_files\code\modules\mod\_module.dm" #include "tff_modular\master_files\code\modules\mod\mod_clothes.dm" +#include "tff_modular\master_files\code\modules\reagents\recipe\coagulant_recipe.dm" #include "tff_modular\modules\autoaccent\code\autoaccent.dm" #include "tff_modular\modules\blueshield-mod\code.dm" #include "tff_modular\modules\blueshield-rearm\code\holster.dm" From 38213fa739dd95670de5ff2b038a4b02714d787d Mon Sep 17 00:00:00 2001 From: Iajret <8430839+Iajret@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:12:49 +0300 Subject: [PATCH 4/4] Update tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe.dm --- .../code/modules/reagents/recipe/coagulant_recipe.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe.dm b/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe.dm index ae944325044..1557b7cb6ec 100644 --- a/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe.dm +++ b/tff_modular/master_files/code/modules/reagents/recipe/coagulant_recipe.dm @@ -1,5 +1,5 @@ /datum/chemical_reaction/medicine/coagulant - results = list(/datum/reagent/medicine/coagulant = 1) // чтобы жизнь мёдом не казалась + results = list(/datum/reagent/medicine/coagulant = 1) required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/water = 1) required_temp = 300 optimal_temp = 500