From e65f386de90fb4264da478929e57d485bb4dfdb9 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 23 Dec 2023 14:22:58 -0800 Subject: [PATCH 1/3] Makes eggnog not alcoholic --- .../food_and_drinks/recipes/drinks_recipes.dm | 12 +++++++++--- .../reagents/chemistry/reagents/alcohol_reagents.dm | 4 ++-- .../reagents/chemistry/reagents/drink_reagents.dm | 12 ++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 363e263ad4..ea2e8ab3a2 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -605,11 +605,17 @@ required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/coco = 1) mix_message = "The color changes as the mixture blends smoothly." -/datum/chemical_reaction/eggnog - name = "eggnog" +/datum/chemical_reaction/spiked_eggnog + name = "spiked eggnog" id = /datum/reagent/consumable/ethanol/eggnog results = list(/datum/reagent/consumable/ethanol/eggnog = 15) - required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/eggnog = 10) + +/datum/cheimcal_reaction/eggnog + name = "eggnog" + id = /datum/reagent/consumable/eggnog + results = list(/datum/reagent/consumable/eggnog = 10) + required_reagents = list(/datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 5) /datum/chemical_reaction/narsour name = "Nar'sour" diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 9982bc3722..a7dcf77441 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1457,7 +1457,7 @@ All effects don't start immediately, but rather get worse over time; the rate is ..() /datum/reagent/consumable/ethanol/eggnog - name = "Eggnog" + name = "Spiked Eggnog" description = "The traditional way to get absolutely hammered at a Christmas party." color = "#fcfdc6" // rgb: 252, 253, 198 nutriment_factor = 2 * REAGENTS_METABOLISM @@ -1465,7 +1465,7 @@ All effects don't start immediately, but rather get worse over time; the rate is quality = DRINK_VERYGOOD taste_description = "custard and alcohol" glass_icon_state = "nog3" - glass_name = "eggnog" + glass_name = "spiked eggnog" glass_desc = "The traditional way to get absolutely hammered at a Christmas party." /datum/reagent/consumable/ethanol/narsour diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index f4f5b90398..3b070531c3 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -1146,3 +1146,15 @@ taste_description = "bitter powder" glass_name = "glass of banana peel powder" description = "You took a banana peel... pulped it... baked it... Where are you going with this?" + +/datum/reagent/consumable/eggnog + name = "Eggnog" + description = "A creamy, rich beverage made out of whisked eggs, milk and sugar, for when you feel like celebrating the winter holidays." + color = "#fcfdc6" // rgb: 252, 253, 198 + nutriment_factor = 2 * REAGENTS_METABOLISM + boozepwr = 1 + quality = DRINK_VERYGOOD + taste_description = "custard" + glass_icon_state = "nog3" + glass_name = "eggnog" + glass_desc = "You can't egg-nore the holiday cheer all around you" \ No newline at end of file From 78982c2e6f1ac087056ce6fc63deac0e9e908e99 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 23 Dec 2023 14:49:46 -0800 Subject: [PATCH 2/3] typos and other such issues --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 2 +- code/modules/reagents/chemistry/reagents/drink_reagents.dm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index ea2e8ab3a2..ccf4f77256 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -611,7 +611,7 @@ results = list(/datum/reagent/consumable/ethanol/eggnog = 15) required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/eggnog = 10) -/datum/cheimcal_reaction/eggnog +/datum/chemical_reaction/eggnog name = "eggnog" id = /datum/reagent/consumable/eggnog results = list(/datum/reagent/consumable/eggnog = 10) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 3b070531c3..3bf3836b96 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -1152,9 +1152,8 @@ description = "A creamy, rich beverage made out of whisked eggs, milk and sugar, for when you feel like celebrating the winter holidays." color = "#fcfdc6" // rgb: 252, 253, 198 nutriment_factor = 2 * REAGENTS_METABOLISM - boozepwr = 1 quality = DRINK_VERYGOOD taste_description = "custard" glass_icon_state = "nog3" glass_name = "eggnog" - glass_desc = "You can't egg-nore the holiday cheer all around you" \ No newline at end of file + glass_desc = "You can't egg-nore the holiday cheer all around you" From 4ded9566139698f5f4bc3eef1eeb048f551b3dde Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 23 Dec 2023 14:57:34 -0800 Subject: [PATCH 3/3] actually it's 33% rum why is it not 33% the power --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index a7dcf77441..33a95570b3 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1461,7 +1461,7 @@ All effects don't start immediately, but rather get worse over time; the rate is description = "The traditional way to get absolutely hammered at a Christmas party." color = "#fcfdc6" // rgb: 252, 253, 198 nutriment_factor = 2 * REAGENTS_METABOLISM - boozepwr = 1 + boozepwr = 20 quality = DRINK_VERYGOOD taste_description = "custard and alcohol" glass_icon_state = "nog3"