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 af982d81928..b353c86f98c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3302,11 +3302,181 @@ description = "An alcoholic beverage made from lightly fermented Sareszhi berries, considered an upper class delicacy on Moghes. Significant butanol content indicates intoxicating effects on Unathi." color = "#bf8fbc" strength = 20 - taste_description = "grape soda" + taste_description = "berry juice" glass_icon_state = "sarezhiglass" glass_name = "glass of Sarezhi Wine" - glass_desc = "It tastes like flat grape soda. Is this supposed to be alcoholic?" + glass_desc = "It tastes like plain berry juice. Is this supposed to be alcoholic?" + +//Kaed's Unathi Cocktails +//======= +//What an exciting time we live in, that lizards may drink fruity girl drinks. +/datum/reagent/alcohol/butanol/moghesmargarita + name = "Moghes Margarita" + id = "moghesmargarita" + description = "A classic human cocktail, now ruined with cactus juice instead of tequila." + color = "#8CFF8C" + strength = 30 + taste_description = "lime juice" + + glass_icon_state = "cactusmargarita" + glass_name = "glass of Moghes Margarita" + glass_desc = "A classic human cocktail, now ruined with cactus juice instead of tequila." + glass_center_of_mass = list("x"=16, "y"=8) + +/datum/reagent/alcohol/butanol/cactuscreme + name = "Cactus Creme" + id = "cactuscreme" + description = "A tasty mix of berries and cream with xuizi juice, for the discerning unathi." + color = "#664300" + strength = 15 + taste_description = "creamy berries" + + glass_icon_state = "cactuscreme" + glass_name = "glass of Cactus Creme" + glass_desc = "A tasty mix of berries and cream with xuizi juice, for the discerning unathi." + glass_center_of_mass = list("x"=17, "y"=8) + +/datum/reagent/alcohol/butanol/bahamalizard + name = "Bahama Lizard" + id = "bahamalizard" + description = "A tropical cocktail containing cactus juice from Moghes, but no actual alcohol." + color = "#FF7F3B" + strength = 15 + taste_description = "lime and orange" + + glass_icon_state = "bahamalizard" + glass_name = "glass of Bahama Lizard" + glass_desc = "A tropical cocktail containing cactus juice from Moghes, but no actual alcohol." + glass_center_of_mass = list("x"=16, "y"=5) + +/datum/reagent/alcohol/butanol/lizardphlegm + name = "Lizard Phlegm" + id = "lizardphlegm" + description = "Looks gross, but smells fruity." + color = "#8CFF8C" + strength = 20 + taste_description = "creamy fruit" + + glass_icon_state = "lizardphlegm" + glass_name = "glass of Lizard Phlegm" + glass_desc = "Looks gross, but smells fruity." + +/datum/reagent/alcohol/butanol/cactustea + name = "Cactus Tea" + id = "cactustea" + description = "Tea flavored with xuizi juice." + color = "#664300" + strength = 10 + taste_description = "tea" + + glass_icon_state = "icepick" + glass_name = "glass of Cactus Tea" + glass_desc = "Tea flavored with xuizi juice." + +/datum/reagent/alcohol/butanol/moghespolitan + name = "Moghespolitan" + id = "moghespolitan" + description = "Pomegranate syrup and cactus juice, with a splash of Sarezhi Wine. Delicious!" + color = "#664300" + strength = 27 + taste_description = "fruity sweetness" + + glass_icon_state = "moghespolitan" + glass_name = "glass of Moghespolitan" + glass_desc = "Pomegranate syrup and cactus juice, with a splash of Sarezhi Wine. Delicious!" + +/datum/reagent/alcohol/butanol/wastelandheat + name = "Wasteland Heat" + id = "wastelandheat" + description = "A mix of spicy cactus juice to warm you up." + color = "#664300" + strength = 40 + adj_temp = 60 + targ_temp = 390 + taste_description = "burning heat" + + glass_icon_state = "moghesheat" + glass_name = "glass of Wasteland Heat" + glass_desc = "A mix of spicy cactus juice to warm you up. Maybe a little too warm for non-unathi, though." + glass_center_of_mass = list("x"=17, "y"=8) + +/datum/reagent/alcohol/butanol/Sandgria + name = "Sandgria" + id = "sandgria" + description = "Sarezhi wine, blended with citrus and a splash of cactus juice." + color = "#960707" + strength = 30 + taste_description = "tart berries" + + glass_icon_state = "sangria" + glass_name = "glass of Sandgria" + glass_desc = "Sarezhi wine, blended with citrus and a splash of cactus juice." + +/datum/reagent/alcohol/butanol/contactwine + name = "Contact Wine" + id = "contactwine" + description = "A perfectly good glass of Sarezhi wine, ruined by adding radioactive material. It reminds you of something..." + color = "#2E6671" + strength = 50 + taste_description = "berries and regret" + + glass_icon_state = "contactwine" + glass_name = "glass of Contact Wine" + glass_desc = "A perfectly good glass of Sarezhi wine, ruined by adding radioactive material. It reminds you of something..." + glass_center_of_mass = list("x"=17, "y"=4) + +/datum/reagent/alcohol/butanol/hereticblood + name = "Heretics Blood" + id = "hereticblood" + description = "A fizzy cocktail made with cactus juice and heresy." + color = "#820000" + strength = 15 + taste_description = "heretically sweet iron" + + glass_icon_state = "demonsblood" + glass_name = "glass of Heretics' Blood" + glass_desc = "A fizzy cocktail made with cactus juice and heresy." + glass_center_of_mass = list("x"=16, "y"=2) + +/datum/reagent/alcohol/butanol/sandpit + name = "Sandpit" + id = "sandpit" + description = "An unusual mix of cactus and orange juice, mostly favored by unathi." + color = "#A68310" + strength = 15 + taste_description = "oranges" + + glass_icon_state = "screwdriverglass" + glass_name = "glass of Sandpit" + glass_desc = "An unusual mix of cactus and orange juice, mostly favored by unathi." + glass_center_of_mass = list("x"=15, "y"=10) + +/datum/reagent/alcohol/butanol/cactuscola + name = "Cactus Cola" + id = "cactuscola" + description = "Cactus juice splashed with cola, on ice. Simple and delicious." + color = "#3E1B00" + strength = 15 + taste_description = "cola" + + glass_icon_state = "whiskeycolaglass" + glass_name = "glass of Cactus Cola" + glass_desc = "Cactus juice splashed with cola, on ice. Simple and delicious." + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/alcohol/butanol/bloodwine + name = "Bloodwine" + id = "bloodwine" + description = "A traditional unathi drink said to strengthen one before a battle." + color = "#C73C00" + strength = 21 + taste_description = "strong berries" + + glass_icon_state = "bloodwine" + glass_name = "glass of Bloodwine" + glass_desc = "A traditional unathi drink said to strengthen one before a battle." + glass_center_of_mass = list("x"=15, "y"=7) /datum/reagent/nutriment/badfood //This is just a base. It shouldn't exist or be used anywhere but just in case, I added names. name = "Experimental Preservative" @@ -3359,4 +3529,4 @@ nutriment_factor = 5 color = "#eaf1fc" taste_description = "flavoring" - damagemul = 0.05 \ No newline at end of file + damagemul = 0.05 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 3472966bffc..e995458bd88 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2499,6 +2499,100 @@ required_reagents = list("dr_gibb_diet" = 3, "whiskey" = 1, "honey" = 1) result_amount = 5 +//Kaed's Unathi cocktails +//======== + +/datum/chemical_reaction/moghesmargarita + name = "Moghes Margarita" + id = "moghesmargarita" + result = "moghesmargarita" + required_reagents = list("xuizijuice" = 2, "limejuice" = 3) + result_amount = 5 + +/datum/chemical_reaction/bahamalizard + name = "Bahama Lizard" + id = "bahamalizard" + result = "bahamalizard" + required_reagents = list("xuizijuice" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1) + result_amount = 6 + +/datum/chemical_reaction/cactuscreme + name = "Cactus Creme" + id = "cactuscreme" + result = "cactuscreme" + required_reagents = list("berryjuice" = 2, "cream" = 1, "xuizijuice" = 2) + result_amount = 5 + +/datum/chemical_reaction/lizardplegm + name = "Lizard Phlegm" + id = "lizardphlegm" + result = "lizardphlegm" + required_reagents = list("cream" = 2, "banana" = 1, "xuizijuice" = 1, "watermelonjuice" = 1) + result_amount = 5 + +/datum/chemical_reaction/cactustea + name = "Cactus Tea" + id = "cactustea" + result = "cactustea" + required_reagents = list("icetea" = 1, "xuizijuice" = 1) + result_amount = 2 + +/datum/chemical_reaction/moghespolitan + name = "Moghespolitan" + id = "moghespolitan" + result = "moghespolitan" + required_reagents = list("sarezhiwine" = 2, "xuizijuice" = 1, "grenadine" = 5) + result_amount = 5 + +/datum/chemical_reaction/wastelandheat + name = "Wasteland Heat" + id = "wastelandheat" + result = "wastelandheat" + required_reagents = list("xuizi" = 10, "capsaicin" = 3) + result_amount = 10 + +/datum/chemical_reaction/sandgria + name = "Sandgria" + id = "sandgria" + result = "sandgria" + required_reagents = list("sarezhiwine" = 3, "orangejuice" = 1, "lemonjuice" = 1, "xuizijuice" = 1) + result_amount = 6 + +/datum/chemical_reaction/contactwine + name = "Contact Wine" + id = "contactwine" + result = "contactwine" + required_reagents = list("xuizijuice" = 5, "radium" = 1, "sarezhiwine" = 5) + result_amount = 10 + +/datum/chemical_reaction/hereticblood + name = "Heretics' Blood" + id = "hereticblood" + result = "hereticblood" + required_reagents = list("xuizijuice" = 3, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1) + result_amount = 6 + +/datum/chemical_reaction/sandpit + name = "Sandpit" + id = "sandpit" + result = "sandpit" + required_reagents = list("xuizijuice" = 2, "orangejuice" = 2) + result_amount = 4 + +/datum/chemical_reaction/cactuscola + name = "Cactus Cola" + id = "cactuscola" + result = "cactuscola" + required_reagents = list("xuizijuice" = 2, "cola" = 2, "ice" = 1) + result_amount = 5 + +/datum/chemical_reaction/bloodwine + name = "Bloodwine" + id = "bloodwine" + result = "bloodwine" + required_reagents = list("blood" = 2, "sarezhiwine" = 3) + result_amount = 5 + //transmutation /datum/chemical_reaction/transmutation_silver diff --git a/html/changelogs/Changelog-Unathidrinks.yml b/html/changelogs/Changelog-Unathidrinks.yml new file mode 100644 index 00000000000..5a4d0ba3971 --- /dev/null +++ b/html/changelogs/Changelog-Unathidrinks.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Kaedwuff + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a number of new cocktails made with unathi booze. Many have custom sprites, and one of them is slightly dangerous to non-unathi." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e3bd5cfb891..4865ae9924b 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ