From f8ba4e5842a679b9115ed1e765fea6a4e557a3ee Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 15 May 2024 13:51:18 -0700 Subject: [PATCH] Overhaul of alcohol to use proof instead of vague "strength", stack different, last longer (?) (#6430) --- .../modules/organs/internal/subtypes/liver.dm | 2 +- .../reagents/Chemistry-Reagents-Dispenser.dm | 135 ++- .../Chemistry-Reagents-Food-Drinks.dm | 889 +++++++++--------- 3 files changed, 528 insertions(+), 498 deletions(-) diff --git a/code/modules/organs/internal/subtypes/liver.dm b/code/modules/organs/internal/subtypes/liver.dm index 8fa79107371..e1669431959 100644 --- a/code/modules/organs/internal/subtypes/liver.dm +++ b/code/modules/organs/internal/subtypes/liver.dm @@ -37,7 +37,7 @@ // Do some reagent processing. if(owner.chem_effects[CE_ALCOHOL_TOXIC]) - take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * (dt * 5), prob(1)) // Chance to warn them + take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * (dt * 5), prob(99)) // Chance to warn them if(filter_effect < 2) //Liver is badly damaged, you're drinking yourself to death owner.adjustToxLoss(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.2 * (dt * 5)) if(filter_effect < 3) diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm index 563bdd79bfe..e28bb93616b 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm @@ -1,4 +1,4 @@ - +#define ETHANOL_MET_DIVISOR 20 /datum/reagent/ethanol name = "Ethanol" //Parent class for all alcoholic reagents. @@ -8,12 +8,13 @@ reagent_state = REAGENT_LIQUID color = "#404030" - ingest_met = REM * 2 + metabolism = REM/ETHANOL_MET_DIVISOR + + ingest_met = REM * 5 var/nutriment_factor = 0 var/hydration_factor = 0 - // todo: this is awful why is strength lower when higher? - var/strength = 10 // This is, essentially, units between stages - the lower, the stronger. Less fine tuning, more clarity. + var/proof = 200 var/toxicity = 1 var/druggy = 0 @@ -21,6 +22,8 @@ var/targ_temp = 310 var/halluci = 0 + data=0 + glass_name = "ethanol" glass_desc = "A well-known alcohol with a variety of applications." @@ -28,9 +31,10 @@ if(istype(L)) L.adjust_fire_stacks(amount / 15) +#define ABV (proof/200) + /datum/reagent/ethanol/affect_blood(mob/living/carbon/M, alien, removed) //This used to do just toxin. That's boring. Let's make this FUN. - if(issmall(M)) removed *= 2 - var/strength_mod = 3 //Alcohol is 3x stronger when injected into the veins. + var/strength_mod = 1 //Alcohol is 3x stronger when injected into the veins. if(alien == IS_SKRELL) strength_mod *= 5 if(alien == IS_TAJARA) @@ -46,85 +50,67 @@ to_chat(M, "You feel your leaves start to wilt.") strength_mod *=5 //cit change - alcohol ain't good for plants - var/effective_dose = dose * strength_mod * (1 + volume/60) //drinking a LOT will make you go down faster + var/effective_dose = volume * strength_mod * ABV * min(1,dose*(ETHANOL_MET_DIVISOR/10)) // give it 50 ticks to ramp up M.add_chemical_effect(CE_ALCOHOL, 1) if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - var/intolerant_dose = 100*strength_mod*removed/strength + var/intolerant_dose = strength_mod*removed*ABV*10 if(prob((intolerant_dose))) M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(intolerant_dose) // 10 strength = 10 tox per u, so 10u deathbell = 100, 10u vodka = 6.6666..., 10u beer = 20 + M.adjustToxLoss(intolerant_dose) return 0 - if(effective_dose >= strength) // Early warning - M.make_dizzy(18) // It is decreased at the speed of 3 per tick - if(effective_dose >= strength * 2) // Slurring - M.slurring = max(M.slurring, 90) - if(effective_dose >= strength * 3) // Confusion - walking in random directions + var/effect_level=round(effective_dose/6) + if(effect_level != data) + var/lowering=(data>effect_level) + data=effect_level + if(lowering) + switch(effect_level) + if(0) + to_chat(M,SPAN_NOTICE("You no longer feel under the influence.")) + if(1) + to_chat(M,SPAN_DANGER("You are no longer slurring your words as much.")) + if(2) + to_chat(M,SPAN_DANGER("You can walk straight again.")) + if(3) + to_chat(M,SPAN_DANGER("You're not seeing double anymore.")) + if(4) + to_chat(M,SPAN_DANGER("You don't feel like you're going to pass out anymore.")) + if(5) + to_chat(M,SPAN_DANGER("You feel like you're out of the danger zone.")) + else + switch(effect_level) + if(1) + to_chat(M,SPAN_DANGER("You're starting to feel a little tipsy.")) + M.dizziness=max(M.dizziness,150) + if(2) + to_chat(M,SPAN_DANGER("You're starting to slur your words.")) + if(3) + to_chat(M,SPAN_DANGER("You can barely walk straight!")) + if(4) + to_chat(M,SPAN_DANGER("You're seeing double!.")) + M.eye_blurry=max(M.eye_blurry,30) + if(5) + to_chat(M,SPAN_USERDANGER("Your eyelids feel heavy!")) + if(6) + to_chat(M,SPAN_USERDANGER("You are getting dangerously drunk!")) + + if(effect_level>=2) + M.slurring=max(M.slurring,10) + if(effect_level>=3) M.Confuse(60) - if(effective_dose >= strength * 4) // Blurry vision - M.eye_blurry = max(M.eye_blurry, 30) - if(effective_dose >= strength * 5) // Drowsyness - periodically falling asleep - M.drowsyness = max(M.drowsyness, 60) - if(effective_dose >= strength * 6) // Toxic dose - M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity*3) - if(effective_dose >= strength * 7) // Pass out - M.afflict_unconscious(20 * 60) - M.afflict_sleeping(20 * 90) + if(effect_level>=5) + M.drowsyness=max(M.drowsyness,60) + if(effect_level>=6) + M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity*strength_mod) + if(volume>36 + REM) + volume-=REM // liver working overtime, or whatever (mostly to prevent people from always just dying from this) - if(druggy != 0) - M.druggy = max(M.druggy, druggy*3) - - if(adj_temp > 0 && M.bodytemperature < targ_temp) // 310 is the normal bodytemp. 310.055 - M.bodytemperature = min(targ_temp, M.bodytemperature + (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) - if(adj_temp < 0 && M.bodytemperature > targ_temp) - M.bodytemperature = min(targ_temp, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) - - if(halluci) - M.hallucination = max(M.hallucination, halluci*3) - return effective_dose + return /datum/reagent/ethanol/affect_ingest(mob/living/carbon/M, alien, removed) if(issmall(M)) removed *= 2 M.adjust_nutrition(nutriment_factor * removed) M.adjust_hydration(hydration_factor * removed) - var/strength_mod = 1 - if(alien == IS_SKRELL) - strength_mod *= 5 - if(alien == IS_TAJARA) - strength_mod *= 1.25 - if(alien == IS_UNATHI) - strength_mod *= 0.75 - if(alien == IS_DIONA) - strength_mod = 0 - if(alien == IS_SLIME) - strength_mod *= 2 - var/is_vampire = M.species.is_vampire - if(is_vampire) - handle_vampire(M, alien, removed, is_vampire) - - if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - var/intolerant_dose = 50*strength_mod*removed/strength - if(prob((intolerant_dose))) - M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(intolerant_dose) // 10 strength = 5 tox per u, so 10u deathbell = 50, 10u vodka = 3.3333..., 10u beer = 10 - return 0 - var/effective_dose = strength_mod * dose // this was being recalculated a bunch before--why? - M.add_chemical_effect(CE_ALCOHOL, 1) - if(effective_dose >= strength) // Early warning - M.make_dizzy(6) // It is decreased at the speed of 3 per tick - if(effective_dose >= strength * 2) // Slurring - M.slurring = max(M.slurring, 30) - if(effective_dose >= strength * 3) // Confusion - walking in random directions - M.Confuse(20) - if(effective_dose >= strength * 4) // Blurry vision - M.eye_blurry = max(M.eye_blurry, 10) - if(effective_dose >= strength * 5) // Drowsyness - periodically falling asleep - M.drowsyness = max(M.drowsyness, 20) - if(effective_dose >= strength * 6) // Toxic dose - M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity) - if(effective_dose >= strength * 7) // Pass out - M.afflict_unconscious(20 * 20) - M.afflict_sleeping(20 * 30) - + M.bloodstr.add_reagent("ethanol", removed * ABV) if(druggy != 0) M.druggy = max(M.druggy, druggy) @@ -135,7 +121,7 @@ if(halluci) M.hallucination = max(M.hallucination, halluci) - return effective_dose + return /datum/reagent/ethanol/touch_obj(obj/O) if(istype(O, /obj/item/paper)) @@ -154,6 +140,7 @@ to_chat(usr, "The solution dissolves the ink on the book.") return +#undef ABV /datum/reagent/acid name = "Sulphuric acid" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm index 2a855375787..a439a974303 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2333,6 +2333,8 @@ // Basic +#define ABSINTHE 130 + /datum/reagent/ethanol/absinthe name = "Absinthe" id = "absinthe" @@ -2340,18 +2342,21 @@ taste_description = "licorice" taste_mult = 1.5 color = "#33EE00" - strength = 12 + proof = ABSINTHE glass_name = "Absinthe" glass_desc = "Wormwood, anise, oh my." +#define BEER 10 + /datum/reagent/ethanol/ale name = "Ale" id = "ale" description = "A dark alchoholic beverage made by malted barley and yeast." taste_description = "hearty barley ale" color = "#4C3100" - strength = 50 + proof = BEER + nutriment_factor=5 glass_name = "Ale" glass_desc = "A freezing pint of delicious ale." @@ -2362,8 +2367,8 @@ description = "An alcoholic beverage made from malted grains, hops, yeast, and water." taste_description = "beer" color = "#FFD300" - strength = 50 - nutriment_factor = 1 + proof = BEER + nutriment_factor = 5 glass_name = "Beer" glass_desc = "A freezing pint of beer" @@ -2373,6 +2378,8 @@ if(.) M.jitteriness = max(M.jitteriness - 3, 0) +#define CURACAO 60 + /datum/reagent/ethanol/bluecuracao name = "Blue Curacao" id = "bluecuracao" @@ -2380,11 +2387,13 @@ taste_description = "oranges" taste_mult = 1.1 color = "#0000CD" - strength = 15 + proof = CURACAO glass_name = "Blue Curacao" glass_desc = "Exotically blue, fruity drink, distilled from oranges." +#define COGNAC 80 + /datum/reagent/ethanol/cognac name = "Cognac" id = "cognac" @@ -2392,7 +2401,7 @@ taste_description = "rich and smooth alcohol" taste_mult = 1.1 color = "#AB3C05" - strength = 15 + proof = 80 glass_name = "Cognac" glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this." @@ -2404,7 +2413,7 @@ taste_description = "butterscotch and salt" taste_mult = 1.1 color = "#ECB633" - strength = 50 + proof = 10 glass_name = "Rum" glass_desc = "Now you want to Pray for a pirate suit, don't you?" @@ -2414,24 +2423,28 @@ if(.) M.dizziness += 5 +#define GIN 100 + /datum/reagent/ethanol/gin name = "Gin" id = "gin" description = "It's gin. In space. I say, good sir." taste_description = "an alcoholic christmas tree" color = "#0064C6" - strength = 15 + proof = GIN glass_name = "Gin" glass_desc = "A crystal clear glass of Griffeater gin." +#define VICTORY_GIN 70 + /datum/reagent/ethanol/victory_gin name = "Victory Gin" id = "victory_gin" description = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." taste_description = "oily gin" color = "#0064C6" - strength = 20 + proof = VICTORY_GIN glass_name = "Victory Gin" glass_desc = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." @@ -2457,6 +2470,8 @@ return M.make_jittery(5) +#define KAHLUA 40 + /datum/reagent/ethanol/coffee/kahlua name = "Kahlua" id = "kahlua" @@ -2464,34 +2479,26 @@ taste_description = "spiked latte" taste_mult = 1.1 color = "#4C3100" - strength = 15 + proof = KAHLUA glass_name = "RR Coffee Liquor" glass_desc = "A widely known, Mexican coffee-flavored liqueur. In production since 1936!" // glass_desc = "DAMN, THIS THING LOOKS ROBUST" //If this isn't what our players should talk like, it isn't what our game should say to them. +#define MELON_LIQUOR 46 + /datum/reagent/ethanol/melonliquor name = "Melon Liquor" id = "melonliquor" description = "A relatively sweet and fruity 46 proof liquor." taste_description = "fruity alcohol" color = "#138808" // rgb: 19, 136, 8 - strength = 50 + proof = MELON_LIQUOR glass_name = "Melon Liquor" glass_desc = "A relatively sweet and fruity 46 proof liquor." -/datum/reagent/ethanol/melonspritzer - name = "Melon Spritzer" - id = "melonspritzer" - description = "Melons: Citrus style." - taste_description = "sour melon" - color = "#934D5D" - strength = 10 - - glass_name = "Melon Spritzer" - glass_desc = "Melons: Citrus style." - glass_special = list(DRINK_FIZZ) +#define RUM 120 /datum/reagent/ethanol/rum name = "Rum" @@ -2500,7 +2507,7 @@ taste_description = "spiked butterscotch" taste_mult = 1.1 color = "#ECB633" - strength = 15 + proof = RUM glass_name = "Rum" glass_desc = "Makes you want to buy a ship and just go pillaging." @@ -2512,40 +2519,31 @@ taste_description = "milky coconut" taste_mult = 1.1 color = "#e0e0e0" - strength = 20 + proof = 90 glass_name = "White Rum" glass_desc = "Makes you want to buy a ship and just go pillaging." +#define SAKE 40 + /datum/reagent/ethanol/sake name = "Sake" id = "sake" description = "Anime's favorite drink." taste_description = "dry alcohol" color = "#DDDDDD" - strength = 25 + proof = SAKE glass_name = "Sake" glass_desc = "A glass of sake." -/datum/reagent/ethanol/sexonthebeach - name = "Sex On The Beach" - id = "sexonthebeach" - description = "A concoction of vodka and a secret combination of orange juice and pomegranate." - taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" - color = "#FF0033" - strength = 90 // it is one SIXTH vodka - - glass_name = "Sex on the Beach" - glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." - /datum/reagent/ethanol/thirteenloko name = "Thirteen Loko" id = "thirteenloko" description = "A potent mixture of caffeine and alcohol." taste_description = "battery acid" color = "#102000" - strength = 25 + proof = 40 nutriment_factor = 1 glass_name = "Thirteen Loko" @@ -2560,6 +2558,8 @@ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) +#define VERMOUTH 35 + /datum/reagent/ethanol/vermouth name = "Vermouth" id = "vermouth" @@ -2567,18 +2567,20 @@ taste_description = "dry alcohol" taste_mult = 1.3 color = "#91FF91" // rgb: 145, 255, 145 - strength = 15 + proof = VERMOUTH glass_name = "Vermouth" glass_desc = "You wonder why you're even drinking this straight." +#define VODKA 80 + /datum/reagent/ethanol/vodka name = "Vodka" id = "vodka" description = "Number one drink AND fueling choice for Russians worldwide." taste_description = "potato alcohol" color = "#0064C8" // rgb: 0, 100, 200 - strength = 15 + proof = VODKA glass_name = "Vodka" glass_desc = "The glass contain wodka. Xynta." @@ -2587,24 +2589,28 @@ . = ..() M.cure_radiation(RAD_MOB_CURE_STRENGTH_VODKA(removed)) +#define WHISKEY 80 + /datum/reagent/ethanol/whiskey name = "Whiskey" id = "whiskey" description = "A superb and well-aged single-malt whiskey. Damn." taste_description = "molasses" color = "#4C3100" - strength = 15 + proof = WHISKEY glass_name = "Whiskey" glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." +#define WINE 20 + /datum/reagent/ethanol/wine name = "Red Wine" id = "wine" description = "A premium alchoholic beverage made from distilled grape juice. This one's red!" taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 - strength = 30 + proof = WINE glass_name = "Wine" glass_desc = "A very classy looking drink." @@ -2615,17 +2621,19 @@ description = "A premium alchoholic beverage made from distilled grape juice. This one's white!" taste_description = "bitter sweetness" color = "#FCF1D2" - strength = 30 + proof = WINE glass_name = "White Wine" glass_desc = "A very classy looking drink. Now in white!" +#define SCHNAPPS 60 + /datum/reagent/ethanol/peppermintschnapps name = "Peppermint Schnapps" id = "schnapps_pep" description = "A flavoured grain liqueur with a fresh, minty taste." taste_description = "minty" - strength = 90 + proof = SCHNAPPS glass_name = "Peppermint Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, minty taste." @@ -2635,7 +2643,7 @@ id = "schnapps_pea" description = "A flavoured grain liqueur with a fresh, peachy taste." taste_description = "peachy" - strength = 90 + proof = SCHNAPPS glass_name = "Peach Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, peachy taste." @@ -2645,7 +2653,7 @@ id = "schnapps_lem" description = "A flavoured grain liqueur with a fresh, lemony taste." taste_description = "lemony" - strength = 90 + proof = SCHNAPPS glass_name = "Lemonade Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, lemony taste." @@ -2660,20 +2668,150 @@ glass_name = "Champagne" glass_desc = "An even classier looking drink." +#define CIDER 10 + /datum/reagent/ethanol/cider name = "Cider" id = "cider" description = "An alcoholic drink made from apple juice. Erratum on earlier recipe books: this is definitely hard." taste_description = "tartness" color = "#CE9C00" // rgb: 206, 156, 0 - strength = 40 + proof = CIDER glass_name = "Cider" glass_desc = "The second most Irish drink." glass_special = list(DRINK_FIZZ) +#define MEAD 10 + +/datum/reagent/ethanol/mead + name = "Mead" + id = "mead" + description = "A Viking's drink, though a cheap one." + taste_description = "sweet yet alcoholic" + reagent_state = REAGENT_LIQUID + color = "#FFBB00" + proof = MEAD + nutriment_factor = 2 + + glass_name = "Mead" + glass_desc = "A Viking's beverage, though a cheap one." + +#define MESSA_MEAD 100 + +/datum/reagent/ethanol/messa_mead + name = "Messa's Mead" + id = "messa_mead" + description = "A sweet tajaran liquor. Produced from the frementation of honey and earthen roots." + taste_description = "chilled honey" + reagent_state = REAGENT_LIQUID + color = "#FFBB00" + proof = MESSA_MEAD + nutriment_factor = 2 + + glass_name = "Messa's Mead" + glass_desc = "A sweet tajaran liquor. Produced from the fermentation of honey and earthen roots native to Adhomai." + +/datum/reagent/ethanol/moonshine + name = "Moonshine" + id = "moonshine" + description = "You've really hit rock bottom now... your liver packed its bags and left last night." + taste_description = "bitterness" + taste_mult = 2.5 + color = "#0064C8" + proof = 150 + + glass_name = "Moonshine" + glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + +#define TEQUILA 80 + +/datum/reagent/ethanol/tequila + name = "Tequila" + id = "tequila" + description = "A drink made for fighting." + taste_description = "paint thinner" + color = "#cccac5" + proof = TEQUILA + + glass_name = "Tequila" + glass_desc = "Is that guy making fun of you? You should show him what's what." + +#define BITTERS 40 + +/datum/reagent/ethanol/bitters + name = "Bitters" + id = "bitters" + description = "A blend of fermented fruits and herbs, commonly used in cocktails." + taste_description = "sharp bitterness" + color = "#9b6241" // rgb(155, 98, 65) + proof = BITTERS + + glass_name = "Bitters" + glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." + +#define BRANDY 100 + +/datum/reagent/ethanol/winebrandy + name = "Wine Brandy" + id = "winebrandy" + description = "A premium spirit made from distilled wine." + taste_description = "very sweet dried fruit with many elegant notes" + color = "#4C130B" // rgb(76,19,11) + proof = BRANDY + + glass_name = "Wine Brandy" + glass_desc = "A very classy looking after-dinner drink." + +/datum/reagent/ethanol/alcsassafras + name = "Hard Rootbeer" + id = "alcsassafras" + description = "Doesn't matter if you're drunk when you have a horse to take you home!" + taste_description = "bitter vanilla with a sharp burn" + proof = 50 + + glass_name = "CC's Hard Rootbeer" + glass_desc = "You'd better carry two guns if you're gonna keep drinking these!" + glass_icon = DRINK_ICON_NOISY + glass_special = list(DRINK_FIZZ) + // Cocktails +#define SCREWDRIVERCOCKTAIL (VODKA/3) + +/datum/reagent/ethanol/screwdrivercocktail + name = "Screwdriver" + id = "screwdrivercocktail" + description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." + taste_description = "oranges" + color = "#A68310" + proof = SCREWDRIVERCOCKTAIL + + glass_name = "Screwdriver" + glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + +/datum/reagent/ethanol/sexonthebeach + name = "Sex On The Beach" + id = "sexonthebeach" + description = "A concoction of vodka and a secret combination of orange juice and pomegranate." + taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" + color = "#FF0033" + proof = SCREWDRIVERCOCKTAIL/2 + + glass_name = "Sex on the Beach" + glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." + +/datum/reagent/ethanol/melonspritzer + name = "Melon Spritzer" + id = "melonspritzer" + description = "Melons: Citrus style." + taste_description = "sour melon" + color = "#934D5D" + proof = WINE/3 + + glass_name = "Melon Spritzer" + glass_desc = "Melons: Citrus style." + glass_special = list(DRINK_FIZZ) /datum/reagent/ethanol/acid_spit name = "Acid Spit" @@ -2682,18 +2820,31 @@ taste_description = "bitter tang" reagent_state = REAGENT_LIQUID color = "#365000" - strength = 30 + proof = WINE*5/6 glass_name = "Acid Spit" glass_desc = "A drink from the company archives. Made from live aliens." +#define MARTINI (2*VERMOUTH+GIN)/3 + +/datum/reagent/ethanol/martini + name = "Classic Martini" + id = "martini" + description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." + taste_description = "dry class" + color = "#0064C8" + proof = MARTINI + + glass_name = "classic martini" + glass_desc = "Damn, the bartender even stirred it, not shook it." + /datum/reagent/ethanol/alliescocktail name = "Allies Cocktail" id = "alliescocktail" description = "A drink made from your allies, not as sweet as when made from your enemies." taste_description = "bitter sweetness" color = "#D8AC45" - strength = 20 // bit of vodka makes it stronger + proof = (MARTINI+VODKA)/2 glass_name = "Allies cocktail" glass_desc = "A drink made from your allies." @@ -2704,7 +2855,7 @@ description = "So very, very, very good." taste_description = "sweet and creamy" color = "#B7EA75" - strength = 45 // it is 1/3 whiskey, come on + proof = WHISKEY/3 glass_name = "Aloe" glass_desc = "Very, very, very good." @@ -2716,7 +2867,7 @@ taste_description = "dark and metallic" reagent_state = REAGENT_LIQUID color = "#FF975D" - strength = 25 + proof = (WINE+VODKA)/2 glass_name = "Amasec" glass_desc = "Always handy before combat!" @@ -2724,39 +2875,41 @@ /datum/reagent/ethanol/andalusia name = "Andalusia" id = "andalusia" - description = "A nice, strangely named drink." + description = "A nice, strangely named drink." // it's the southern tip of spain you cretin taste_description = "lemons" color = "#F4EA4A" - strength = 15 + proof = (RUM+WHISKEY)/3 glass_name = "Andalusia" glass_desc = "A nice, strange named drink." +#define ANTIFREEZE (VODKA/3) + /datum/reagent/ethanol/antifreeze name = "Anti-freeze" id = "antifreeze" description = "Ultimate refreshment." taste_description = "ice cold vodka" color = "#56DEEA" - strength = 45 // i'm sorry, it's 1/3 vodka, it should not be stronger than it somehow + proof = ANTIFREEZE adj_temp = 20 targ_temp = 330 glass_name = "Anti-freeze" glass_desc = "The ultimate refreshment." -/datum/reagent/ethanol/atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" - description = "Nuclear proliferation never tasted so good." - taste_description = "coffee, almonds, and whiskey, with a kick" - reagent_state = REAGENT_LIQUID - color = "#666300" - strength = 10 // it's sweet sciency magic, i'll allow it - druggy = 50 +#define IRISH_CREAM (WHISKEY*2/3) - glass_name = "Atomic Bomb" - glass_desc = "We cannot take legal responsibility for your actions after imbibing." +/datum/reagent/ethanol/irish_cream + name = "Irish Cream" + id = "irishcream" + description = "Whiskey-imbued cream, what else would you expect from the Irish." + taste_description = "creamy alcohol" + color = "#DDD9A3" + proof = IRISH_CREAM + + glass_name = "Irish cream" + glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" /datum/reagent/ethanol/coffee/b52 name = "B-52" @@ -2765,18 +2918,31 @@ taste_description = "coffee, almonds, and whiskey" taste_mult = 1.3 color = "#997650" - strength = 12 + proof = (IRISH_CREAM+KAHLUA+COGNAC)/3 glass_name = "B-52" glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed." +/datum/reagent/ethanol/atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + description = "Nuclear proliferation never tasted so good." + taste_description = "coffee, almonds, and whiskey, with a kick" + reagent_state = REAGENT_LIQUID + color = "#666300" + proof = 200 // don't question it + druggy = 50 + + glass_name = "Atomic Bomb" + glass_desc = "We cannot take legal responsibility for your actions after imbibing." + /datum/reagent/ethanol/bahama_mama name = "Bahama mama" id = "bahama_mama" description = "Tropical cocktail." taste_description = "lime and orange" color = "#FF7F3B" - strength = 90 // 1/6th rum + proof = RUM/6 glass_name = "Bahama Mama" glass_desc = "Tropical cocktail." @@ -2798,7 +2964,7 @@ description = "Barefoot and pregnant." taste_description = "creamy berries" color = "#FFCDEA" - strength = 45 // 1/3 vermouth + proof = VERMOUTH/3 glass_name = "Barefoot" glass_desc = "Barefoot and pregnant." @@ -2811,7 +2977,7 @@ taste_mult = 2 reagent_state = REAGENT_LIQUID color = "#404040" - strength = 12 + proof = WHISKEY/2 glass_name = "Beepsky Smash" glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." @@ -2826,19 +2992,21 @@ description = "This appears to be beer mixed with milk. Odd." taste_description = "sour milk" color = "#895C4C" - strength = 100 // 50% beer - nutriment_factor = 2 + proof = BEER/2 + nutriment_factor = 5 glass_name = "Bilk" glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." +#define BLACK_RUSSIAN ((2*VODKA+KAHLUA)/3) + /datum/reagent/ethanol/black_russian name = "Black Russian" id = "blackrussian" description = "For the lactose-intolerant. Still as classy as a White Russian." taste_description = "coffee" color = "#360000" - strength = 15 + proof = BLACK_RUSSIAN glass_name = "Black Russian" glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." @@ -2849,7 +3017,7 @@ description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." taste_description = "tomatoes with a hint of lime" color = "#B40000" - strength = 90 // 1/6 vodka + proof = VODKA/6 glass_name = "Bloody Mary" glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." @@ -2860,7 +3028,7 @@ description = "Ewww..." taste_description = "sweet 'n creamy" color = "#8CFF8C" - strength = 75 // 1/5 rum + proof = RUM/5 glass_name = "Booger" glass_desc = "Ewww..." @@ -2872,7 +3040,7 @@ taste_description = "coffee and paint thinner" taste_mult = 1.1 color = "#4C3100" - strength = 15 + proof = (2*TEQUILA+KAHLUA)/3 glass_name = "Brave Bull" glass_desc = "Tequila and coffee liquor, brought together in a mouthwatering mixture. Drink up." @@ -2883,29 +3051,18 @@ description = "You take a tiny sip and feel a burning sensation..." taste_description = "constantly changing flavors" color = "#2E6671" - strength = 90 // 1/9 vodka (this used to be 10! 10!! why so strong!) + proof = SCREWDRIVERCOCKTAIL/3 glass_name = "Changeling Sting" glass_desc = "A stingy drink." -/datum/reagent/ethanol/martini - name = "Classic Martini" - id = "martini" - description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." - taste_description = "dry class" - color = "#0064C8" - strength = 25 - - glass_name = "classic martini" - glass_desc = "Damn, the bartender even stirred it, not shook it." - /datum/reagent/ethanol/cuba_libre name = "Cuba Libre" id = "cubalibre" description = "Rum, mixed with cola. Viva la revolucion." taste_description = "cola" color = "#3E1B00" - strength = 30 + proof = RUM/3 glass_name = "Cuba Libre" glass_desc = "A classic mix of rum and cola." @@ -2917,7 +3074,7 @@ taste_description = "a beach" nutriment_factor = 1 color = "#2E6671" - strength = 12 + proof = GIN*1.5 // it's 50% nothing, which strengthens it somehow. go with it glass_name = "Driest Martini" glass_desc = "Only for the experienced. You think you see sand floating in the glass." @@ -2928,7 +3085,7 @@ description = "Refreshingly lemony, deliciously dry." taste_description = "dry, tart lemons" color = "#FFFFAE" - strength = 45 // 1/3 gin + proof = GIN/3 glass_name = "Gin Fizz" glass_desc = "Refreshingly lemony, deliciously dry." @@ -2950,7 +3107,7 @@ taste_description = "a poor excuse for alcohol" reagent_state = REAGENT_LIQUID color = "#FFBB00" - strength = 30 + proof = RUM/2 glass_name = "Grog" @@ -2962,7 +3119,7 @@ description = "The surprise is, it's green!" taste_description = "tartness and bananas" color = "#2E6671" - strength = 50 // should be ~96, but probably not + proof = (2*BEER+WHISKEY)/3 glass_name = "Erika Surprise" glass_desc = "The surprise is, it's green!" @@ -2975,7 +3132,7 @@ taste_mult = 5 reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 8 // 10 seems week for the joke + proof = (2*VODKA+GIN+WHISKEY+COGNAC)/3 // stronger than it should be on purpose druggy = 15 glass_name = "Pan-Galactic Gargle Blaster" @@ -2987,7 +3144,7 @@ description = "An all time classic, mild cocktail." taste_description = "mild and tart" color = "#0064C8" - strength = 50 + proof = GIN/3 glass_name = "Gin and Tonic" glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman." @@ -2999,7 +3156,7 @@ taste_description = "burning cinnamon" taste_mult = 1.3 color = "#F4E46D" - strength = 15 + proof = VODKA glass_name = "Goldschlager" glass_desc = "100 proof that teen girls will drink anything with gold in it." @@ -3011,7 +3168,7 @@ taste_description = "giving peace a chance" reagent_state = REAGENT_LIQUID color = "#FF88FF" - strength = 15 + proof = 100 druggy = 50 glass_name = "Hippie's Delight" @@ -3023,7 +3180,7 @@ description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" taste_description = "pure alcohol" color = "#4C3100" - strength = 20 + proof = 100 toxicity = 2 glass_name = "Hooch" @@ -3035,7 +3192,7 @@ description = "A beer which is so cold the air around it freezes." taste_description = "refreshingly cold" color = "#FFD300" - strength = 50 + proof = BEER adj_temp = -20 targ_temp = 280 @@ -3049,7 +3206,7 @@ description = "Mmm, tastes like chocolate cake..." taste_description = "delicious anger" color = "#2E6671" - strength = 30 + proof = (BEER+IRISH_CREAM)/2 glass_name = "Irish Car Bomb" glass_desc = "An irish car bomb." @@ -3060,29 +3217,18 @@ description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." taste_description = "giving up on the day" color = "#4C3100" - strength = 50 + proof = IRISH_CREAM/2 glass_name = "Irish coffee" glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." -/datum/reagent/ethanol/irish_cream - name = "Irish Cream" - id = "irishcream" - description = "Whiskey-imbued cream, what else would you expect from the Irish." - taste_description = "creamy alcohol" - color = "#DDD9A3" - strength = 25 - - glass_name = "Irish cream" - glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" - /datum/reagent/ethanol/longislandicedtea name = "Long Island Iced Tea" id = "longislandicedtea" description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." taste_description = "sweet tea, with a kick" color = "#895B1F" - strength = 20 + proof = (VODKA+GIN+TEQUILA+RUM)/4 glass_name = "Long Island iced tea" glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." @@ -3093,7 +3239,7 @@ description = "The Detective's undercover drink of choice. He never could stomach gin..." taste_description = "mild dryness" color = "#C13600" - strength = 15 + proof = (2*WHISKEY+VERMOUTH)/3 glass_name = "Manhattan" glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..." @@ -3104,7 +3250,7 @@ description = "A scientist's drink of choice, for pondering ways to blow up the station." taste_description = "death, the destroyer of worlds" color = "#C15D00" - strength = 10 + proof = 200 // don't question it druggy = 30 glass_name = "Manhattan Project" @@ -3116,7 +3262,7 @@ description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." taste_description = "hair on your chest and your chin" color = "#4C3100" - strength = 25 + proof = BEER glass_name = "The Manly Dorf" glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only." @@ -3127,49 +3273,11 @@ description = "On the rocks with salt on the rim. Arriba~!" taste_description = "dry and salty" color = "#8CFF8C" - strength = 15 + proof = TEQUILA/3 glass_name = "Margarita" glass_desc = "On the rocks with salt on the rim. Arriba~!" -/datum/reagent/ethanol/mead - name = "Mead" - id = "mead" - description = "A Viking's drink, though a cheap one." - taste_description = "sweet yet alcoholic" - reagent_state = REAGENT_LIQUID - color = "#FFBB00" - strength = 50 - nutriment_factor = 1 - - glass_name = "Mead" - glass_desc = "A Viking's beverage, though a cheap one." - -/datum/reagent/ethanol/messa_mead - name = "Messa's Mead" - id = "messa_mead" - description = "A sweet tajaran liquor. Produced from the frementation of honey and earthen roots." - taste_description = "chilled honey" - reagent_state = REAGENT_LIQUID - color = "#FFBB00" - strength = 30 - nutriment_factor = 1 - - glass_name = "Messa's Mead" - glass_desc = "A sweet tajaran liquor. Produced from the fermentation of honey and earthen roots native to Adhomai." - -/datum/reagent/ethanol/moonshine - name = "Moonshine" - id = "moonshine" - description = "You've really hit rock bottom now... your liver packed its bags and left last night." - taste_description = "bitterness" - taste_mult = 2.5 - color = "#0064C8" - strength = 12 - - glass_name = "Moonshine" - glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." - /datum/reagent/ethanol/neurotoxin name = "Neurotoxin" id = "neurotoxin" @@ -3177,7 +3285,7 @@ taste_description = "a numbing sensation" reagent_state = REAGENT_LIQUID color = "#2E2E61" - strength = 10 + proof = 200 glass_name = "Neurotoxin" glass_desc = "A drink that is guaranteed to knock you silly." @@ -3194,7 +3302,7 @@ description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." taste_description = "metallic paint thinner" color = "#585840" - strength = 30 + proof = TEQUILA glass_name = "Patron" glass_desc = "Drinking patron in the bar, with all the subpar ladies." @@ -3204,7 +3312,7 @@ id = "pwine" description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!" color = "#000000" - strength = 10 + proof = WINE druggy = 50 halluci = 10 @@ -3230,7 +3338,7 @@ description = "The true Viking's drink! Even though it has a strange red color." taste_description = "sweet and salty alcohol" color = "#C73C00" - strength = 50 + proof = MEAD/2 blood_content = 0.5 glass_name = "Red Mead" @@ -3242,24 +3350,13 @@ description = "A spicy Vodka! Might be a bit hot for the little guys!" taste_description = "hot and spice" color = "#FFA371" - strength = 15 + proof = VODKA adj_temp = 50 targ_temp = 360 glass_name = "Sbiten" glass_desc = "A spicy mix of Vodka and Spice. Very hot." -/datum/reagent/ethanol/screwdrivercocktail - name = "Screwdriver" - id = "screwdrivercocktail" - description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." - taste_description = "oranges" - color = "#A68310" - strength = 45 // 1/3 vodka - - glass_name = "Screwdriver" - glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." - /datum/reagent/drink/silencer name = "Silencer" id = "silencer" @@ -3278,7 +3375,7 @@ description = "A blue-space beverage!" taste_description = "concentrated matter" color = "#2E6671" - strength = 10 + proof = 200 // one of those things you just shouldn't question glass_name = "Singulo" glass_desc = "A blue-space beverage." @@ -3289,7 +3386,7 @@ description = "A cold refreshment" taste_description = "refreshing cold" color = "#FFFFFF" - strength = 100 //50% beer + proof = BEER/2 glass_name = "Snow White" glass_desc = "A cold refreshment." @@ -3300,40 +3397,40 @@ description = "Comprised of: White soda, blue curacao, melon liquor." taste_description = "fruit" color = "#00A86B" - strength = 100 + proof = (MELON_LIQUOR+CURACAO)/3 glass_name = "Sui Dream" glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." +/datum/reagent/ethanol/whiskey_cola + name = "Whiskey Cola" + id = "whiskeycola" + description = "Whiskey, mixed with cola. Surprisingly refreshing." + taste_description = "cola with an alcoholic undertone" + color = "#3E1B00" + proof = WHISKEY/3 + + glass_name = "Whiskey Cola" + glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." + /datum/reagent/ethanol/syndicatebomb name = "Syndicate Bomb" id = "syndicatebomb" description = "Tastes like terrorism!" - taste_description = "strong alcohol" + taste_description = "terrorism" color = "#2E6671" - strength = 30 + proof = ((WHISKEY/3)+BEER)/2 glass_name = "Syndicate Bomb" glass_desc = "Tastes like terrorism!" -/datum/reagent/ethanol/tequila - name = "Tequila" - id = "tequila" - description = "A drink made for fighting." - taste_description = "paint thinner" - color = "#cccac5" - strength = 25 - - glass_name = "Tequila" - glass_desc = "Is that guy making fun of you? You should show him what's what." - /datum/reagent/ethanol/tequila_sunrise name = "Tequila Sunrise" id = "tequilasunrise" description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~." taste_description = "oranges" color = "#FFE48C" - strength = 25 + proof = TEQUILA/3 glass_name = "Tequila Sunrise" glass_desc = "Oh great, now you feel nostalgic about sunrises back on Earth..." @@ -3344,7 +3441,7 @@ description = "Made for a woman, strong enough for a man." taste_description = "dry" color = "#666340" - strength = 10 + proof = 200 druggy = 50 glass_name = "Three Mile Island iced tea" @@ -3357,7 +3454,7 @@ taste_description = "spicy toxins" reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 10 + proof = 200 adj_temp = 15 targ_temp = 330 @@ -3370,7 +3467,7 @@ description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." taste_description = "shaken, not stirred" color = "#0064C8" - strength = 15 + proof = (2*VODKA+VERMOUTH)/3 glass_name = "Vodka Martini" glass_desc ="A bastardization of the classic martini. Still great." @@ -3382,7 +3479,7 @@ description = "For when a gin and tonic isn't russian enough." taste_description = "tart bitterness" color = "#0064C8" // rgb: 0, 100, 200 - strength = 30 + proof = VODKA/3 glass_name = "Vodka and Tonic" glass_desc = "For when a gin and tonic isn't Russian enough." @@ -3394,42 +3491,32 @@ description = "That's just, like, your opinion, man..." taste_description = "coffee icecream" color = "#A68340" - strength = 20 + proof = BLACK_RUSSIAN*2/3 glass_name = "White Russian" glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." -/datum/reagent/ethanol/whiskey_cola - name = "Whiskey Cola" - id = "whiskeycola" - description = "Whiskey, mixed with cola. Surprisingly refreshing." - taste_description = "cola with an alcoholic undertone" - color = "#3E1B00" - strength = 45 - - glass_name = "Whiskey Cola" - glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." - - /datum/reagent/ethanol/whiskeysoda name = "Whiskey Soda" id = "whiskeysoda" description = "Ultimate refreshment." taste_description = "carbonated whiskey" color = "#EAB300" - strength = 45 + proof = WHISKEY/3 glass_name = "Whiskey Soda" glass_desc = "Ultimate refreshment." +#define WHISKEY_SPECIAL_BLEND 160 + /datum/reagent/ethanol/specialwhiskey // I have no idea what this is and where it comes from name = "Special Blend Whiskey" id = "specialwhiskey" description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils." taste_description = "unspeakable whiskey bliss" color = "#523600" - strength = 10 + proof = WHISKEY_SPECIAL_BLEND glass_name = "special blend whiskey" glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." @@ -3440,7 +3527,7 @@ description = "This barely qualifies as a drink, and could give jet fuel a run for its money. Also known to cause feelings of euphoria and numbness." taste_description = "spiced numbness" color = "#242424" - strength = 5 + proof = 400 // unathi have unlocked secrets unknown to others glass_name = "Redeemer's Brew" glass_desc = "This barely qualifies as a drink, and may cause euphoria and numbness. Imbiber beware!" @@ -3479,7 +3566,7 @@ description = "Alcohol in more alcohol." taste_description = "thick, dry alcohol" color = "#FFFF7F" - strength = 12 + proof = (2*BEER+SAKE)/3 nutriment_factor = 1 glass_name = "Sake Bomb" @@ -3491,7 +3578,7 @@ description = "Sake, egg, and sugar. A disgusting folk cure." taste_description = "eggy booze" color = "#E8C477" - strength = 30 + proof = SAKE*10/5 nutriment_factor = 3 glass_name = "Tamagozake" @@ -3503,7 +3590,7 @@ description = "An alcoholic drink made with vodka, sake, and juices." taste_description = "spicy tomato sake" color = "#FF3232" - strength = 25 + proof = (SAKE+VODKA)/3 glass_name = "Ginza Mary" glass_desc = "Tomato juice, vodka, and sake make something not quite completely unlike a Bloody Mary." @@ -3514,7 +3601,7 @@ description = "A pale pink cocktail made with sake and berry juice." taste_description = "fruity booze" color = "#FA8072" - strength = 35 + proof = SAKE/2 glass_name = "Tokyo Rose" glass_desc = "It's kinda pretty!" @@ -3525,7 +3612,7 @@ description = "For when you're too weeb for a real martini." taste_description = "dry alcohol" color = "#0064C8" - strength = 30 + proof = (SAKE+GIN)/2 glass_name = "Saketini" glass_desc = "What are you doing drinking this outside of New Kyoto?" @@ -3536,7 +3623,7 @@ description = "A loathsome cocktail favored by Heaven's skeleton shift workers." taste_description = "sour coffee" color = "#8f7729" - strength = 20 + proof = KAHLUA/2 glass_name = "Elysium Facepunch" glass_desc = "A loathsome cocktail favored by Heaven's skeleton shift workers." @@ -3547,7 +3634,7 @@ description = "A deeply alcoholic mix, popular in Nyx." taste_description = "hard alcohol" color = "#947459" - strength = 10 + proof = (WHISKEY+VODKA+TEQUILA)/3 glass_name = "Erebus Moonrise" glass_desc = "A deeply alcoholic mix, popular in Nyx." @@ -3558,7 +3645,7 @@ description = "A strange drink invented in the aerostats of Venus." taste_description = "strange alcohol" color = "#FAEBD7" - strength = 66 + proof = CURACAO/2 glass_name = "Balloon" glass_desc = "A strange drink invented in the aerostats of Venus." @@ -3569,7 +3656,7 @@ description = "On Natuna, they do the best with what they have." taste_description = "watered-down beer" color = "#FFFFCC" - strength = 80 + proof = BEER/3 glass_name = "Natuna Brandy" glass_desc = "On Natuna, they do the best with what they have." @@ -3581,7 +3668,7 @@ description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." taste_description = "impossibly rich alcohol" color = "#614126" - strength = 15 + proof = (2*COGNAC+WHISKEY_SPECIAL_BLEND)/3 glass_name = "Euphoria" glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." @@ -3592,7 +3679,7 @@ description = "Common in the entertainment districts of Titan." taste_description = "sweet alcohol" color = "#614126" - strength = 100 + proof = BEER/2 glass_name = "Xanadu Cannon" glass_desc = "Common in the entertainment districts of Titan." @@ -3603,7 +3690,7 @@ description = "From Shelf. Not for human consumption." taste_description = "oily bitterness" color = "#d3d3d3" - strength = 32 + proof = 60 // it's magic glass_name = "Debugger" glass_desc = "From Shelf. Not for human consumption." @@ -3614,7 +3701,7 @@ description = "Ethanol and orange soda. A common emergency drink on frontier colonies." taste_description = "bitter oranges" color = "#ffc04c" - strength = 43 + proof = 40 // literally 4 parts something else to 1 part ethanol glass_name = "Spacer's Brew" glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies." @@ -3625,7 +3712,7 @@ description = "A dry cocktail popular on Binma." taste_description = "very dry alcohol" color = "#c3c3c3" - strength = 24 + proof = (SAKE+TEQUILA)/2 glass_name = "Binman Bliss" glass_desc = "A dry cocktail popular on Binma." @@ -3636,29 +3723,18 @@ description = "An exotic cocktail from New Kyoto." taste_description = "fruity liquor" color = "#9999FF" - strength = 35 + proof = (SAKE+MELON_LIQUOR)/2 glass_name = "Chrysanthemum" glass_desc = "An exotic cocktail from New Kyoto." -/datum/reagent/ethanol/bitters - name = "Bitters" - id = "bitters" - description = "A blend of fermented fruits and herbs, commonly used in cocktails." - taste_description = "sharp bitterness" - color = "#9b6241" // rgb(155, 98, 65) - strength = 100 - - glass_name = "Bitters" - glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." - /datum/reagent/ethanol/soemmerfire name = "Soemmer Fire" id = "soemmerfire" description = "A painfully hot mixed drink, for when you absolutely need to hurt right now." taste_description = "pure fire" color = "#d13b21" // rgb(209, 59, 33) - strength = 25 + proof = (2*WHISKEY+VERMOUTH)/3*2/3 glass_name = "Soemmer Fire" glass_desc = "A painfully hot mixed drink, for when you absolutely need to hurt right now." @@ -3669,24 +3745,13 @@ return M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT -/datum/reagent/ethanol/winebrandy - name = "Wine Brandy" - id = "winebrandy" - description = "A premium spirit made from distilled wine." - taste_description = "very sweet dried fruit with many elegant notes" - color = "#4C130B" // rgb(76,19,11) - strength = 20 - - glass_name = "Wine Brandy" - glass_desc = "A very classy looking after-dinner drink." - /datum/reagent/ethanol/morningafter name = "Morning After" id = "morningafter" description = "The finest hair of the dog, coming up!" taste_description = "bitter regrets" color = "#482000" // rgb(72, 32, 0) - strength = 60 + proof = VODKA/6 glass_name = "Morning After" glass_desc = "The finest hair of the dog, coming up!" @@ -3697,7 +3762,7 @@ description = "A dry martini, ice cold and well shaken." taste_description = "lemony class" color = "#cca01c" // rgb(204, 160, 28) - strength = 20 + proof = (GIN*3+VODKA+WINE)/5 glass_name = "Vesper" glass_desc = "A dry martini, ice cold and well shaken." @@ -3708,7 +3773,7 @@ description = "A heinous combination of clashing flavors." taste_description = "plague and coldsweats" color = "#3a6617" // rgb(58, 102, 23) - strength = 10 + proof = (VODKA*3+RUM+WHISKEY)/8 glass_name = "Rotgut Fever Dream" glass_desc = "Why are you doing this to yourself?" @@ -3719,7 +3784,7 @@ description = "A dangerous combination of all things flammable. Why would you drink this?" taste_description = "corrosive death" color = "#7c003a" // rgb(124, 0, 58) - strength = 10 + proof = 150 glass_name = "Vox's Delight" glass_desc = "Not recommended if you enjoy having organs." @@ -3740,7 +3805,7 @@ description = "A boozy, citrus-packed brew." taste_description = "the bartender's frustration" color = "#c6c603" // rgb(198, 198, 3) - strength = 9 + proof = (MARTINI*2+VODKA/3+RUM)/6 glass_name = "Screaming Viking" glass_desc = "A boozy, citrus-packed brew." @@ -3751,7 +3816,7 @@ description = "A bootleg brew of all the worst things on station." taste_description = "cough syrup and fire" color = "#6b0145" // rgb(107, 1, 69) - strength = 10 + proof = 150 glass_name = "Robustin" glass_desc = "A bootleg brew of all the worst things on station." @@ -3762,7 +3827,7 @@ description = "A perfect martini, watered down and ruined." taste_description = "emasculation and failure" color = "#2E6671" // rgb(46, 102, 113) - strength = 60 + proof = GIN*0.75 glass_name = "Virgin Sip" glass_desc = "A perfect martini, watered down and ruined." @@ -3773,7 +3838,7 @@ description = "A thick and vibrant alcoholic gel, perfect for the night life." taste_description = "thick, alcoholic cherry gel" color = "#e00b0b" // rgb(224, 11, 11) - strength = 10 + proof = VODKA/5 glass_name = "Jelly Shot" glass_desc = "A thick and vibrant alcoholic gel, perfect for the night life." @@ -3784,7 +3849,7 @@ description = "A thick and toxic slime jelly shot." taste_description = "liquified organs" color = "#6fa300" // rgb(111, 163, 0) - strength = 10 + proof = VODKA*2 glass_name = "Named Bullet" glass_desc = "A thick slime jelly shot. You can feel your death approaching." @@ -3801,7 +3866,7 @@ description = "A light and refreshing rasberry cocktail." taste_description = "sweet raspberry" color = "#dd00a6" // rgb(221, 0, 166) - strength = 30 + proof = GIN/5 glass_name = "Clover Club" glass_desc = "A light and refreshing rasberry cocktail." @@ -3812,7 +3877,7 @@ description = "A dark, complicated mix of gin and campari... classy." taste_description = "summer nights and wood smoke" color = "#77000d" // rgb(119, 0, 13) - strength = 25 + proof = (GIN+BITTERS+VERMOUTH)/3 glass_name = "Negroni" glass_desc = "A dark, complicated blend, perfect for relaxing nights by the fire." @@ -3823,7 +3888,7 @@ description = "A smokey, refreshing lemoned whiskey." taste_description = "smoke and citrus" color = "#a0692e" // rgb(160, 105, 46) - strength = 20 + proof = WHISKEY/2 glass_name = "Whiskey Sour" glass_desc = "A smokey, refreshing lemoned whiskey." @@ -3834,7 +3899,7 @@ description = "A classic mix of whiskey and sugar... simple and direct." taste_description = "smokey, divine whiskey" color = "#774410" // rgb(119, 68, 16) - strength = 40 + proof = (WHISKEY+BITTERS)/2 glass_name = "Old Fashioned" glass_desc = "A classic mix of whiskey and sugar... simple and direct." @@ -3845,7 +3910,7 @@ description = "Refeshing rum and citrus. Time for a tropical get away." taste_description = "refreshing citrus and rum" color = "#d1ff49" // rgb(209, 255, 73 - strength = 40 + proof = RUM*3/5 glass_name = "Daiquiri" glass_desc = "Refeshing rum and citrus. Time for a tropical get away." @@ -3856,7 +3921,7 @@ description = "Minty rum and citrus, made for sailing." taste_description = "minty rum and lime" color = "#d1ff49" // rgb(209, 255, 73 - strength = 75 // 1/5 rum + proof = RUM/5 glass_name = "Mojito" glass_desc = "Minty rum and citrus, made for sailing." @@ -3868,7 +3933,7 @@ description = "Tequila and citrus, iced just right..." taste_description = "grapefruit and cold fire" color = "#ffb070" // rgb(255, 176, 112) - strength = 75 // 1/3 tequila + proof = TEQUILA/3 glass_name = "Paloma" glass_desc = "Tequila and citrus, iced just right..." @@ -3880,7 +3945,7 @@ description = "Wine Brandy, Lemon, and a dream. A South American classic" taste_description = "light sweetness" color = "#f9f96b" // rgb(249, 249, 107) - strength = 60 // 1/3 brandy + proof = BRANDY/3 glass_name = "Pisco Sour" glass_desc = "South American bliss, served ice cold." @@ -3891,7 +3956,7 @@ description = "Minty, rich, and painfully cold. It's a blizzard in a cup." taste_description = "biting cold" color = "#ffe8c4" // rgb(255, 232, 196) - strength = 45 // 1/3 whiskey + proof = WHISKEY/3 adj_temp = -20 targ_temp = 220 //Dangerous to certain races. Drink in moderation. @@ -3904,7 +3969,7 @@ description = "Minty and refreshing, perfect for a hot day." taste_description = "refreshing mint" color = "#bbfc8a" // rgb(187, 252, 138) - strength = 45 + proof = WHISKEY/3 adj_temp = -5 glass_name = "Mint Julep" @@ -3916,7 +3981,7 @@ description = "Anime's favorite drink." taste_description = "the power of god and anime" color = "#DDDDDD" - strength = 25 + proof = SAKE glass_name = "God's Sake" glass_desc = "A glass of sake." @@ -3927,7 +3992,7 @@ description = "Number one drink AND fueling choice for Russians multiverse-wide." taste_description = "russian steel and a hint of grain" color = "#0064C8" - strength = 10 + proof = 200 glass_name = "Godka" glass_desc = "The glass is barely able to contain the wodka. Xynta." @@ -3949,13 +4014,15 @@ var/adjust_tox = rand(-4, 2) M.adjustToxLoss(adjust_tox * removed) +#define HOLYWINE 100 + /datum/reagent/ethanol/holywine name = "Angel Ichor" id = "holywine" description = "A premium alchoholic beverage made from distilled angel blood." taste_description = "wings in a glass, and a hint of grape" color = "#C4921E" - strength = 20 + proof = HOLYWINE glass_name = "Angel Ichor" glass_desc = "A very pious looking drink." @@ -3967,7 +4034,7 @@ description = "A strange yet pleasurable mixture made of vodka, angel's ichor and lime juice. Or at least you THINK the yellow stuff is angel's ichor." taste_description = "grapes with a hint of lime" color = "#DCAE12" - strength = 20 + proof = (2*VODKA+3*HOLYWINE)/6 glass_name = "Holy Mary" glass_desc = "Angel's Ichor, mixed with Vodka and a lil' bit of lime. Tastes like liquid ascension." @@ -3979,7 +4046,7 @@ taste_description = "sweet victory and sour iron" taste_mult = 1.5 color = "#F3C906" - strength = 30 + proof = (RUM+HOLYWINE)/6 glass_name = "Angels' Wrath" glass_desc = "Just looking at this thing makes you sweat." @@ -3992,7 +4059,7 @@ description = "Miracle time!" taste_description = "sweet forgiveness and bitter iron" color = "#AD772B" - strength = 25 + proof = (HOLYWINE+KAHLUA+RUM)/3 glass_name = "Angel's Kiss" glass_desc = "Miracle time!" @@ -4003,7 +4070,7 @@ description = "A trip to Valhalla." taste_description = "valhalla" color = "#955B37" - strength = 30 + proof = (HOLYWINE+MEAD)/2 glass_name = "Ichor Mead" glass_desc = "A trip to Valhalla." @@ -4023,7 +4090,7 @@ description = "A refreshing drink for the aspiring botanist." taste_description = "happy plants" color = "#F07800" - strength = 85 + proof = RUM/5 glass_name = "Planters Punch" glass_desc = "A refreshing drink for the aspiring botanist." @@ -4033,7 +4100,7 @@ id = "olympusmons" description = "For those that need the extra kick." taste_description = "stronge coffee infused booze" - strength = 25 + proof = (BLACK_RUSSIAN+WHISKEY+RUM)/3 glass_name = "Olympus Mons" glass_desc = "For those that need the extra kick." @@ -4043,7 +4110,7 @@ id = "sazerac" description = "When a regular whiskey cocktail isn't enough." taste_description = "a strong bite of flavor" - strength = 20 + proof = (2*COGNAC+ABSINTHE+BITTERS)/3 glass_name = "Sazerac" glass_desc = "When a regular whiskey cocktail isn't enough." @@ -4053,7 +4120,7 @@ id = "junglejuice" description = "An overload of sweetness and sugary goodness." taste_description = "fruits and bad decisions" - strength = 40 + proof = (VODKA+RUM)/5 glass_name = "Jungle Juice" glass_desc = "An overload of sweetness and sugary goodness." @@ -4063,7 +4130,7 @@ id = "gimlet" description = "For those who want to look fancy with their gin." taste_description = "lime infused tree" - strength = 45 // 1/3 gin + proof = GIN/3 glass_name = "Gimlet" glass_desc = "For those who want to look fancy with their gin." @@ -4073,30 +4140,18 @@ id = "firepunch" description = "A spicy take on a summer classic." taste_description = "rum and sugar" - strength = 45 + proof = RUM/3 targ_temp = 300 glass_name = "Fire Punch" glass_desc = "A spicy take on a summer classic." -/datum/reagent/ethanol/alcsassafras - name = "Hard Rootbeer" - id = "alcsassafras" - description = "Doesn't matter if you're drunk when you have a horse to take you home!" - taste_description = "bitter vanilla with a sharp burn" - strength = 20 - - glass_name = "CC's Hard Rootbeer" - glass_desc = "You'd better carry two guns if you're gonna keep drinking these!" - glass_icon = DRINK_ICON_NOISY - glass_special = list(DRINK_FIZZ) - /datum/reagent/ethanol/newsheriff name = "New Sheriff" id = "newsheriff" description = "A drink to make your saddles blaze!" taste_description = "an earthy kick with a lingering burn" - strength = 35 + proof = (WHISKEY+COGNAC)/3 glass_name = "New Sheriff" glass_desc = "A drink to make your saddles blaze!" @@ -4106,7 +4161,7 @@ id = "thehuckleberry" description = "If I thought you weren't my best customer, I just don't think I could bear it." taste_description = "sweet fruits masking barrel-aged wit" - strength = 20 + proof = WHISKEY/3 adj_temp = -10 glass_name = "The Huckleberry" @@ -4117,7 +4172,7 @@ id = "quickdraw" description = "Nobody was faster than Beauregard. Nobody could outdraw him. Nobody could aim as true as old Jack. If he died, Nobody saw him." taste_description = "aged herbs and gunsmoke" - strength = 35 + proof = (RUM+BITTERS)/3 glass_name = "Quickdraw" glass_desc = "Nobody was faster than Beauregard. Nobody could outdraw him. Nobody could aim as true as old Jack. If he died, Nobody saw him." @@ -4127,7 +4182,7 @@ id = "dmhand" description = "If you find yourself drinking this during a game of poker, keep your back to the wall." taste_description = "a pair of classics and a licorice surprise" - strength = 35 + proof = (WHISKEY+RUM)/3 glass_name = "Dead Man's Hand" glass_desc = "If you find yourself drinking this during a game of poker, keep your back to the wall." @@ -4137,7 +4192,7 @@ id = "snakeoil" description = "A 'healthy' potion with a bite! Now with 56% less Arsenic." taste_description = "sour alcohol and something metallic" - strength = 75 + proof = ABSINTHE/3 druggy = 15 toxicity = 2 adj_temp = 5 @@ -4150,7 +4205,7 @@ id = "highnoon" description = "There's two kinds of people here on the Frontier, partner. Those with guns, and those who drink. You drink." taste_description = "aged whiskey and earthy metals" - strength = 30 + proof = WHISKEY/5 adj_temp = 2 glass_name = "High Noon" @@ -4161,7 +4216,7 @@ id = "bloodmeridian" description = "The perfect drink for when you want to dance and fiddle all night. Does it work? You be The Judge." taste_description = "lingering regret, gunpowder, and blood" - strength = 50 + proof = 40 blood_content = 0.4 glass_name = "Blood Meridian" @@ -4172,7 +4227,7 @@ id = "theoutlaw" description = "If you're planning to cheat or rob 'em, you gotta be quick. Either on the draw, or on your horse." taste_description = "a violent life on the run" - strength = 50 + proof = (VODKA+BITTERS)/3 glass_name = "The Outlaw" glass_desc = "If you're planning to cheat or rob 'em, you gotta be quick. Either on the draw, or on your horse." @@ -4182,7 +4237,7 @@ id = "thelawman" description = "They ran out five men before I took up the badge. Since then I've hung twenty." taste_description = "robust coffee and an open campfire" - strength = 65 + proof = WHISKEY/5 adj_temp = 25 glass_name = "The Lawman" @@ -4193,7 +4248,7 @@ id = "hangmansnoose" description = "To some looking at their final days in a cell, this drink is a better mercy than the gallows. Doesn't make it go down any easier." taste_description = "a dusty rope and blood in the nostrils" - strength = 60 + proof = 100 toxicity = 10 glass_name = "Hangman's Noose" @@ -4204,7 +4259,7 @@ id = "bigiron" description = "Have this one, partner. Then have nineteen more." taste_description = "a mysterious visit and the red Texas sky" - strength = 30 // 2/3 rum, rounded up to 30 (was 45) + proof = RUM*2/3 glass_name = "Big Iron" glass_desc = "Have this one, partner. Then have nineteen more." @@ -4214,7 +4269,7 @@ id = "lastcactus" description = "If you can get past its spines, it's filled with cool, clear water." taste_description = "refreshing sweetness and a cold burn" - strength = 30 + proof = VODKA/5 adj_temp = -10 glass_name = "Last Cactus" @@ -4225,7 +4280,7 @@ id = "thebestboy" description = "An eternal tribute to the best crewmember to ever work on Space Station 13. Keep away from washing machines." taste_description = "cool cream, refreshing orange, and strong alcohol" - strength = 50 + proof = SCREWDRIVERCOCKTAIL*3/5 adj_temp = -5 glass_name = "The Best Boy" @@ -4236,7 +4291,7 @@ id = "phobos" description = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." taste_description = "grain alcohol" - strength = 15 + proof = 150 glass_name = "Phobos" glass_desc = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." @@ -4246,7 +4301,7 @@ id = "greenstuff" description = "Tyrmalin grog aggressively blended with unfiltered absinthe." taste_description = "black licorice and thick malt" - strength = 5 + proof = 400 // again: how do they do it? glass_name = "Green Stuff" glass_desc = "Tyrmalin grog aggressively blended with unfiltered absinthe." @@ -4257,7 +4312,7 @@ description = "This warm, thick drink has a subtle, tangy sweetness to it. Although visually reminiscent of lava, it's actually very hydrating!" taste_description = "faint, tangy sweetness" color = "#CCCC99" - strength = 50 + proof = (WHISKEY+CIDER)/5 adj_temp = -5 glass_name = "Goliath Spit" @@ -4269,7 +4324,7 @@ description = "Not just another Bloody Mary. Mary on a cross." taste_description = "copper, tomatoes, and heretical sweetness" color = "#B40000" - strength = 30 + proof = (VODKA/3+VODKA)/5 blood_content = 0.2 glass_name = "Mary On a Cross" @@ -4281,78 +4336,11 @@ description = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." taste_description = "honey and royalty" color = "#f0d76b" - strength = 50 + proof = (2*BRANDY)/5 glass_name = "Royal Jelly" glass_desc = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." -/datum/reagent/ethanol/coquito - name = "Coquito" - id = "coquito" - description = "A holiday beverage akin to eggnog, made with coconut milk." - taste_description = "creamy spiced coconut" - color = "#ffffff" - strength = 50 - - glass_name = "Coquito" - glass_desc = "It's a little coconut!" - -/datum/reagent/ethanol/pinacolada - name = "Pina Colada" - id = "pinacolada" - description = "Rum, pineapple, and coconut plended up with ice." - taste_description = "coconuts and pineapple soaked in rum" - color = "#fdf49e" - strength = 45 // 1/3 rum - - glass_name = "Piña Colada" - glass_desc = "For those not into yoga." - -/datum/reagent/ethanol/mimosa - name = "Mimosa" - id = "mimosa" - description = "An airy blend of champagne and orange juice, often drunk as a morning refreshment." - taste_description = "orange juice and a dry, bubbly wine" - color = "#daa411" - strength = 60 // 1/2 champagne - - glass_name = "Mimosa" - glass_desc = "A bubbly and tangy refreshment." - -//Never Fade Away -/datum/reagent/ethanol/silverhand - name = "Johnny Silverhand" - id = "silverhand" - description = "Old fashioned, beer, and chili. A drink for an angry, angry soul." - taste_description = "an old-world classic with a firey finish" - color = "#8d5b28" // rgb(119, 68, 16) - strength = 20 - - glass_name = "Johnny Silverhand" - glass_desc = "...at the end of it all, it's the code you live by that defines who you are." - -/datum/reagent/ethanol/welles - name = "Jackie Welles" - id = "welles" - description = "An updated take on a Moscow Mule, for those trying to make a fresh mark on the world." - taste_description = "vodka and lime with a burst of fizzy ginger" - color = "#db7878" // rgb(119, 68, 16) - strength = 20 - - glass_name = "Jackie Welles" - glass_desc = "But that's done after tomorrow. Afterlife, here we come, baby!" - -/datum/reagent/ethanol/martinez - name = "David Martinez" - id = "martinez" - description = "Vodka and cola with a splash of sakura. A drink for those who shoot for the moon." - taste_description = "vodka, cola, and sakura flower" - color = "#206cc4" // rgb(119, 68, 16) - strength = 20 - - glass_name = "David Martinez" - glass_desc = "You still have a dream to stick around for. Need you to see it through. That's my dream." - //This functions the same as Doctor's Delight, except it gets you drunk too. /datum/reagent/ethanol/royaljelly/affect_ingest(mob/living/carbon/M, alien, removed) . = ..() @@ -4366,8 +4354,77 @@ if(M.confused) M.Confuse(-5) +/datum/reagent/ethanol/coquito + name = "Coquito" + id = "coquito" + description = "A holiday beverage akin to eggnog, made with coconut milk." + taste_description = "creamy spiced coconut" + color = "#ffffff" + proof = RUM/3*2/5 + + glass_name = "Coquito" + glass_desc = "It's a little coconut!" + +/datum/reagent/ethanol/pinacolada + name = "Pina Colada" + id = "pinacolada" + description = "Rum, pineapple, and coconut plended up with ice." + taste_description = "coconuts and pineapple soaked in rum" + color = "#fdf49e" + proof = RUM/3 + + glass_name = "Piña Colada" + glass_desc = "For those not into yoga." + +/datum/reagent/ethanol/mimosa + name = "Mimosa" + id = "mimosa" + description = "An airy blend of champagne and orange juice, often drunk as a morning refreshment." + taste_description = "orange juice and a dry, bubbly wine" + color = "#daa411" + proof = WINE/2 + + glass_name = "Mimosa" + glass_desc = "A bubbly and tangy refreshment." + +//Never Fade Away +/datum/reagent/ethanol/silverhand + name = "Johnny Silverhand" + id = "silverhand" + description = "Old fashioned, beer, and chili. A drink for an angry, angry soul." + taste_description = "an old-world classic with a firey finish" + color = "#8d5b28" // rgb(119, 68, 16) + proof = (((WHISKEY+BITTERS)/3)+BEER)/3 + + glass_name = "Johnny Silverhand" + glass_desc = "...at the end of it all, it's the code you live by that defines who you are." + +/datum/reagent/ethanol/welles + name = "Jackie Welles" + id = "welles" + description = "An updated take on a Moscow Mule, for those trying to make a fresh mark on the world." + taste_description = "vodka and lime with a burst of fizzy ginger" + color = "#db7878" // rgb(119, 68, 16) + proof = VODKA/9 + + glass_name = "Jackie Welles" + glass_desc = "But that's done after tomorrow. Afterlife, here we come, baby!" + +/datum/reagent/ethanol/martinez + name = "David Martinez" + id = "martinez" + description = "Vodka and cola with a splash of sakura. A drink for those who shoot for the moon." + taste_description = "vodka, cola, and sakura flower" + color = "#206cc4" // rgb(119, 68, 16) + proof = VODKA/3 + + glass_name = "David Martinez" + glass_desc = "You still have a dream to stick around for. Need you to see it through. That's my dream." + //Blood-based Cocktails +#define DEMONSBLOOD 100 + /datum/reagent/ethanol/demonsblood name = "Demons Blood" id = "demonsblood" @@ -4375,7 +4432,7 @@ taste_description = "sweet tasting iron" taste_mult = 1.5 color = "#820000" - strength = 15 + proof = DEMONSBLOOD blood_content = 1 glass_name = "Demons' Blood" @@ -4387,7 +4444,7 @@ description = "Creepy time!" taste_description = "bitter iron" color = "#A68310" - strength = 15 + proof = DEMONSBLOOD blood_content = 1 glass_name = "Devil's Kiss" @@ -4399,7 +4456,7 @@ description = "When the tang of blood and citrus hits, your tongue just might finally be able to pronounce some of the scrawls seen in the tunnels..." taste_description = "bitter iron and citrus" color = "#7D1717" - strength = 50 + proof = DEMONSBLOOD/3 blood_content = 1 glass_name = "Nar'Sour" @@ -4411,7 +4468,7 @@ description = "Nanotrasen's 2518 Pet of The Year has been swept up in the Geometer's brilliant crimson tide! Yap!" taste_description = "bloody orange creamsicle with a bite (and a bark!)" color = "#7D1717" - strength = 50 + proof = ((DEMONSBLOOD/3)+(SCREWDRIVERCOCKTAIL*3/5))/2 blood_content = 1 glass_name = "Nar'Sian" @@ -4422,7 +4479,7 @@ description = "A nighttime vigilante and a bloodsucking parasite could bond over a drink like this." taste_description = "iron, a dash of whiskey, and a hint of molasses" color = "#990033" - strength = 20 + proof = (WHISKEY_SPECIAL_BLEND+ABSINTHE)/3 blood_content = 2 glass_name = "Night's Delight" @@ -4434,7 +4491,7 @@ description = "A delectable cocktail for a classy vampire." taste_description = "metallic, citrusy fizz" color = "#CC0000" - strength = 20 + proof = WINE/3 blood_content = 1 glass_name = "Blud's Fizz" @@ -4445,7 +4502,7 @@ description = "The chaplain might've put on the wrong hat this morning..." taste_description = "some really sinful grapes" color = "#660000" - strength = 20 + proof = WINE/2 blood_content = 1 glass_name = "Wrong Hat" @@ -4457,7 +4514,7 @@ description = "It's like someone took a straw to your brain and just went wild." taste_description = "grey matter" color = "#575e49" - strength = 20 + proof = (VODKA+KAHLUA)/3 blood_content = 1 glass_name = "Brain Drain" @@ -4471,7 +4528,7 @@ description = "The secret reason a bishop's hat is so tall." taste_description = "some really pious grapes" color = "#330033" - strength = 20 + proof = 100 // oops! unused! glass_name = "Holy Grail" glass_desc = "The secret reason a bishop's hat is so tall." @@ -4726,27 +4783,19 @@ taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol" color = "#9f6aff" taste_mult = 5 - strength = 10 + proof = 500 adj_temp = 10 targ_temp = 330 glass_name = "Deathbell" glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on." -/datum/reagent/ethanol/deathbell/affect_ingest(mob/living/carbon/M, alien, removed) - . = ..() - - if(. >= strength) // Early warning - M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. - if(. >= strength * 2.5) // Slurring takes longer. Again, intentional. - M.slurring = max(M.slurring, 30) - /datum/reagent/ethanol/monstertamer name = "Monster Tamer" id = "monstertamer" description = "A questionably-delicious blend of a carnivore's favorite food and a potent neural depressant." taste_description = "the gross yet satisfying combination of chewing on a raw steak while downing a shot of whiskey" - strength = 50 + proof = WHISKEY/2 color = "#d3785d" metabolism = REM * 2.5 // about right for mixing nutriment and ethanol. var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. @@ -4793,7 +4842,7 @@ id = "galacticpanic" description = "The absolute worst thing you could ever put in your body." taste_description = "an entire galaxy collasping in on itself." - strength = 10 + proof = 400 druggy = 50 halluci = 30 var/adj_dizzy = 10 @@ -4806,17 +4855,13 @@ . = ..() M.afflict_stun(20 * 2) - if(. >= strength) // Early warning - M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. - if(. >= strength * 2.5) // Slurring takes longer. Again, intentional. - M.slurring = max(M.slurring, 30) /datum/reagent/ethanol/lotus name = "Lotus" id = "lotus" description = "The result of making one mistake after another and trying to cover it up with sugar." taste_description = "rich, sweet fruit and even more sugar." - strength = 25 + proof = (WINE+VERMOUTH)/6 color = "#d3785d" glass_name = "Lotus" @@ -4827,7 +4872,7 @@ id = "sbagliato" description = "A drink invented because a bartender was too drunk." taste_description = "sweet bubbly wine and vermouth." - strength = 30 + proof = (WINE+VERMOUTH)/3 color = "#d3785d" glass_name = "Negroni Sbagliato" @@ -4836,13 +4881,13 @@ /datum/reagent/ethanol/fusionnaire name = "Fusionnaire" id = "fusionnaire" - description = "The one true ellusive, some even consider it never existed!" + description = "The one true elusive, some even consider it never existed!" taste_description = "strong currents of fresh zesty winds" color = "#E6E2AA" - strength = 65 + proof = (VODKA*2+SCHNAPPS*2+RUM)/9 glass_name = "Fusionnaire" - glass_desc = "The one true ellusive, lighter than air, harder than the mountains!" + glass_desc = "The one true elusive, lighter than air, harder than the mountains!" /datum/reagent/ethanol/originalsin name = "Original Sin" @@ -4850,7 +4895,7 @@ description = "Angel Ichor, entirely transformed by one drop of apple juice" taste_description = "the apple Eve gave to Adam" color = "#99CC35" - strength = 17 + proof = HOLYWINE*1.5 glass_name = "Original Sin" glass_desc = "A drink so fine, you may just risk eternal damnation!" @@ -4860,7 +4905,7 @@ id = "bulldog" description = "An inventive kahlua recipe." taste_description = "fizzy, creamy, soda and coffee hell." - strength = 30 + proof = BLACK_RUSSIAN*2/3*4/5 color = "#d3785d" glass_name = "Space Bulldog" @@ -4871,7 +4916,7 @@ id = "italiancrisis" description = "This drink was concocted by a madwoman, causing the Italian Crisis of 2123." taste_description = "cola, fruit, fizz, coffee, and cream swirled together in an old boot." - strength = 20 + proof = (((WINE+VERMOUTH)/3)+(BLACK_RUSSIAN*2/3*4/5))/2 // the things we do for code color = "#d3785d" glass_name = "Italian Crisis" @@ -4930,8 +4975,7 @@ id = "honeyshot" description = "The perfect drink for bees." taste_description = "sweet tart grenadine flavored with honey." - strength = 40 - var/adj_dizzy = 10 + proof = VODKA/3 color = "#d3785d" glass_name = "Honey shot" @@ -4942,7 +4986,7 @@ id = "scsatw" description = "The screwdriver's bigger cousin." taste_description = "smooth, savory booze and tangy orange juice." - strength = 30 + proof = (3*SCREWDRIVERCOCKTAIL+RUM+WHISKEY+GIN)/6 color = "#d3785d" glass_name = "Slow Comfortable Screw Against the Wall" @@ -4963,7 +5007,7 @@ id = "unsweettea" description = "A sick experiment to take the sweetness out of tea after sugar has been added resulted in this." taste_description = "bland, slightly bitter, discount black tea." - strength = 80 + proof = 25 druggy = 10 color = "#d3785d" @@ -4975,8 +5019,7 @@ id = "lovemaker" description = "A drink said to help one find true love." taste_description = "sweet fruit and honey." - strength = 30 - var/adj_dizzy = 30 + proof = SCREWDRIVERCOCKTAIL/2*5/6 adj_temp = 10 targ_temp = 360 color = "#d3785d" @@ -4989,7 +5032,7 @@ id = "peacetreaty" description = "A Tajaran cocktail named (somewhat in jest) of the peace treaty that ended the civil war on Adhomai." color = "#DFDF93" - strength = 21 + proof = (VICTORY_GIN+MESSA_MEAD)/3 taste_description = "tart, oily honey" glass_icon_state = "peacetreatyglass" @@ -5001,7 +5044,7 @@ id = "winter_offensive" description = "The Tajaran equivalent of Gin 'On the Rocks', named after the famous People Republic of Adhomai military campaign." color = "#664300" - strength = 15 + proof = VICTORY_GIN/2 taste_description = "oily gin" adj_temp = 10 targ_temp = 270 @@ -5015,7 +5058,7 @@ id = "internationale" description = "A cocktail mixing Tajaran gin and Pan-Slavic Vodka. A symbol of unity between Human and Tajaran leftists." color = "#D9CCAA" - strength = 28 + proof = (VICTORY_GIN+VODKA)/2 taste_description = "earthy, oily unity" glass_icon_state = "internationaleglass" @@ -5030,7 +5073,7 @@ description = "A White Russian gone awry." taste_description = "milky grain alcohol" color = "#9fbbd8" - strength = 30 + proof = VODKA/2 glass_name = "Russian Bastard" glass_desc = "A White Russian gone awry." @@ -5041,7 +5084,7 @@ description = "Often lost and now found." taste_description = "the strength to go on" color = "#9ce454" - strength = 30 + proof = (COGNAC+KAHLUA*3+MELON_LIQUOR*3)/9 glass_name = "A Will to Live" glass_desc = "Often lost and now found." @@ -5052,7 +5095,7 @@ description = "A horrid concoction of deathbell and nuclear waste. Is this really necessary?" taste_description = "radioactivity and alcohol poisoning" color = "#6c3c94" - strength = 10 + proof = 400 glass_name = "A Desire to Die" glass_desc = "Deathbell and nuclear waste. The bane of your liver." @@ -5085,7 +5128,7 @@ description = "The daiquiri's dry cousin." taste_description = "sickly sweetness" color = "#be5227" - strength = 10 + proof = COGNAC*5/9 glass_name = "Sidecar" glass_desc = "The daiquiri's dry cousin." @@ -5096,7 +5139,7 @@ description = "Named after a field artillery gun. Enough said." taste_description = "the impact of a 75mm shell" color = "#d8d4ad" - strength = 35 + proof = (GIN+2*WINE)/4 glass_name = "French 75" glass_desc = "Named after a field artillery gun. Enough said." @@ -5107,7 +5150,7 @@ description = "A French 75 with the gin substituted for vodka." taste_description = "the impact of a harder 75mm shell" color = "#d8d4ad" - strength = 25 + proof = (VODKA+2*WINE)/4 glass_name = "French 76" glass_desc = "A French 75 with the gin substituted for vodka." @@ -5118,7 +5161,7 @@ description = "Made on Terra when and where alcohol was illegal. How defiant." taste_description = "sweet and sour defiance" color = "#f1e362" - strength = 30 + proof = GIN/4 glass_name = "Last Word" glass_desc = "Made on Terra when and where alcohol was illegal. How defiant." @@ -5295,7 +5338,7 @@ description = "A drink made from the venom of the Yuum." taste_description = "harsh and stinging sweetness" color = "#550000" - strength = 10 + proof = 200 glass_name = "Mumbak sting" glass_desc = "A drink made from the venom of the Yuum." @@ -5305,7 +5348,7 @@ description = "Wine made from various fruits from the swamps of Moghes." taste_description = "swampy fruit" color = "#6b596b" - strength = 15 + proof = 150 glass_name = "wasgaelhi" glass_desc = "Wine made from various fruits from the swamps of Moghes."