diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index de005307139..effc060444e 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -323,14 +323,6 @@ results = list(/datum/reagent/consumable/ethanol/thirteenloko = 3) required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/limejuice = 1) -/datum/chemical_reaction/chocolatepudding - results = list(/datum/reagent/consumable/chocolatepudding = 20) - required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 10, /datum/reagent/consumable/eggyolk = 5) - -/datum/chemical_reaction/vanillapudding - results = list(/datum/reagent/consumable/vanillapudding = 20) - required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/milk = 5, /datum/reagent/consumable/eggyolk = 5) - /datum/chemical_reaction/cherryshake results = list(/datum/reagent/consumable/cherryshake = 3) required_reagents = list(/datum/reagent/consumable/cherryjelly = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index ceed56e01d9..694af29d5d8 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -19,6 +19,14 @@ new /obj/item/reagent_containers/food/snacks/tofu(location) return +/datum/chemical_reaction/chocolatepudding + results = list(/datum/reagent/consumable/chocolatepudding = 20) + required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 10, /datum/reagent/consumable/eggyolk = 5) + +/datum/chemical_reaction/vanillapudding + results = list(/datum/reagent/consumable/vanillapudding = 20) + required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/milk = 5, /datum/reagent/consumable/eggyolk = 5) + /datum/chemical_reaction/chocolate_bar required_reagents = list(/datum/reagent/consumable/soymilk = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/sugar = 2) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index acbc59c3df3..0b4be3be873 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -709,28 +709,6 @@ ..() . = 1 -/datum/reagent/consumable/chocolatepudding - name = "Chocolate Pudding" - description = "A great dessert for chocolate lovers." - color = "#800000" - quality = DRINK_VERYGOOD - nutriment_factor = 4 * REAGENTS_METABOLISM - taste_description = "sweet chocolate" - glass_icon_state = "chocolatepudding" - glass_name = "chocolate pudding" - glass_desc = "Tasty." - -/datum/reagent/consumable/vanillapudding - name = "Vanilla Pudding" - description = "A great dessert for vanilla lovers." - color = "#FAFAD2" - quality = DRINK_VERYGOOD - nutriment_factor = 4 * REAGENTS_METABOLISM - taste_description = "sweet vanilla" - glass_icon_state = "vanillapudding" - glass_name = "vanilla pudding" - glass_desc = "Tasty." - /datum/reagent/consumable/cherryshake name = "Cherry Shake" description = "A cherry flavored milkshake." @@ -940,11 +918,11 @@ /datum/reagent/consumable/bungojuice name = "Bungo Juice" color = "#F9E43D" - description = "Exotic! You feel like you are on vactation already." + description = "Exotic! You feel like you are on vacation already." taste_description = "succulent bungo" glass_icon_state = "glass_yellow" glass_name = "glass of bungo juice" - glass_desc = "Exotic! You feel like you are on vactation already." + glass_desc = "Exotic! You feel like you are on vacation already." /datum/reagent/consumable/prunomix name = "pruno mixture" diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 52a3bade891..a78e71e6efc 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -798,3 +798,25 @@ color = "#78280A" // rgb: 120 40, 10 taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground. taste_description = "smokey sweetness" + +/datum/reagent/consumable/chocolatepudding + name = "Chocolate Pudding" + description = "A great dessert for chocolate lovers." + color = "#800000" + quality = DRINK_VERYGOOD + nutriment_factor = 4 * REAGENTS_METABOLISM + taste_description = "sweet chocolate" + glass_icon_state = "chocolatepudding" + glass_name = "chocolate pudding" + glass_desc = "Tasty." + +/datum/reagent/consumable/vanillapudding + name = "Vanilla Pudding" + description = "A great dessert for vanilla lovers." + color = "#FAFAD2" + quality = DRINK_VERYGOOD + nutriment_factor = 4 * REAGENTS_METABOLISM + taste_description = "sweet vanilla" + glass_icon_state = "vanillapudding" + glass_name = "vanilla pudding" + glass_desc = "Tasty."