diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 23ce932f06..10199e9e46 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -216,6 +216,9 @@ /datum/reagent/ethanol/cuba_libre price_tag = 4 +/datum/reagent/ethanol/rum_and_cola + price_tag = 4 + /datum/reagent/ethanol/demonsblood price_tag = 4 diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index c67f816419..4414e02363 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/code/modules/food/drinkingglass/metaglass.dm @@ -23,7 +23,7 @@ icon = R.glass_icon_file else icon = initial(icon) - + if(R.glass_icon_state) icon_state = R.glass_icon_state else @@ -373,6 +373,10 @@ Drinks Data glass_icon_state = "martiniglass" glass_center_of_mass = list("x"=17, "y"=8) +/datum/reagent/ethanol/rum_and_cola + glass_icon_state = "rumcolaglass" + glass_center_of_mass = list("x"=16, "y"=8) + /datum/reagent/ethanol/cuba_libre glass_icon_state = "cubalibreglass" glass_center_of_mass = list("x"=16, "y"=8) diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 2102c2881e..8af513f342 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -185,11 +185,18 @@ required_reagents = list("gin" = 2, "tonic" = 1) result_amount = 3 +/decl/chemical_reaction/instant/drinks/rum_and_cola + name = "Rum and Cola" + id = "rumandcola" + result = "rumandcola" + required_reagents = list("rum" = 2, "cola" = 1) + result_amount = 3 + /decl/chemical_reaction/instant/drinks/cuba_libre name = "Cuba Libre" id = "cubalibre" result = "cubalibre" - required_reagents = list("rum" = 2, "cola" = 1) + required_reagents = list("rumcola" = 3, "limejuice" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/martini @@ -329,14 +336,14 @@ name = "Long Island Iced Tea" id = "longislandicedtea" result = "longislandicedtea" - required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3) + required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumcoke" = 3) result_amount = 6 /decl/chemical_reaction/instant/drinks/icedtea name = "Long Island Iced Tea" id = "longislandicedtea" result = "longislandicedtea" - required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3) + required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumcoke" = 3) result_amount = 6 /decl/chemical_reaction/instant/drinks/threemileisland diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 4f549c5c1b..16c7ad946b 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -2970,12 +2970,23 @@ /datum/reagent/ethanol/cuba_libre name = "Cuba Libre" id = "cubalibre" - description = "Rum, mixed with cola. Viva la revolucion." - taste_description = "cola" + description = "Rum, mixed with cola and a splash of lime. Viva la revolucion." + taste_description = "cola with lime" color = "#3E1B00" strength = 30 glass_name = "Cuba Libre" + glass_desc = "A classic mix of rum, cola, and lime." + +/datum/reagent/ethanol/rum_and_cola + name = "Rum and Cola" + id = "rumandcola" + description = "A classic mix of sugar with more sugar." + taste_description = "cola" + color = "#3E1B00" + strength = 30 + + glass_name = "rum and cola" glass_desc = "A classic mix of rum and cola." /datum/reagent/ethanol/demonsblood diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 24e8b94966..e7aebe140f 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ