diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 130ab21d7d0..d3966f32467 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -371,6 +371,15 @@ isGlass = FALSE list_reagents = list("menthol" = 100) +/obj/item/reagent_containers/food/drinks/bottle/grenadine + name = "Jester Grenadine" + desc = "Contains 0% real cherries!" + icon_state = "grenadine" + isGlass = TRUE + list_reagents = list("grenadine" = 100) + foodtype = FRUIT + + ////////////////////////// MOLOTOV /////////////////////// /obj/item/reagent_containers/food/drinks/bottle/molotov name = "molotov cocktail" diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 8b35b22fb6a..c989c01067e 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -141,8 +141,8 @@ /datum/chemical_reaction/tequila_sunrise name = "tequila Sunrise" id = "tequilasunrise" - results = list("tequilasunrise" = 3) - required_reagents = list("tequila" = 2, "orangejuice" = 1) + results = list("tequilasunrise" = 5) + required_reagents = list("tequila" = 2, "orangejuice" = 2, "grenadine" = 1) /datum/chemical_reaction/toxins_special name = "Toxins Special" @@ -662,3 +662,4 @@ id = "mojito" results = list("mojito" = 5) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) + diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index b2556d63592..845941a99a3 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -431,6 +431,7 @@ obj/machinery/chem_dispenser/proc/work_animation() "shamblers", "sugar", "orangejuice", + "grenadine", "limejuice", "tomatojuice", "lemonjuice", diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index b9009304467..58fdd19b9fe 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -561,10 +561,10 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/tequila_sunrise name = "Tequila Sunrise" id = "tequilasunrise" - description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" + description = "Tequila, Grenadine, and Orange Juice." color = "#FFE48C" // rgb: 255, 228, 140 boozepwr = 45 - taste_description = "oranges" + taste_description = "oranges with a hint of pomegranate" glass_icon_state = "tequilasunriseglass" glass_name = "tequila Sunrise" glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 5d5fdf2183e..29bf1769bfd 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -721,7 +721,6 @@ description = "Milk for cool kids." color = "#7D4E29" taste_description = "chocolate milk" - /datum/reagent/consumable/menthol name = "Menthol" id = "menthol" @@ -731,3 +730,12 @@ glass_icon_state = "glass_green" glass_name = "glass of menthol" glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation." + +/datum/reagent/consumable/grenadine + name = "Grenadine" + id = "grenadine" + description = "Not cherry flavored!" + color = "#EA1D26" + taste_description = "sweet pomegranates" + glass_name = "glass of grenadine" + glass_desc = "Delicious flavored syrup." \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ef41c7951e0..561dbf27333 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -180,7 +180,7 @@ Borg Shaker recharge_time = 3 accepts_reagent_upgrades = FALSE - reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") + reagent_ids = list("beer", "orangejuice", "grenadine" ,"limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale") /obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user) return //Can't inject stuff with a shaker, can we? //not with that attitude diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index aadf21b4691..f46d20b524e 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -20,6 +20,7 @@ /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, /obj/item/reagent_containers/food/drinks/bottle/limejuice = 4, + /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4, /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, @@ -39,5 +40,5 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" - charges = list(59, 4, 0)//of 178 standard, 12 contraband - init_charges = list(59, 4, 0) + charges = list(61, 4, 0)//of 182 standard, 12 contraband + init_charges = list(61, 4, 0) \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index cc92784c8e1..f5997bfc3bf 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ