From 7062dc964b25cb934a63f6815a760fd20ee9847c Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Tue, 10 Aug 2021 13:11:00 +0800 Subject: [PATCH 1/4] Update drinks_recipes.dm --- .../food_and_drinks/recipes/drinks_recipes.dm | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 723daa04b5..3e46e1a64d 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -1032,3 +1032,32 @@ results = list(/datum/reagent/consumable/ethanol/rotgut = 5) required_reagents = list(/datum/reagent/space_cleaner = 1, /datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/oil = 1, /datum/reagent/consumable/ethanol = 1) +/datum/chemical_reaction/nukavictory + name = "Nuka Victory" + id = /datum/reagent/consumable/ethanol/nukavictory + results = list(/datum/reagent/consumable/ethanol/nukavictory = 2) + required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/consumable/ethanol/thirteenloko = 1) + +/datum/chemical_reaction/nukaquartz + name = "Nuka Quartz" + id = /datum/reagent/consumable/ethanol/nukaquartz + results = list(/datum/reagent/consumable/ethanol/nukaquartz = 3) + required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/silicon = 1, /datum/reagent/consumable/sugar = 1) + +/datum/chemical_reaction/nukacherry + name = "Nuka Quartz" + id = /datum/reagent/consumable/nukacherry + results = list(/datum/reagent/consumable/nukacherry = 4) + required_reagents = list(/datum/reagent/consumable/nuka_cola = 3, /datum/reagent/consumable/cherryjelly = 1) + +/datum/chemical_reaction/nukalove + name = "Nuka Love" + id = /datum/reagent/consumable/ethanol/nukalove + results = list(/datum/reagent/consumable/ethanol/nukalove = 2) + required_reagents = list(/datum/reagent/consumable/nukacherry = 1, /datum/chemical_reaction/nukaquartz = 1) + +/datum/chemical_reaction/nukaquantum + name = "Nuka Quantum" + id = /datum/reagent/consumable/ethanol/nukaquantum + results = list(/datum/reagent/consumable/ethanol/nukaquantum = 3) + required_reagents = list(/datum/reagent/consumable/nuka_cola = 2, /datum/reagent/uranium = 1, /datum/reagent/bluespace = 1, /datum/reagent/consumable/bluecherryjelly= 1) From cc309282170f2eb3bef3f96a29727f4762b04e46 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Tue, 10 Aug 2021 13:14:27 +0800 Subject: [PATCH 2/4] Update drinks_recipes.dm --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 3e46e1a64d..6e7916e969 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -1045,7 +1045,7 @@ required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/silicon = 1, /datum/reagent/consumable/sugar = 1) /datum/chemical_reaction/nukacherry - name = "Nuka Quartz" + name = "Nuka Cherry" id = /datum/reagent/consumable/nukacherry results = list(/datum/reagent/consumable/nukacherry = 4) required_reagents = list(/datum/reagent/consumable/nuka_cola = 3, /datum/reagent/consumable/cherryjelly = 1) @@ -1059,5 +1059,5 @@ /datum/chemical_reaction/nukaquantum name = "Nuka Quantum" id = /datum/reagent/consumable/ethanol/nukaquantum - results = list(/datum/reagent/consumable/ethanol/nukaquantum = 3) + results = list(/datum/reagent/consumable/ethanol/nukaquantum = 3) ////results in only 3 instead of 5 required_reagents = list(/datum/reagent/consumable/nuka_cola = 2, /datum/reagent/uranium = 1, /datum/reagent/bluespace = 1, /datum/reagent/consumable/bluecherryjelly= 1) From a0332bf401ceeb88d4fd9f4cdc06db0677ed5279 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Tue, 10 Aug 2021 13:28:23 +0800 Subject: [PATCH 3/4] Update drinks_recipes.dm --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 6e7916e969..dd53eb0e2d 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -1040,8 +1040,8 @@ /datum/chemical_reaction/nukaquartz name = "Nuka Quartz" - id = /datum/reagent/consumable/ethanol/nukaquartz - results = list(/datum/reagent/consumable/ethanol/nukaquartz = 3) + id = /datum/reagent/consumable/nukaquartz + results = list(/datum/reagent/consumable/nukaquartz = 3) required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/silicon = 1, /datum/reagent/consumable/sugar = 1) /datum/chemical_reaction/nukacherry From f33eff599b720d5a3a4c3320fe8bc2bd73999752 Mon Sep 17 00:00:00 2001 From: cornercube <81207946+cornercube@users.noreply.github.com> Date: Tue, 10 Aug 2021 13:43:06 +0800 Subject: [PATCH 4/4] Create drinks_recipes.dm --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index dd53eb0e2d..e3fe57a9df 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -1054,7 +1054,7 @@ name = "Nuka Love" id = /datum/reagent/consumable/ethanol/nukalove results = list(/datum/reagent/consumable/ethanol/nukalove = 2) - required_reagents = list(/datum/reagent/consumable/nukacherry = 1, /datum/chemical_reaction/nukaquartz = 1) + required_reagents = list(/datum/reagent/consumable/nukacherry = 1, /datum/reagent/consumable/nukaquartz = 1) /datum/chemical_reaction/nukaquantum name = "Nuka Quantum"