From ca387d2bdbd12d6aea4deca5dfe96c9c7f4c646b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 23 Dec 2019 20:51:37 -0500 Subject: [PATCH 1/4] Update others.dm --- code/modules/reagents/chemistry/recipes/others.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index eaae548d68..ad349ea926 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -142,9 +142,9 @@ /datum/chemical_reaction/fermis_plush name = "Fermis plush" id = "fermis_plush" - required_reagents = list("sugar" = 10, "blood" = 10, "stable_plasma" = 10) + required_reagents = list("caramel" = 10, "blood" = 10, "stable_plasma" = 10) mob_react = FALSE - required_temp = 400 + required_temp = 300 /datum/chemical_reaction/fermis_plush/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) From ceeab2db394dee1e9b2f10ed8fddb8676607cd88 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 23 Dec 2019 21:00:29 -0500 Subject: [PATCH 2/4] no longer carbon burning --- code/modules/food_and_drinks/recipes/food_mixtures.dm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 404f3a6061..07732a415d 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -84,14 +84,6 @@ required_temp = 413 mob_react = FALSE -/datum/chemical_reaction/caramel_burned - name = "Caramel burned" - id = "caramel_burned" - results = list("carbon" = 1) - required_reagents = list("caramel" = 1) - required_temp = 483 - mob_react = FALSE - /datum/chemical_reaction/cheesewheel name = "Cheesewheel" id = "cheesewheel" @@ -182,4 +174,4 @@ name = "BBQ Sauce" id = "bbqsauce" results = list("bbqsauce" = 5) - required_reagents = list("ash" = 1, "tomatojuice" = 1, "salglu_solution" = 3, "blackpepper" = 1) \ No newline at end of file + required_reagents = list("ash" = 1, "tomatojuice" = 1, "salglu_solution" = 3, "blackpepper" = 1) From f06e20234b1acdfc2b7a4eb6b72d8be8fcb1eb19 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 4 Jan 2020 06:17:49 -0500 Subject: [PATCH 3/4] Hey guess who looked all over and got told were these files are --- .../code/modules/reagents/chemistry/recipes/fermi.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index fcde3a8b79..140f4832bd 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -105,7 +105,7 @@ name = "Eigenstasium" id = "eigenstate" results = list("eigenstate" = 1) - required_reagents = list("bluespace" = 1, "stable_plasma" = 1, "sugar" = 1) + required_reagents = list("bluespace" = 1, "stable_plasma" = 1, "caramel" = 1) mix_message = "the reaction zaps suddenly!" //FermiChem vars: OptimalTempMin = 350 // Lower area of bell curve for determining heat based rate reactions From e0e3f1547c75e36616c684e379ab339cb9ac081a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 4 Jan 2020 18:09:51 -0500 Subject: [PATCH 4/4] Update fermi.dm --- .../code/modules/reagents/chemistry/recipes/fermi.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index 140f4832bd..5ea1fc77be 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -504,7 +504,7 @@ name = "secretcatchem" id = "secretcatchem" results = list("secretcatchem" = 5) - required_reagents = list("stable_plasma" = 1, "sugar" = 1, "cream" = 1, "clonexadone" = 1)//Yes this will make a kitty if you don't lucky guess. It'll eat all your reagents too. + required_reagents = list("stable_plasma" = 1, "caramel" = 1, "cream" = 1, "clonexadone" = 1)//Yes this will make a kitty if you don't lucky guess. It'll eat all your reagents too. required_catalysts = list("SDGF" = 1) required_temp = 500 mix_message = "the reaction gives off a meow!"