cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36059 from ShizCalev/cuba_libre

Browse Source 
Adds rum and coke, corrects Cuba Libre recipe
This commit is contained in:
Jordie
2018-03-03 17:11:17 +11:00
committed by GitHub
parent d62dc31587 65ef7324fe
commit ea3486b44f
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/food_and_drinks/recipes/drinks_recipes.dm
View File

@@ -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"

17
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View File

@@ -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.