From 19b24c40a804c14bbb0126ebce42e33539e6667e Mon Sep 17 00:00:00 2001 From: Jordie Date: Sat, 3 Mar 2018 17:11:17 +1100 Subject: [PATCH] Merge pull request #36059 from ShizCalev/cuba_libre Adds rum and coke, corrects Cuba Libre recipe --- .../food_and_drinks/recipes/drinks_recipes.dm | 10 ++++++++-- .../chemistry/reagents/alcohol_reagents.dm | 17 ++++++++++++++--- 2 files changed, 22 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 3ac4ec1cab..65a08d8074 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -78,11 +78,17 @@ results = list("gintonic" = 3) required_reagents = list("gin" = 2, "tonic" = 1) +/datum/chemical_reaction/rum_coke + name = "Rum and Coke" + id = "rumcoke" + results = list("rumcoke" = 3) + required_reagents = list("rum" = 2, "cola" = 1) + /datum/chemical_reaction/cuba_libre name = "Cuba Libre" id = "cubalibre" - results = list("cubalibre" = 3) - required_reagents = list("rum" = 2, "cola" = 1) + results = list("cubalibre" = 4) + required_reagents = list("rumcoke" = 3, "limejuice" = 1) /datum/chemical_reaction/martini name = "Classic Martini" diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index ebf423cbf5..fc606a9e92 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -372,16 +372,27 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "Gin and Tonic" glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman." +/datum/reagent/consumable/ethanol/rum_coke + name = "Rum and Coke" + id = "rumcoke" + description = "Rum, mixed with cola." + taste_description = "cola" + boozepwr = 40 + color = "#3E1B00" + glass_icon_state = "whiskeycolaglass" + glass_name = "Rum and Coke" + glass_desc = "The classic go-to of space-fratboys." + /datum/reagent/consumable/ethanol/cuba_libre name = "Cuba Libre" id = "cubalibre" - description = "Rum, mixed with cola. Viva la revolucion." + description = "Viva la Revolucion! Viva Cuba Libre!" color = "#3E1B00" // rgb: 62, 27, 0 boozepwr = 50 - taste_description = "cola" + taste_description = "a refreshing marriage of citrus and rum" glass_icon_state = "cubalibreglass" glass_name = "Cuba Libre" - glass_desc = "A classic mix of rum and cola." + glass_desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!" /datum/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/M) if(M.mind && M.mind.has_antag_datum(/datum/antagonist/rev)) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries.