New Drinks n' Cocktails (#17713)

* drinks overhaul

* More drinks

* Bottles and Cartridges

* the log of change

* the impropering

* caffe latte

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -1182,6 +1182,16 @@
 		return
 	M.adjustOxyLoss(-2 * removed)
 
+/singleton/reagent/drink/cranberryjuice
+	name = "Cranberry Juice"
+	description = "Rich cranberry juice. Bright and tart."
+	color = "#a0274b"
+	taste_description = "tart cranberries"
+
+	glass_icon_state = "berryjuice"
+	glass_name = "glass of cranberry juice"
+	glass_desc = "Fresh, tart, and sweet cranberry juice."
+
 /singleton/reagent/drink/potatojuice
 	name = "Potato Juice"
 	description = "Juice of the potato. Bleh."
@@ -2500,9 +2510,20 @@
 
 	glass_icon_state = "aleglass"
 	glass_name = "glass of ale"
-	glass_desc = "A freezing pint of delicious ale"
+	glass_desc = "A freezing pint of delicious ale."
 	glass_center_of_mass = list("x"=16, "y"=8)
 
+/singleton/reagent/alcohol/applejack
+	name = "Applejack"
+	description = "Hard apple cider that has been distilled. The result is much more flavorful and alcoholic."
+	color = "#d4661b"
+	strength = 14
+	taste_description = "strong cider"
+
+	glass_icon_state = "applejack"
+	glass_name = "glass of applejack"
+	glass_desc = "Hard apple cider that has been distilled. The result is much more flavorful and alcoholic."
+
 /singleton/reagent/alcohol/beer
 	name = "Beer"
 	description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
@@ -2616,6 +2637,17 @@
 	if(alien != IS_DIONA)
 		M.dizziness +=5
 
+/singleton/reagent/alcohol/fernet
+	name = "Fernet"
+	description = "A bitter, herbal spirit with strong ties to the Earth continent of South America. Commonly mixed with cola."
+	color = "#4e1e12"
+	strength = 30
+	taste_description = "bitter herbs"
+
+	glass_icon_state = "fernet_glass"
+	glass_name = "glass of fernet"
+	glass_desc = "A glass of raw, bitter fernet. Should probably mix this with something."
+
 /singleton/reagent/alcohol/gin
 	name = "Gin"
 	description = "It's gin. In space. I say, good sir."
@@ -2873,6 +2905,26 @@
 	glass_name = "glass of geneboosted wine"
 	glass_desc = "An imperiously classy drink. In Her name, so shall it be drunk!"
 
+/singleton/reagent/alcohol/wine/assunzione
+	name = "Assunzioni Wine"
+	description = "A complex wine originating from the Dalyanese vineyards of Assunzione. The liturgical wine of choice for Luceian masses and holy gatherings."
+	strength = 15
+	taste_description = "red wine, truffles, hints of dried fruit, and herbs"
+
+	glass_icon_state = "assunzionewineglass"
+	glass_name = "glass of Assunzione wine"
+	glass_desc = "A complex wine originating from the Dalyanese vineyards of Assunzione. The liturgical wine of choice for Luceian masses and holy gatherings."
+
+/singleton/reagent/alcohol/wine/rose
+	name = "Rose Wine"
+	description = "A fruity, light, pink wine that looks and tastes like lighthearted fun."
+	strength = 8
+	taste_description = "citrus, cherry, and sweet wine"
+
+	glass_icon_state = "roseglass"
+	glass_name = "glass of rose"
+	glass_desc = "A fruity, light, pink wine that looks and tastes like lighthearted fun."
+
 /singleton/reagent/alcohol/wine/algae
 	name = "Algae Wine"
 	description = "More of an absinthe than a wine. The favored drink of the Imperial military."
@@ -2912,6 +2964,18 @@
 	glass_name = "glass of tarasun"
 	glass_desc = "An incredibly potent alcoholic beverage, distilled and fermented from tenelote milk."
 
+/singleton/reagent/alcohol/triplesec
+	name = "Triple Sec"
+	description = "An orangey liqueur made from bitter, dried orange peels. Usually mixed with cocktails."
+	taste_description = "orange peel"
+	color = "#fc782b"
+	strength = 12
+	taste_description = "orange peel"
+
+	glass_icon_state = "glass_orange"
+	glass_name = "glass of triple sec"
+	glass_desc = "An orangey liqueur made from bitter, dried orange peels. Usually mixed with cocktails."
+
 // Cocktails
 
 /singleton/reagent/alcohol/acid_spit
@@ -3265,6 +3329,18 @@
 	glass_desc = "Creepy time!"
 	glass_center_of_mass = list("x"=16, "y"=8)
 
+/singleton/reagent/alcohol/fernet_con_coca
+	name = "Fernet Con Coca"
+	description = "Cola spiked with bitter fernet. A sweet and bitter punch, not for the faint of heart."
+	color = "#382b20"
+	strength = 20
+	taste_description = "deeply bittersweet cola"
+	carbonated = TRUE
+
+	glass_icon_state = "root_beer_glass"
+	glass_name = "glass of fernet con coca"
+	glass_desc = "Cola spiked with bitter fernet. A sweet and bitter punch, not for the faint of heart."
+
 /singleton/reagent/alcohol/driestmartini
 	name = "Driest Martini"
 	description = "Only for the experienced. You think you see sand floating in the glass."
@@ -4105,6 +4181,17 @@
 	glass_name = "glass of Stars and Stripes"
 	glass_desc = "Someone, somewhere, is saluting."
 
+/singleton/reagent/alcohol/cosmopolitan
+	name = "Cosmopolitan"
+	description = "Sweet, sour, and chic. The Cosmopolitan is a legendary, upscale classic."
+	color = "#f3174e"
+	strength = 27
+	taste_description = "fruity sweetness"
+
+	glass_icon_state = "cosmopolitan"
+	glass_name = "glass of Cosmopolitan"
+	glass_desc = "Sweet, sour, and chic. The Cosmopolitan is a legendary, upscale classic."
+
 /singleton/reagent/alcohol/metropolitan
 	name = "Metropolitan"
 	description = "What more could you ask for?"
@@ -4116,6 +4203,17 @@
 	glass_name = "glass of Metropolitan"
 	glass_desc = "What more could you ask for?"
 
+/singleton/reagent/alcohol/mendellian
+	name = "Mendellian"
+	description = "A blue citrusy spin on the Cosmopolitan, named after the most cosmopolitan city in the Spur."
+	color = "#4f66e7"
+	strength = 27
+	taste_description = "citrusy urbanism"
+
+	glass_icon_state = "mendellian"
+	glass_name = "glass of Mendellian"
+	glass_desc = "A blue citrusy spin on the Cosmopolitan, named after the most cosmopolitan city in the Spur."
+
 /singleton/reagent/alcohol/primeminister
 	name = "Prime Minister"
 	description = "All the fun of power, none of the assassination risk!"
@@ -5588,6 +5686,28 @@
 	glass_name = "glass of pina colada"
 	glass_desc = "Prepared just like in Silversun."
 
+/singleton/reagent/alcohol/red_dwarf_sangria
+	name = "Red Dwarf Sangria"
+	description = "A rich, sweet wine punch made with Assunzione wine, applejack, and orange juice."
+	strength = 30
+	color = "#960e15"
+	taste_description = "fruit cocktail, sweet red wine, and a hint of truffles"
+
+	glass_icon_state = "redsangria"
+	glass_name = "glass of red dwarf sangria"
+	glass_desc = "A rich, sweet wine punch made with Assunzione wine, applejack, and orange juice."
+
+/singleton/reagent/alcohol/forbidden_apple
+	name = "Forbidden Apple"
+	description = "A champagne cocktail spiked with applejack and orange liqueur."
+	strength = 25
+	color = "#bd6717"
+	taste_description = "champagne, a hint of apples, and orange sweetness"
+
+	glass_icon_state = "forbiddenapple"
+	glass_name = "glass of forbidden apple"
+	glass_desc = "A champagne cocktail spiked with applejack and orange liqueur."
+
 /singleton/reagent/drink/gibbfloats
 	name = "Root-Cola Floats"
 	description = "A floating soda of icecream and Getmore Root-Cola."

code/modules/reagents/Chemistry-Recipes.dm

@@ -2309,7 +2309,7 @@
 	name = "Margarita"
 	id = "margarita"
 	result = /singleton/reagent/alcohol/margarita
-	required_reagents = list(/singleton/reagent/alcohol/tequila = 2, /singleton/reagent/drink/limejuice = 1)
+	required_reagents = list(/singleton/reagent/alcohol/tequila = 1, /singleton/reagent/alcohol/triplesec = 1, /singleton/reagent/drink/limejuice = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/drink/longislandicedtea
@@ -2878,6 +2878,20 @@
 	required_reagents = list(/singleton/reagent/drink/milk/cream = 1, /singleton/reagent/alcohol/cremeyvette = 1, /singleton/reagent/drink/grenadine = 1)
 	result_amount = 3
 
+/datum/chemical_reaction/drink/cosmopolitan
+	name = "Cosmopolitan"
+	id = "cosmopolitan"
+	result = /singleton/reagent/alcohol/cosmopolitan
+	required_reagents = list(/singleton/reagent/alcohol/triplesec = 1, /singleton/reagent/drink/limejuice = 1, /singleton/reagent/drink/cranberryjuice = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/drink/mendellian
+	name = "Mendellian"
+	id = "mendellian"
+	result = /singleton/reagent/alcohol/mendellian
+	required_reagents = list(/singleton/reagent/alcohol/bluecuracao = 1, /singleton/reagent/alcohol/triplesec = 1, /singleton/reagent/drink/limejuice = 1)
+	result_amount = 3
+
 /datum/chemical_reaction/drink/metropolitan
 	name = "Metropolitan"
 	id = "metropolitan"
@@ -2885,6 +2899,20 @@
 	required_reagents = list(/singleton/reagent/alcohol/brandy = 1, /singleton/reagent/alcohol/vermouth = 1, /singleton/reagent/drink/grenadine = 1)
 	result_amount = 3
 
+/datum/chemical_reaction/drink/red_dwarf_sangria
+	name = "Red Dwarf Sangria"
+	id = "reddwarfsangria"
+	result = /singleton/reagent/alcohol/red_dwarf_sangria
+	required_reagents = list(/singleton/reagent/alcohol/wine/assunzione = 1, /singleton/reagent/alcohol/applejack = 1, /singleton/reagent/drink/orangejuice = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/drink/forbidden_apple
+	name = "Forbidden Apple"
+	id = "forbiddenapple"
+	result = /singleton/reagent/alcohol/forbidden_apple
+	required_reagents = list(/singleton/reagent/alcohol/champagne = 1, /singleton/reagent/alcohol/triplesec = 1, /singleton/reagent/alcohol/applejack = 1)
+	result_amount = 3
+
 /datum/chemical_reaction/drink/caruso
 	name = "Caruso"
 	id = "caruso"
@@ -3885,6 +3913,13 @@
 	required_reagents = list(/singleton/reagent/alcohol/rumandcola = 2, /singleton/reagent/drink/limejuice = 1)
 	result_amount = 3
 
+/datum/chemical_reaction/drink/fernet_con_coca
+	name = "Fernet con Coca"
+	id = "fernetconcoca"
+	result = /singleton/reagent/alcohol/fernet_con_coca
+	required_reagents = list(/singleton/reagent/drink/space_cola = 2, /singleton/reagent/alcohol/fernet = 1)
+	result_amount = 2
+
 /datum/chemical_reaction/drink/solarian_white
 	name = "Solarian White"
 	id = "solarian_white"

code/modules/reagents/dispenser/cartridge_presets.dm

@@ -81,6 +81,9 @@
 /obj/item/reagent_containers/chem_disp_cartridge/ale
 	spawn_reagent = /singleton/reagent/alcohol/ale
 
+/obj/item/reagent_containers/chem_disp_cartridge/applejack
+	spawn_reagent = /singleton/reagent/alcohol/applejack
+
 /obj/item/reagent_containers/chem_disp_cartridge/beer
 	spawn_reagent = /singleton/reagent/alcohol/beer
 
@@ -105,6 +108,9 @@
 /obj/item/reagent_containers/chem_disp_cartridge/tequila
 	spawn_reagent = /singleton/reagent/alcohol/tequila
 
+/obj/item/reagent_containers/chem_disp_cartridge/triplesec
+	spawn_reagent = /singleton/reagent/alcohol/triplesec
+
 /obj/item/reagent_containers/chem_disp_cartridge/vermouth
 	spawn_reagent = /singleton/reagent/alcohol/vermouth
 
@@ -125,6 +131,9 @@
 /obj/item/reagent_containers/chem_disp_cartridge/banana
 	spawn_reagent = /singleton/reagent/drink/banana
 
+/obj/item/reagent_containers/chem_disp_cartridge/cranberry
+	spawn_reagent = /singleton/reagent/drink/cranberryjuice
+
 /obj/item/reagent_containers/chem_disp_cartridge/berryjuice
 	spawn_reagent = /singleton/reagent/drink/berryjuice
 
@@ -155,6 +164,9 @@
 /obj/item/reagent_containers/chem_disp_cartridge/lime
 	spawn_reagent = /singleton/reagent/drink/limejuice
 
+/obj/item/reagent_containers/chem_disp_cartridge/lemon
+	spawn_reagent = /singleton/reagent/drink/lemonjuice
+
 /obj/item/reagent_containers/chem_disp_cartridge/orange
 	spawn_reagent = /singleton/reagent/drink/orangejuice
 

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -96,6 +96,8 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/orange,
 			/obj/item/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/reagent_containers/chem_disp_cartridge/apple,
+			/obj/item/reagent_containers/chem_disp_cartridge/lemon,
+			/obj/item/reagent_containers/chem_disp_cartridge/cranberry,
 			/obj/item/reagent_containers/chem_disp_cartridge/watermelon,
 			/obj/item/reagent_containers/chem_disp_cartridge/clean_kois,
 			/obj/item/reagent_containers/chem_disp_cartridge/banana,
@@ -130,6 +132,7 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/champagne,
 			/obj/item/reagent_containers/chem_disp_cartridge/rum,
 			/obj/item/reagent_containers/chem_disp_cartridge/tequila,
+			/obj/item/reagent_containers/chem_disp_cartridge/triplesec,
 			/obj/item/reagent_containers/chem_disp_cartridge/vermouth,
 			/obj/item/reagent_containers/chem_disp_cartridge/cognac,
 			/obj/item/reagent_containers/chem_disp_cartridge/ale,
@@ -140,7 +143,9 @@
 
 /obj/machinery/chemical_dispenser/bar_alc/full/space //Spacebar away site. Gets much more to make the best drinks, hassle-free.
 	spawn_cartridges = list(
+			/obj/item/reagent_containers/chem_disp_cartridge/applejack,
 			/obj/item/reagent_containers/chem_disp_cartridge/lemon_lime,
+			/obj/item/reagent_containers/chem_disp_cartridge/cranberry,
 			/obj/item/reagent_containers/chem_disp_cartridge/sugar,
 			/obj/item/reagent_containers/chem_disp_cartridge/orange,
 			/obj/item/reagent_containers/chem_disp_cartridge/lime,
@@ -155,6 +160,7 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/champagne,
 			/obj/item/reagent_containers/chem_disp_cartridge/rum,
 			/obj/item/reagent_containers/chem_disp_cartridge/tequila,
+			/obj/item/reagent_containers/chem_disp_cartridge/triplesec,
 			/obj/item/reagent_containers/chem_disp_cartridge/vermouth,
 			/obj/item/reagent_containers/chem_disp_cartridge/cognac,
 			/obj/item/reagent_containers/chem_disp_cartridge/ale,

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -275,7 +275,7 @@
 	reagents_to_add = list(/singleton/reagent/alcohol/victorygin = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/whiskey
-	name = "Mu Cephei Special Reserve"
+	name = "Mu Cephei Special Reserve Whiskey"
 	desc = "An okayish single-malt whiskey. This one is produced mainly in New Valletta on Callisto and is fairly famous among Cythereans, too. It's great to get you \
 	in the right mindset for your tenth night out clubbing in a row!"
 	desc_extended = DRINK_FLUFF_GETMORE
@@ -293,7 +293,7 @@
 	reagents_to_add = list(/singleton/reagent/alcohol/fireball = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka
-	name = "Martian 50% Premium"
+	name = "Martian 50% Premium Vodka"
 	desc = "Only potatoes grown in real imported Martian soil may be used for this premium vodka (imports of Martian soil may have stopped). Made by Silverport, drunk by Zavodskoi."
 	desc_extended = DRINK_FLUFF_SILVERPORT
 	icon_state = "vodkabottle"
@@ -460,6 +460,16 @@
 /obj/item/trash/champagne_cork/sabrage
 	icon_state = "champagne_cork_sabrage"
 
+/obj/item/reagent_containers/food/drinks/bottle/fernet
+	name = "\improper Mictlan Armago Fernet"
+	desc = "An herbal, bitter liqueur, created using a heavily-guarded family recipe from the Armago family that includes a unique medley of herbs, roots, and spices."
+	desc_extended = "While the exact ingredients remain confidential, rumors speak of saffron, aged myrrh, and a mysterious herb known only to the elders of the family. Whatever the composition, each bottle \
+	is an homage to the multi-generational lineage of the Armago family, with roots back to Chile on Earth. The fernet undergoes a traditional pot-still distillation method, using several goes to evolve the flavor and \
+	ensure purity and potency. The liqueur is then aged in charred oak barrels, lending a smoky flavor. Despite its handcrafted nature, it is a ubiquitous spirit on Mictlan, often being consumed as part of an ever-evolving \
+	range of cocktails and drinks, to add that touch of spice to a drink."
+	icon_state = "fernetbottle"
+	reagents_to_add = list(/singleton/reagent/alcohol/fernet = 100)
+
 /obj/item/reagent_containers/food/drinks/bottle/mintsyrup
 	name = "Getmore's Bold Peppermint"
 	desc = "Minty fresh. Contains dyn (and just a little peppermint)."
@@ -535,6 +545,14 @@
 	center_of_mass = list("x"=16, "y"=4)
 	reagents_to_add = list(/singleton/reagent/alcohol/wine = 100)
 
+/obj/item/reagent_containers/food/drinks/bottle/rose_wine
+	name = "\improper Coral Twilight Rose"
+	desc = "A blended fragrant rose wine with a coral hue from the shores of Silversun. High-quality and fruity."
+	desc_extended = DRINK_FLUFF_SILVERPORT
+	icon_state = "rosewine"
+	center_of_mass = list("x"=16, "y"=4)
+	reagents_to_add = list(/singleton/reagent/alcohol/wine/rose = 100)
+
 /obj/item/reagent_containers/food/drinks/bottle/pwine
 	name = "\improper Chip Getmore's Velvet"
 	desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
@@ -575,6 +593,22 @@
 	center_of_mass = list("x"=16, "y"=6)
 	reagents_to_add = list(/singleton/reagent/drink/grenadine = 100)
 
+/obj/item/reagent_containers/food/drinks/bottle/applejack
+	name = "\improper Arvani Special Reserve Applejack"
+	desc = "Smooth distilled applejack liquor From Biesel. Stronger and more flavorful than traditional hard cider."
+	desc_extended = DRINK_FLUFF_ZENGHU
+	icon_state = "applejackbottle"
+	center_of_mass = list("x"=16, "y"=7)
+	reagents_to_add = list(/singleton/reagent/alcohol/applejack = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/triplesec
+	name = "\improper Fleur de Majestueux Triple Sec"
+	desc = "A fruity Xanu liqueur made from orange peels. Best mixed as part of cocktails."
+	desc_extended = DRINK_FLUFF_ZENGHU
+	icon_state = "triplesecbottle"
+	center_of_mass = list("x"=16, "y"=7)
+	reagents_to_add = list(/singleton/reagent/alcohol/triplesec = 100)
+
 // Soda
 
 /obj/item/reagent_containers/food/drinks/bottle/cola
@@ -879,6 +913,18 @@
 	center_of_mass = list("x"=16, "y"=5)
 	reagents_to_add = list(/singleton/reagent/alcohol/wine/algae = 100)
 
+/obj/item/reagent_containers/food/drinks/bottle/assunzione_wine
+	name = "\improper Assunzioni Sera Stellata di Dalyan wine"
+	desc = "A bottle of velvety smooth red wine from the underground vineyards of Dalyan, Assunzione. The standard liturgical wine of choice for upper-echelon priests and clergy of Luceism, although drinking it outside of holy celebrations is hardly sacrilegious."
+	desc_extended = "Rather than rely on technology alone, Assunzioni winemakers sought to incorporate millennia-old traditions into making a wine suitable for the clergy. With the blessing of the church, \
+	and with aid from Zeng-Hu, artisans crafted a technique of 'soleato', drying grapes under the light of electrically-amplified warding spheres, engineered to produce immense heat. The dried grapes are then \
+	pressed, fermented, and aged in Malagan oak barrels for several years. The resulting wine is exceptionally full-bodied and complex, with notes of dried fruit and tobacco. The drying technique has given it the \
+	preemptive blessing of the Luceian Church, and as such wines made using this technique, even of other varietals, are certified for usage in religious communions. Wine such as this is exported to other worlds \
+	at great cost, rivalling other wines in the Spur in their rarity and prestige."
+	icon_state = "assunzionewine"
+	center_of_mass = list("x"=16, "y"=5)
+	reagents_to_add = list(/singleton/reagent/alcohol/wine/assunzione = 100)
+
 /obj/item/reagent_containers/food/drinks/bottle/kvass
 	name = "Neubach Original kvass"
 	desc = "A bottle of authentic Fisanduhian kvass, a cereal alcohol."

code/modules/reagents/reagent_containers/food/drinks/carton.dm

@@ -45,6 +45,12 @@
 	icon_state = "limejuice"
 	reagents_to_add = list(/singleton/reagent/drink/limejuice = 100)
 
+/obj/item/reagent_containers/food/drinks/carton/cranberryjuice
+	name = "cranberry juice"
+	desc = "Tart and sweet. A unique flavor for a unique berry."
+	icon_state = "cranberryjuice"
+	reagents_to_add = list(/singleton/reagent/drink/cranberryjuice = 100)
+
 /obj/item/reagent_containers/food/drinks/carton/lemonjuice
 	name = "lemon juice"
 	desc = "This juice is VERY sour."