From 1094e5b69e2af5f704a563af8ebd198064f6cabd Mon Sep 17 00:00:00 2001 From: Ordonis Date: Sun, 18 Feb 2018 06:13:29 -0600 Subject: [PATCH] Newliquors (#35581) * Adds a few new liqueurs and cocktails How the fuck in THIS game of all games do we not have Triple Sec. SERIOUSLY. * Well there goes a one commit clean PR rip me reeeeee * Adds sounds, fixes colors * Fixes recipies giving eggnog Don't ask * Adds space where space should be * Travis stop stalling reeeeeee * Fixes spelling mistakes * Adds some health benefits to sec drinks. Quadruple sec is mild, but easy to make; quintuple sec is STRONG but more difficult. * Fixes merge conflict annoyance * FUCK * Updates boozepwr of Quadruple/Quintuple sec If someone ever adds sex on the beach as a cocktail, I fully expect them to add in Sex-tuple Sec as well. * Makes clowntears reagent explicit within food_reagents Removed hacky solution, introduced better one --- .../food_and_drinks/recipes/drinks_recipes.dm | 31 +++++- .../chemistry/machinery/chem_dispenser.dm | 5 +- .../chemistry/reagents/alcohol_reagents.dm | 94 +++++++++++++++++++ .../chemistry/reagents/food_reagents.dm | 8 ++ 4 files changed, 136 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index cb33915ddf..447b65fa09 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -552,7 +552,36 @@ /datum/chemical_reaction/narsour name = "Nar'sour" id = "narsour" - results = list("narsour" = 1) + results = list("narsour" = 1) required_reagents = list("blood" = 1, "lemonjuice" = 1, "demonsblood" = 1) mix_message = "The mixture develops a sinister glow." mix_sound = 'sound/effects/singlebeat.ogg' + +/datum/chemical_reaction/quadruplesec + name = "Quadruple Sec" + id = "quadruple_sec" + results = list("quadruple_sec" = 15) + required_reagents = list("triple_sec" = 5, "triple_citrus" = 5, "creme_de_menthe" = 5) + mix_message = "The snap of a taser emanates clearly from the mixture as it settles." + mix_sound = 'sound/weapons/taser.ogg' + +/datum/chemical_reaction/grasshopper + name = "Grasshopper" + id = "grasshopper" + results = list("grasshopper" = 15) + required_reagents = list("cream" = 5, "creme_de_menthe" = 5, "creme_de_cacao" = 5) + mix_message = "A vibrant green bubbles forth as the mixture emulsifies." + +/datum/chemical_reaction/stinger + name = "Stinger" + id = "stinger" + results = list("stinger" = 15) + required_reagents = list("whiskey" = 10, "creme_de_menthe" = 5 ) + +/datum/chemical_reaction/quintuplesec + name = "Quintuple Sec" + id = "quintuple_sec" + results = list("quintuple_sec" = 15) + required_reagents = list("quadruple_sec" = 5, "clownstears" = 5, "syndicatebomb" = 5) + mix_message = "Judgement is upon you." + mix_message = 'sound/items/airhorn2.ogg' diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index e18e739f3a..ce4e1f7ad2 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -419,7 +419,10 @@ "cognac", "ale", "absinthe", - "hcider" + "hcider", + "creme_de_menthe", + "creme_de_cacao", + "triple_sec" ) emagged_reagents = list( "ethanol", diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 9d5eda10b2..dd97d80079 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1298,3 +1298,97 @@ All effects don't start immediately, but rather get worse over time; the rate is M.cultslurring = min(M.cultslurring + 3, 3) M.stuttering = min(M.stuttering + 3, 3) ..() + +/datum/reagent/consumable/ethanol/triple_sec + name = "Triple Sec" + id = "triple_sec" + description = "A sweet and vibrant orange liqueur." + color = "#ffcc66" + boozepwr = 30 + taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean" + glass_icon_state = "glass_orange" + glass_name = "Triple Sec" + glass_desc = "A glass of straight Triple Sec." + +/datum/reagent/consumable/ethanol/creme_de_menthe + name = "Creme de Menthe" + id = "creme_de_menthe" + description = "A minty liqueur excellent for refreshing, cool drinks." + color = "#00cc00" + boozepwr = 20 + taste_description = "a minty, cool, and invigorating splash of cold streamwater" + glass_icon_state = "glass_green" + glass_name = "Creme de Menthe" + glass_desc = "You can almost feel the first breath of spring just looking at it." + +/datum/reagent/consumable/ethanol/creme_de_cacao + name = "Creme de Cacao" + id = "creme_de_cacao" + description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities." + color = "#996633" + boozepwr = 20 + taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol" + glass_icon_state = "glass_brown" + glass_name = "Creme de Cacao" + glass_desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient." + +/datum/reagent/consumable/ethanol/quadruple_sec + name = "Quadruple Sec" + id = "quadruple_sec" + description = "Kicks just as hard as licking the powercell on a baton, but tastier." + color = "#cc0000" + boozepwr = 35 + taste_description = "an invigorating bitter freshness which suffuses your being; no enemy of the station will go unrobusted this day" + glass_icon_state = "glass_red" + glass_name = "Quadruple Sec" + glass_desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though." + +/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/M) + if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes. + M.heal_bodypart_damage (1,1,1) + M.adjustBruteLoss(-2,0) + . = 1 + return ..() + +/datum/reagent/consumable/ethanol/quintuple_sec + name = "Quintuple Sec" + id = "quintuple_sec" + description = "Law, Order, Alcohol, and Police Brutality distilled into one single elixir of JUSTICE." + color = "#ff3300" + boozepwr = 80 + taste_description = "THE LAW" + glass_icon_state = "glass_red" + glass_name = "Quintuple Sec" + glass_desc = "Now you are become law, destroyer of clowns." + +/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/M) + if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes but STRONG.. + M.heal_bodypart_damage (2,2,2) + M.adjustBruteLoss(-5,0) + M.adjustOxyLoss(-5,0) + M.adjustFireLoss(-5,0) + M.adjustToxLoss(-5,0) + . = 1 + return ..() + +/datum/reagent/consumable/ethanol/grasshopper + name = "Grasshopper" + id = "grasshopper" + description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this." + color = "00ff00" + boozepwr = 25 + taste_description = "chocolate and mint dancing around your mouth" + glass_icon_state = "glass_green" + glass_name = "Grasshopper" + glass_desc = "You weren't aware edible beverages could be that green." + +/datum/reagent/consumable/ethanol/stinger + name = "Stinger" + id = "stinger" + description = "A snappy way to end the day." + color = "ccff99" + boozepwr = 25 + taste_description = "a slap on the face in the best possible way" + glass_icon_state = "glass_white" + glass_name = "Stinger" + glass_desc = "You wonder what would happen if you pointed this at a heat source..." diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 2888f3acca..3eddb66713 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -666,3 +666,11 @@ M.adjustFireLoss(-1*REM, 0) . = TRUE ..() + +/datum/reagent/consumable/clownstears + name = "Clown's Tears" + id = "clownstears" + description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs." + nutriment_factor = 5 * REAGENTS_METABOLISM + color = "#eef442" // rgb: 238, 244, 66 + taste_description = "mournful honking" \ No newline at end of file