From 4a7f656823ef89d12f87b0f3a8ebb72faa4a02ec Mon Sep 17 00:00:00 2001 From: Hyacinth-OR <36283151+Hyacinth-OR@users.noreply.github.com> Date: Wed, 2 May 2018 11:12:37 -0700 Subject: [PATCH 1/5] Adds grenadine. --- .../food_and_drinks/drinks/drinks/bottle.dm | 9 ++++ .../food_and_drinks/recipes/drinks_recipes.dm | 49 +++++++++++++++++-- .../chemistry/machinery/chem_dispenser.dm | 1 + .../chemistry/reagents/alcohol_reagents.dm | 4 +- .../chemistry/reagents/drink_reagents.dm | 21 ++++++++ .../reagents/reagent_containers/borghydro.dm | 2 +- code/modules/vending/boozeomat.dm | 10 ++++ 7 files changed, 90 insertions(+), 6 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index ee5dc7e328..9d20369537 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -345,6 +345,15 @@ foodtype = FRUIT +/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 43b3ba07ab..367feb3cbc 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" @@ -623,4 +623,47 @@ id = "crevice_spike" results = list("crevice_spike" = 6) required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy) - mix_message = "The mixture stings your eyes as it settles." \ No newline at end of file +<<<<<<< HEAD + mix_message = "The mixture stings your eyes as it settles." +======= + mix_message = "The mixture stings your eyes as it settles." + +/datum/chemical_reaction/sake + name = "sake" + id = "sake" + results = list("sake" = 10) + required_reagents = list("rice" = 10) + required_catalysts = list("enzyme" = 5) + mix_message = "The rice grains ferment into a clear, sweet-smelling liquid." + +/datum/chemical_reaction/alexander + name = "Alexander" + id = "alexander" + results = list("alexander" = 3) + required_reagents = list("cognac" = 1, "creme_de_cacao" = 1, "cream" = 1) + +/datum/chemical_reaction/sidecar + name = "Sidecar" + id = "sidecar" + results = list("sidecar" = 4) + required_reagents = list("cognac" = 2, "triple_sec" = 1, "lemonjuice" = 1) + +/datum/chemical_reaction/between_the_sheets + name = "Between the Sheets" + id = "between_the_sheets" + results = list("between_the_sheets" = 5) + required_reagents = list("rum" = 1, "sidecar" = 4) + +/datum/chemical_reaction/kamikaze + name = "Kamikaze" + id = "kamikaze" + results = list("kamikaze" = 3) + required_reagents = list("vodka" = 1, "triple_sec" = 1, "limejuice" = 1) + +/datum/chemical_reaction/mojito + name = "Mojito" + id = "mojito" + results = list("mojito" = 5) + required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) + +>>>>>>> b0b7f2d... Adds grenadine. (#37598) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 2db6058852..c05bdae313 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 42343f8af8..ff77483d50 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 673b6e7059..18cb7469a5 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -721,3 +721,24 @@ description = "Milk for cool kids." color = "#7D4E29" taste_description = "chocolate milk" +<<<<<<< HEAD +======= +/datum/reagent/consumable/menthol + name = "Menthol" + id = "menthol" + description = "Tastes naturally minty, and imparts a very mild numbing sensation." + color = "#80AF9C" + taste_description = "mint" + 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." +>>>>>>> b0b7f2d... Adds grenadine. (#37598) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ef41c7951e..561dbf2733 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 eddb01171b..94249e9cb4 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -19,6 +19,11 @@ /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, +<<<<<<< HEAD +======= + /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4, + /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, +>>>>>>> b0b7f2d... Adds grenadine. (#37598) /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, @@ -37,5 +42,10 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" +<<<<<<< HEAD charges = list(58, 4, 0)//of 174 standard, 12 contraband init_charges = list(58, 4, 0) +======= + charges = list(61, 4, 0)//of 182 standard, 12 contraband + init_charges = list(61, 4, 0) +>>>>>>> b0b7f2d... Adds grenadine. (#37598) From 34bf8d11aa079cd035b013b3b68ee29cc2e9e689 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 10:15:47 -0500 Subject: [PATCH 2/5] Update drinks_recipes.dm --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 5 ----- 1 file changed, 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 367feb3cbc..6fb8f2cac4 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -623,9 +623,6 @@ id = "crevice_spike" results = list("crevice_spike" = 6) required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy) -<<<<<<< HEAD - mix_message = "The mixture stings your eyes as it settles." -======= mix_message = "The mixture stings your eyes as it settles." /datum/chemical_reaction/sake @@ -665,5 +662,3 @@ id = "mojito" results = list("mojito" = 5) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) - ->>>>>>> b0b7f2d... Adds grenadine. (#37598) From aee0160a25bb750baf543a761ba923f7db4f0a49 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 10:15:57 -0500 Subject: [PATCH 3/5] Update drink_reagents.dm --- code/modules/reagents/chemistry/reagents/drink_reagents.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 18cb7469a5..c8b90026e4 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -721,8 +721,7 @@ description = "Milk for cool kids." color = "#7D4E29" taste_description = "chocolate milk" -<<<<<<< HEAD -======= + /datum/reagent/consumable/menthol name = "Menthol" id = "menthol" @@ -741,4 +740,3 @@ taste_description = "sweet pomegranates" glass_name = "glass of grenadine" glass_desc = "Delicious flavored syrup." ->>>>>>> b0b7f2d... Adds grenadine. (#37598) From 440d12397262036952198496cd764da6bf347c22 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 10:16:04 -0500 Subject: [PATCH 4/5] Update boozeomat.dm --- code/modules/vending/boozeomat.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 94249e9cb4..2d5f3755b5 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -19,11 +19,8 @@ /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, -<<<<<<< HEAD -======= /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4, /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, ->>>>>>> b0b7f2d... Adds grenadine. (#37598) /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, From c10c12596ddc432b7a83edfb6c864a2141634ae1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 20 May 2018 03:18:24 -0500 Subject: [PATCH 5/5] Update boozeomat.dm --- code/modules/vending/boozeomat.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 2d5f3755b5..fbdfd6f0cd 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -39,10 +39,5 @@ /obj/item/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" -<<<<<<< HEAD - charges = list(58, 4, 0)//of 174 standard, 12 contraband - init_charges = list(58, 4, 0) -======= charges = list(61, 4, 0)//of 182 standard, 12 contraband init_charges = list(61, 4, 0) ->>>>>>> b0b7f2d... Adds grenadine. (#37598)