diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm index da994143..b6cbd68a 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm @@ -131,3 +131,29 @@ else M.nutrition += 1 ..() + +/datum/reagent/consumable/milkshake_vanilla + name = "Vanilla Milkshake" + description = "A plain vanilla milkshake. A classic." + color = "#DFDFDF" + taste_description = "creamy vanilla" + quality = DRINK_VERYGOOD + nutriment_factor = 6 * REAGENTS_METABOLISM + glass_icon_state = "milkshake_vanilla" + glass_name = "vanilla milkshake" + glass_desc = "Guess they fixed the milkshake machine after all, huh?" + shot_glass_icon_state = "shotglasscream" + hydration = 3 + +/datum/reagent/consumable/milkshake_chocolate + name = "Chocolate Milkshake" + description = "It's like chocolate milk, but for even cooler kids." + color = "#7D4E29" + taste_description = "creamy chocolate" + quality = DRINK_VERYGOOD + nutriment_factor = 8 * REAGENTS_METABOLISM + glass_icon_state = "milkshake_chocolate" + glass_name = "chocolate milkshake" + glass_desc = "Nothing better than cream AND cocoa!" + shot_glass_icon_state = "shotglassbrown" + hydration = 3 \ No newline at end of file diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm index 02de3787..12cd73aa 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm @@ -40,4 +40,16 @@ name = "Snakebite" id = /datum/reagent/consumable/snakebite results = list(/datum/reagent/consumable/snakebite = 3) - required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/lipoifier = 1) \ No newline at end of file + required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/lipoifier = 1) + +/datum/chemical_reaction/milkshake_vanilla + name = "Vanilla Milkshake" + id = /datum/reagent/consumable/milkshake_vanilla + results = list(/datum/reagent/consumable/milkshake_vanilla = 3) + required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/vanilla = 1) + +/datum/chemical_reaction/milkshake_chocolate + name = "Chocolate Milkshake" + id = /datum/reagent/consumable/milkshake_chocolate + results = list(/datum/reagent/consumable/milkshake_chocolate = 3) + required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/coco = 1) \ No newline at end of file diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/misc/food_lefthand.dmi index 9203a100..6d744320 100644 Binary files a/icons/mob/inhands/misc/food_lefthand.dmi and b/icons/mob/inhands/misc/food_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi index 6db67d27..8571345e 100644 Binary files a/icons/mob/inhands/misc/food_righthand.dmi and b/icons/mob/inhands/misc/food_righthand.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 8330e841..fe48d1da 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ