diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index 5017fda9fce..7ba4bd151cc 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -495,6 +495,45 @@ /datum/reagent/alcohol/ethanol/tallrussian value = 0.15 +/datum/reagent/alcohol/ethanol/solarian_white + value = 0.125 + +/datum/reagent/alcohol/ethanol/solarian_marine + value = 0.2 + +/datum/reagent/alcohol/ethanol/cloudyoran + value = 0.12 + +/datum/reagent/alcohol/ethanol/djinntea + value = 0.12 + +/datum/reagent/alcohol/ethanol/permanentrevolution + value = 0.13 + +/datum/reagent/alcohol/ethanol/internationale + value = 0.13 + +/datum/reagent/alcohol/ethanol/dionamama + value = 0.2 + +/datum/reagent/alcohol/ethanol/jovianstorm + value = 0.13 + +/datum/reagent/alcohol/ethanol/primeminister + value = 0.13 + +/datum/reagent/alcohol/ethanol/peacetreaty + value = 0.15 + +/datum/reagent/alcohol/ethanol/fiscream + value = 0.14 + +/datum/reagent/alcohol/ethanol/coffee/fiscoffee + value = 0.13 + +/datum/reagent/alcohol/ethanol/fisfirebomb + value = 0.15 + /datum/reagent/inaprovaline value = 2.5 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 eca06cfde6c..65dc41508e2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2183,6 +2183,17 @@ glass_desc = "It has an oily smell and doesn't taste like typical gin." glass_center_of_mass = list("x"=16, "y"=12) +/datum/reagent/alcohol/ethanol/djinntea + name = "Djinn Tea" + description = "A mildly alcoholic spin on a popular Skrell drink." + color = "#84C0C0" + strength = 20 + taste_description = "fizzy mint tea" + + glass_icon_state = "djinnteaglass" + glass_name = "glass of Djinn Tea" + glass_desc = "A mildly alcoholic spin on a popular Skrell drink. Less good for you than the original." + //Base type for alchoholic drinks containing coffee /datum/reagent/alcohol/ethanol/coffee overdose = 45 @@ -2261,6 +2272,18 @@ glass_desc = "A glass of sake." glass_center_of_mass = list("x"=16, "y"=12) +/datum/reagent/alcohol/ethanol/cloudyoran + name = "Cloudy Oran" + description = "Reminds Suits of home. Dregs, not so much." + color = "#F6F6F6" + strength = 15 + taste_description = "soy milk putting on airs" + + glass_icon_state = "cloudyoranglass" + glass_name = "glass of Cloudy Oran" + glass_desc = "A frothy white beverage. Reminds Suits of home. Dregs, not so much." + glass_center_of_mass = list("x"=16, "y"=5) + /datum/reagent/alcohol/ethanol/soju name = "Soju" description = "A mild Konyanger spirit that is best described as rice vodka." @@ -2489,6 +2512,31 @@ glass_desc = "Tropical cocktail" glass_center_of_mass = list("x"=16, "y"=5) +/datum/reagent/alcohol/ethanol/diona_mama + name = "Diona Mama" + description = "Lightly irradiated." + color = "#56A05D" + strength = 25 + druggy = 25 + taste_description = "tangy, irradiated licorice" + + glass_icon_state = "dionamamaglass" + glass_name = "glass of Diona Mama" + glass_desc = "Lightly irradiated, just the way Dionae like it." + glass_center_of_mass = list("x"=16, "y"=5) + +/datum/reagent/alcohol/ethanol/jovian_storm + name = "Jovian Storm" + description = "Named after Jupiter’s storm. It’ll blow you away." + color = "#AA856A" + strength = 15 + taste_description = "stormy sweetness" + + glass_icon_state = "jovianstormglass" + glass_name = "glass of Jovian Storm" + glass_desc = "A classic Callistean drink named after Jupiter’s storm. It’ll blow you away." + glass_center_of_mass = list("x"=16, "y"=5) + /datum/reagent/alcohol/ethanol/bananahonk name = "Banana Mama" description = "A drink from Clown Heaven." @@ -2664,6 +2712,19 @@ glass_desc = "A classic mix of rum, cola, and lime." glass_center_of_mass = list("x"=16, "y"=8) +/datum/reagent/alcohol/ethanol/rumandcola + name = "Rum and Cola" + description = "A classic cocktail consisting of rum and cola." + color = "#3E1B00" + strength = 10 + taste_description = "cola" + carbonated = TRUE + + glass_icon_state = "rumandcolaglass" + glass_name = "glass of Rum and Cola" + glass_desc = "A classic mix of rum and cola." + glass_center_of_mass = list("x"=16, "y"=8) + /datum/reagent/alcohol/ethanol/demonsblood name = "Demons Blood" description = "AHHHH!!!!" @@ -2842,6 +2903,19 @@ glass_desc = "An irish car bomb." glass_center_of_mass = list("x"=16, "y"=8) +/datum/reagent/alcohol/ethanol/fisfirebomb + name = "Fisanduhian Firebomb" + description = "Mmm, tastes like spicy chocolate..." + color = "#320C00" + strength = 50 + taste_description = "anti-dominian sentiment" + carbonated = TRUE + + glass_icon_state = "fisfirebombglass" + glass_name = "glass of Fisanduhian Firebomb" + glass_desc = "The somewhat spicier cousin to the Irish Car Bomb." + glass_center_of_mass = list("x"=16, "y"=8) + /datum/reagent/alcohol/ethanol/coffee/irishcoffee name = "Irish Coffee" description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." @@ -2855,6 +2929,19 @@ glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." glass_center_of_mass = list("x"=15, "y"=10) +/datum/reagent/alcohol/ethanol/coffee/fiscoffee + name = "Fisanduhian Coffee" + description = "Coffee, and spicy alcohol. Popular among people who dislike Dominians." + color = "#A9501C" + strength = 50 + caffeine = 0.3 + taste_description = "giving up on peaceful coexistence" + + glass_icon_state = "giscoffeeglass" + glass_name = "glass of Fisanduhian coffee" + glass_desc = "It's like an Irish coffee, but spicy and angry about Dominia." + glass_center_of_mass = list("x"=15, "y"=10) + /datum/reagent/alcohol/ethanol/irishcream name = "Irish Cream" description = "Whiskey-imbued cream, what else would you expect from the Irish." @@ -2867,6 +2954,18 @@ glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" glass_center_of_mass = list("x"=16, "y"=9) +/datum/reagent/alcohol/ethanol/fiscream + name = "Fisanduhian Cream" + description = "A sweet, slightly spicy alcoholic cream. Fisanduh is not yet lost." + color = "#C8AC97" + strength = 25 + taste_description = "creamy spiced alcohol" + + glass_icon_state = "irishcreamglass" + glass_name = "glass of Fisanduhian cream" + glass_desc = "A sweet, slightly spicy alcoholic cream. Fisanduh is not yet lost." + glass_center_of_mass = list("x"=16, "y"=9) + /datum/reagent/alcohol/ethanol/longislandicedtea name = "Long Island Iced Tea" description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." @@ -3280,6 +3379,59 @@ glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." glass_center_of_mass = list("x"=16, "y"=9) +/datum/reagent/alcohol/ethanol/solarian_white + name = "Solarian White" + description = "Despite the name, this is not a security officer." + color = "#C3D1D4" + strength = 30 + taste_description = "creamy vodka and lime" + + glass_icon_state = "solarianwhiteglass" + glass_name = "glass of Solarian White" + glass_desc = "A classic Solarian cocktail. Despite the name, this is not a security officer." + + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/alcohol/ethanol/solarian_marine + name = "Solarian Marine" + description = "Drink too many of these, and you'll wake up invading Tau Ceti." + reagent_state = LIQUID + color = "#33567A" + strength = 35 + taste_description = "polished boots and nationalism" + + glass_icon_state = "solarianmarineglass" + glass_name = "Solarian Marine" + glass_desc = "Drink too many of these, and you'll wake up invading Tau Ceti." + + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/alcohol/ethanol/permanent_revolution + name = "Permanent Revolution" + description = "You have nothing to lose but your sobriety." + color = "#A7AA60" + strength = 65 + taste_description = "strong, earthy licorice" + + glass_icon_state = "permanentrevolutionglass" + glass_name = "glass of Permanent Revolution" + glass_desc = "A Himean cocktail, so named for its tendency to make the room spin. You have nothing to lose but your sobriety." + + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/alcohol/ethanol/internationale + name = "Solarian White" + description = "The subversive's choice." + color = "#D9CCAA" + strength = 28 + taste_description = "earthy, oily unity" + + glass_icon_state = "internationaleglass" + glass_name = "glass of Internationale" + glass_desc = "The nearest thing the Orion Spur has to left unity. The subversive's choice." + + glass_center_of_mass = list("x"=16, "y"=9) + /datum/reagent/alcohol/ethanol/whiskeycola name = "Whiskey Cola" description = "Whiskey, mixed with cola. Surprisingly refreshing." @@ -3437,6 +3589,28 @@ glass_name = "glass of Metropolitan" glass_desc = "What more could you ask for?" +/datum/reagent/alcohol/ethanol/primeminister + name = "Prime Minister" + description = "All the fun of power, none of the assassination risk!" + color = "#FF3C00" + strength = 30 + taste_description = "political power" + + glass_icon_state = "primeministerglass" + glass_name = "glass of Prime Minister" + glass_desc = "All the fun of power, none of the assassination risk!" + +/datum/reagent/alcohol/ethanol/peacetreaty + name = "Peace Treaty" + description = "A diplomatic overture in a glass." + color = "#DFDF93" + strength = 21 + taste_description = "tart, oily honey" + + glass_icon_state = "peacetreatyglass" + glass_name = "glass of Peace Treaty" + glass_desc = "A diplomatic overture in a glass" + /datum/reagent/alcohol/ethanol/caruso name = "Caruso" description = "Green, almost alien." @@ -4437,16 +4611,3 @@ condiment_desc = "A vegetarian friendly way to add a little extra pizazz to any dish." condiment_icon_state = "dionaepowder" condiment_center_of_mass = list("x"=16, "y"=10) - -/datum/reagent/alcohol/ethanol/rumandcola - name = "Rum and Cola" - description = "A classic cocktail consisting of rum and cola." - color = "#3E1B00" - strength = 10 - taste_description = "cola" - carbonated = TRUE - - glass_icon_state = "rumandcolaglass" - glass_name = "glass of Rum and Cola" - glass_desc = "A classic mix of rum and cola." - glass_center_of_mass = list("x"=16, "y"=8) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 638095bbec3..cd81585e89b 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -794,7 +794,7 @@ /datum/chemical_reaction/plastication/on_reaction(var/datum/reagents/holder, var/created_volume) new /obj/item/stack/material/plastic(get_turf(holder.my_atom), created_volume) return - + /datum/chemical_reaction/uraniumsolidification name = "Uranium" id = "soliduranium" @@ -3673,5 +3673,96 @@ name = "Cuba Libre" id = "cubalibre" result = /datum/reagent/alcohol/ethanol/cubalibre - required_reagents = list(/datum/reagent/alcohol/ethanol/rumandcola = 5, /datum/reagent/drink/limejuice = 1) + required_reagents = list(/datum/reagent/alcohol/ethanol/rumandcola = 2, /datum/reagent/drink/limejuice = 1) + result_amount = 3 + +/datum/chemical_reaction/drink/solarian_white + name = "Solarian White" + id = "solarian_white" + result = /datum/reagent/alcohol/ethanol/solarian_white + required_reagents = list(/datum/reagent/alcohol/ethanol/vodka = 1, /datum/reagent/drink/milk/cream = 1, /datum/reagent/drink/limejuice =1) + result_amount = 3 + +/datum/chemical_reaction/drink/solarian_marine + name = "Solarian Marine" + id = "solarian_marine" + result = /datum/reagent/alcohol/ethanol/solarian_marine + required_reagents = list(/datum/reagent/drink/tea/securitea = 1, /datum/reagent/alcohol/ethanol/whiskey = 1) + result_amount = 2 + +/datum/chemical_reaction/drink/cloudyoran + name = "Cloudy Oran" + id = "cloudyoran" + result = /datum/reagent/alcohol/ethanol/cloudyoran + required_reagents = list(/datum/reagent/alcohol/ethanol/sake = 1, /datum/reagent/drink/tea/greentea = 1, /datum/reagent/drink/milk/soymilk = 1) + result_amount = 3 + +/datum/chemical_reaction/drink/djinntea + name = "Djinn Tea" + id = "djinntea" + result = /datum/reagent/alcohol/ethanol/djinntea + required_reagents = list(/datum/reagent/drink/dynjuice/cold = 1, /datum/reagent/alcohol/ethanol/gin = 1) + result_amount = 2 + +/datum/chemical_reaction/drink/permanent_revolution + name = "Permanent Revolution" + id = "permanent_revolution" + result = /datum/reagent/alcohol/ethanol/permanent_revolution + required_reagents = list(/datum/reagent/alcohol/ethanol/absinthe = 1, /datum/reagent/alcohol/ethanol/vodka/mushroom = 1) + result_amount = 2 + +/datum/chemical_reaction/drink/internationale + name = "Internationale" + id = "internationale" + result = /datum/reagent/alcohol/ethanol/internationale + required_reagents = list(/datum/reagent/alcohol/ethanol/victorygin = 1, /datum/reagent/alcohol/ethanol/vodka/mushroom = 1) + result_amount = 2 + +/datum/chemical_reaction/drink/diona_mama + name = "Diona Mama" + id = "diona_mama" + result = /datum/reagent/alcohol/ethanol/diona_mama + required_reagents = list(/datum/reagent/alcohol/ethanol/absinthe = 2, /datum/reagent/drink/limejuice = 2, /datum/reagent/radium = 1, /datum/reagent/drink/ice = 1) result_amount = 6 + +/datum/chemical_reaction/drink/jovian_storm + name = "Jovian Storm" + id = "jovian_storm" + result = /datum/reagent/alcohol/ethanol/jovian_storm + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 2, /datum/reagent/drink/grenadine = 2, /datum/reagent/drink/lemonjuice = 1, /datum/reagent/drink/ice = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/primeminister + name = "Prime Minister" + id = "primeminister" + result = /datum/reagent/alcohol/ethanol/primeminister + required_reagents = list(/datum/reagent/alcohol/ethanol/rum = 4, /datum/reagent/alcohol/ethanol/vermouth = 1, /datum/reagent/drink/grenadine = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/peacetreaty + name = "Peace Treaty" + id = "peacetreaty" + result = /datum/reagent/alcohol/ethanol/peacetreaty + required_reagents = list(/datum/reagent/alcohol/ethanol/victorygin = 1, /datum/reagent/alcohol/ethanol/messa_mead = 1, /datum/reagent/drink/lemonjuice = 1) + result_amount = 3 + +/datum/chemical_reaction/drink/fiscream + name = "Fisanduhian Cream" + id = "fiscream" + result = /datum/reagent/alcohol/ethanol/fiscream + required_reagents = list(/datum/reagent/alcohol/ethanol/fireball = 2, /datum/reagent/drink/milk/cream = 1) + result_amount = 3 + +/datum/chemical_reaction/drink/fiscoffee + name = "Fisanduhian Coffee" + id = "fiscoffee" + result = /datum/reagent/alcohol/ethanol/coffee/fiscoffee + required_reagents = list(/datum/reagent/alcohol/ethanol/fiscream = 1, /datum/reagent/drink/coffee = 1) + result_amount = 2 + +/datum/chemical_reaction/drink/fisfirebomb + name = "Fisanduhian Firebomb" + id = "fiscarbomb" + result = /datum/reagent/alcohol/ethanol/fisfirebomb + required_reagents = list(/datum/reagent/alcohol/ethanol/ale = 1, /datum/reagent/alcohol/ethanol/fiscream = 1) + result_amount = 2 diff --git a/html/changelogs/loredrinksbychev.yml b/html/changelogs/loredrinksbychev.yml new file mode 100644 index 00000000000..4aa6d428813 --- /dev/null +++ b/html/changelogs/loredrinksbychev.yml @@ -0,0 +1,7 @@ +author: Chevy + +delete-after: True + +changes: + - rscadd: "Added thirteen new cocktail recipes with unique sprites inspired by the lore. Now, you too can taste a Cloudy Oran or a Jovian Storm!" + - tweak: "Changed the cuba libre recipe I changed a while back. It should now be simpler to make in large quantities." \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index c167f1b2bae..6d4d66a707f 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ