Cocktails patch (#3167)

Adds Champagne, Bitters, Mint Syrup and 11 different cocktails. All of the spritework is awful. I'm sorry about that. Cocktails: Champagne Mojito, The Classic, Cork Popper, French 75, Muscovite Mule, Orange Mimosa, Pink Gin, Pink Gin and Tonic, Pirate Punch, Planters Punch and Southside Royale.
2026-01-02 05:22:40 +00:00 · 2017-07-28 16:38:39 -05:00
parent 92d4ccec5a
commit 219ce42ac8
9 changed files with 294 additions and 2 deletions
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -1065,6 +1065,18 @@
 	glass_name = "glass of Brown Star"
 	glass_desc = "It's not what it sounds like..."

+/datum/reagent/drink/mintsyrup
+	name = "Mint Syrup"
+	description = "A simple syrup that tastes strongly of mint."
+	id = "mintsyrup"
+	color = "#539830"
+	taste_description = "mint"
+
+	glass_icon_state = "mint_syrupglass"
+	glass_name = "glass of mint syrup"
+	glass_desc = "Pure mint syrup. Prepare your tastebuds."
+	glass_center_of_mass = list("x"=17, "y"=6)
+
 /datum/reagent/drink/milkshake
 	name = "Milkshake"
 	description = "Glorious brainfreezing mixture."
@@ -1331,6 +1343,19 @@
 		return
 	M.jitteriness = max(M.jitteriness - 3, 0)

+/datum/reagent/ethanol/bitters
+	name = "Aromatic Bitters"
+	id = "bitters"
+	description = "A very, very concentrated and bitter herbal alcohol."
+	color = "#223319"
+	strength = 40
+	taste_description = "bitter"
+
+	glass_icon_state = "bittersglass"
+	glass_name = "glass of bitters"
+	glass_desc = "A pungent glass of bitters."
+	glass_center_of_mass = list ("x"=17, "y"=8)
+
 /datum/reagent/ethanol/bluecuracao
 	name = "Blue Curacao"
 	id = "bluecuracao"
@@ -1344,6 +1369,19 @@
 	glass_desc = "Exotically blue, fruity drink, distilled from oranges."
 	glass_center_of_mass = list("x"=16, "y"=5)

+/datum/reagent/ethanol/champagne
+	name = "Champagne"
+	id = "champagne"
+	description = "A classy sparkling wine, usually found in meeting rooms and basements."
+	color = "#EBECC0"
+	strength = 15
+	taste_description = "bubbly bitter-sweetness"
+
+	glass_icon_state = "champagneglass"
+	glass_name = "glass of champagne"
+	glass_desc = "Off-white and bubbly. So passe."
+	glass_center_of_mass = list("x"=16, "y"=5)
+
 /datum/reagent/ethanol/cognac
 	name = "Cognac"
 	id = "cognac"
@@ -1813,6 +1851,18 @@
 	glass_desc = "Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up."
 	glass_center_of_mass = list("x"=15, "y"=8)

+/datum/reagent/ethanol/cmojito
+	name = "Champagne Mojito"
+	id = "cmojito"
+	description = "A fizzy, minty and sweet drink."
+	color = "#5DBA40"
+	strength = 15
+	taste_description = "sweet mint alcohol"
+
+	glass_icon_state = "cmojito"
+	glass_name = "glass of champagne mojito"
+	glass_desc = "Looks fun!"
+
 /datum/reagent/ethanol/changelingsting
 	name = "Changeling Sting"
 	id = "changelingsting"
@@ -1825,6 +1875,19 @@
 	glass_name = "glass of Changeling Sting"
 	glass_desc = "A stingy drink."

+/datum/reagent/ethanol/classic
+	name = "The Classic"
+	id = "classic"
+	description = "The classic bitter lemon cocktail."
+	color = "#9a8922"
+	strength = 20
+	taste_description = "sour and bitter"
+
+	glass_icon_state = "classic"
+	glass_name = "glass of the classic"
+	glass_desc = "Just classic. Wow."
+	glass_center_of_mass = list("x"=17, "y"=8)
+
 /datum/reagent/ethanol/martini
 	name = "Classic Martini"
 	id = "martini"
@@ -1838,6 +1901,19 @@
 	glass_desc = "Damn, the bartender even stirred it, not shook it."
 	glass_center_of_mass = list("x"=17, "y"=8)

+/datum/reagent/ethanol/corkpopper
+	name = "Cork Popper"
+	id = "corkpopper"
+	description = "A fancy cocktail with a hint of lemon."
+	color = "#766818"
+	strength = "30"
+	taste_description = "sour and smokey"
+
+	glass_icon_state = "corkpopper"
+	glass_name = "glass of cork popper"
+	glass_desc = "The confusing scent only proves all the more alluring."
+	glass_center_of_mass = list("x"=16, "y"=9)
+
 /datum/reagent/ethanol/cuba_libre
 	name = "Cuba Libre"
 	id = "cubalibre"
@@ -1891,6 +1967,19 @@
 	glass_desc = "Only for the experienced. You think you see sand floating in the glass."
 	glass_center_of_mass = list("x"=17, "y"=8)

+/datum/reagent/ethanol/french75
+	name = "French 75"
+	id = "french75"
+	description = "A sharp and classy cocktail."
+	color = "#F4E68D"
+	strength = 25
+	taste_description = "sour and classy"
+
+	glass_icon_state = "french75"
+	glass_name = "glass of french 75"
+	glass_desc = "It looks like a lemon shaved into your cocktail."
+	glass_center_of_mass = list("x"=16, "y"=5)
+
 /datum/reagent/ethanol/ginfizz
 	name = "Gin Fizz"
 	id = "ginfizz"
@@ -2144,6 +2233,19 @@
 	glass_name = "glass of moonshine"
 	glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."

+/datum/reagent/ethanol/muscmule
+	name = "Muscovite Mule"
+	id = "muscmule"
+	description = "A surprisingly gentle cocktail, with a hidden punch."
+	color = "#8EEC5F"
+	strength = 40
+	taste_description = "mint and a mule's kick"
+
+	glass_icon_state = "muscmule"
+	glass_name = "glass of muscovite mule"
+	glass_desc = "Such a pretty green, this couldn't possible go wrong!"
+	glass_center_of_mass = list("x"=17, "y"=10)
+
 /datum/reagent/ethanol/neurotoxin
 	name = "Neurotoxin"
 	id = "neurotoxin"
@@ -2162,6 +2264,18 @@
 	..()
 	M.Weaken(3)

+/datum/reagent/ethanol/omimosa
+	name = "Orange Mimosa"
+	id = "omimosa"
+	description = "Wonderful start to any day."
+	color = "#F4A121"
+	strength = 15
+	taste_description = "fizzy orange"
+
+	glass_icon_state = "omimosa"
+	glass_name = "glass of orange mimosa"
+	glass_desc = "Smells like a fresh start."
+
 /datum/reagent/ethanol/patron
 	name = "Patron"
 	id = "patron"
@@ -2175,6 +2289,57 @@
 	glass_desc = "Drinking patron in the bar, with all the subpar ladies."
 	glass_center_of_mass = list("x"=7, "y"=8)

+/datum/reagent/ethanol/pinkgin
+	name = "Pink Gin"
+	id = "pinkgin"
+	description = "Bitters and Gin."
+	color = "#DB80B2"
+	strength = 25
+	taste_description = "bitter christmas tree"
+
+	glass_icon_state = "pinkgin"
+	glass_name = "glass of pink gin"
+	glass_desc = "What an eccentric cocktail."
+	glass_center_of_mass = list("x"=16, "y"=9)
+
+/datum/reagent/ethanol/pinkgintonic
+	name = "Pink Gin and Tonic."
+	id = "pinkgintonic"
+	description = "Bitterer gin and tonic."
+	color = "#F4BDDB"
+	strength = 25
+	taste_description = "very bitter christmas tree"
+
+	glass_icon_state = "pinkgintonic"
+	glass_name = "glass of pink gin and tonic"
+	glass_desc = "You made gin and tonic more bitter... you madman!"
+
+/datum/reagent/ethanol/piratepunch
+	name = "Pirate's Punch"
+	id = "piratepunch"
+	description = "Nautical punch!"
+	color = "#ECE1A0"
+	strength = 25
+	taste_description = "spiced fruit cocktail"
+
+	glass_icon_state = "piratepunch"
+	glass_name = "glass of pirate's punch"
+	glass_desc = "Yarr harr fiddly dee, drink whatcha want 'cause a pirate is ye!"
+	glass_center_of_mass = list("x"=17, "y"=10)
+
+/datum/reagent/ethanol/planterpunch
+	name = "Planter's Punch"
+	id = "planterpunch"
+	description = "A popular beach cocktail."
+	color = "#FFA700"
+	strength = 25
+	taste_description = "jamaica"
+
+	glass_icon_state = "planterpunch"
+	glass_name = "glass of planter's punch"
+	glass_desc = "This takes you back, back to those endless white beaches of yore."
+	glass_center_of_mass = list("x"=16, "y"=8)
+
 /datum/reagent/ethanol/pwine
 	name = "Poison Wine"
 	id = "pwine"
@@ -2284,6 +2449,19 @@
 	glass_desc = "A cold refreshment."
 	glass_center_of_mass = list("x"=16, "y"=8)

+/datum/reagent/ethanol/ssroyale
+	name = "Southside Royale"
+	id = "ssroyale"
+	description = "Classy cocktail containing citrus."
+	color = "#66F446"
+	strength = 20
+	taste_description = "lime christmas tree"
+
+	glass_icon_state = "ssroyale"
+	glass_name = "glass of southside royale"
+	glass_desc = "This cocktail is better than you. Maybe it's the crossed arms that give it away. Or the rich parents."
+	glass_center_of_mass = list("x"=17, "y"=8)
+
 /datum/reagent/ethanol/suidream
 	name = "Sui Dream"
 	id = "suidream"
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1569,8 +1569,6 @@
 	required_reagents = list("ice" = 1, "tea" = 2)
 	result_amount = 3

-
-
 /datum/chemical_reaction/icecoffee
 	name = "Iced Coffee"
 	id = "icecoffee"
@@ -2129,6 +2127,83 @@
 	required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
 	result_amount = 5

+/datum/chemical_reaction/cmojito
+	name = "Champagne Mojito"
+	id = "cmojito"
+	result = "cmojito"
+	required_reagents = list("mintsyrup" = 1, "champagne" = 1, "rum" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/classic
+	name = "The Classic"
+	id = "classic"
+	result = "classic"
+	required_reagents = list("champagne" = 2, "bitters" = 1, "lemonjuice" = 1)
+	result_amount = 4
+
+/datum/chemical_reaction/corkpopper
+	name = "Cork Popper"
+	id = "corkpopper"
+	result = "corkpopper"
+	required_reagents = list("whiskey" = 1, "champagne" = 1, "lemonjuice" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/french75
+	name = "French 75"
+	id = "french75"
+	result = "french75"
+	required_reagents = list("champagne" = 2, "gin" = 1, "lemonjuice" = 1)
+	result_amount = 4
+
+/datum/chemical_reaction/muscmule
+	name = "Muscovite Mule"
+	id = "muscmule"
+	result = "muscmule"
+	required_reagents = list("vodka" = 1, "limejuice" = 1, "mintsyrup" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/omimosa
+	name = "Orange Mimosa"
+	id = "omimosa"
+	result = "omimosa"
+	required_reagents = list("orangejuice" = 1, "champagne" = 1)
+	result_amount = 2
+
+/datum/chemical_reaction/pinkgin
+	name = "Pink Gin"
+	id = "pinkgin"
+	result = "pinkgin"
+	required_reagents = list("gin" = 2, "bitters" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/pinkgintonic
+	name = "Pink Gin and Tonic"
+	id = "pinkgintonic"
+	result = "pinkgintonic"
+	required_reagents = list("pinkgin" = 2, "tonic" = 1)
+	result_amount = 3
+
+/datum/chemical_reaction/piratepunch
+	name = "Pirate's Punch"
+	id = "piratepunch"
+	result = "piratepunch"
+	required_reagents = list("rum" = 1, "lemonjuice" = 1, "mintsyrup" = 1, "grenadine" = 1, "bitters" = 1)
+	result_amount = 5
+
+/datum/chemical_reaction/planterpunch
+	name = "Planter's Punch"
+	id = "planterpunch"
+	result = "planterpunch"
+	required_reagents = list("rum" = 2, "orangejuice" = 1, "grenadine" = 1)
+	result_amount = 4
+
+/datum/chemical_reaction/ssroyale
+	name = "Southside Royale"
+	id = "ssroyale"
+	result = "ssroyale"
+	required_reagents = list("mintsyrup" = 1, "gin" = 1, "limejuice" = 1, "champagne" = 1)
+	result_amount = 4
+
 /datum/chemical_reaction/rewriter
 	name = "Rewriter"
 	id = "rewriter"
--- a/code/modules/reagents/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/dispenser/cartridge_presets.dm
@@ -44,6 +44,7 @@
 	cognac		spawn_reagent = "cognac"
 	ale			spawn_reagent = "ale"
 	mead		spawn_reagent = "mead"
+	champagne	spawn_reagent = "champagne"

 	// Bar, soft
 	ice			spawn_reagent = "ice"
--- a/code/modules/reagents/dispenser/dispenser_presets.dm
+++ b/code/modules/reagents/dispenser/dispenser_presets.dm
@@ -107,6 +107,7 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/gin,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/champagne,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/rum,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth,
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -229,6 +229,33 @@
 		..()
 		reagents.add_reagent("nothing", 100)

+/obj/item/weapon/reagent_containers/food/drinks/bottle/bitters
+	name = "Angstra Aromatic Bitters"
+	desc = "Only the finest and highest quality herbs find their way into our cocktail bitters."
+	icon_state = "bitters"
+	center_of_mass = list("x"=16, "y"=10)
+	New()
+		..()
+		reagents.add_reagent("bitters",40)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne
+	name = "Tailfeather's Bubbliest champagne"
+	desc = "A rather fancy bottle of champagne, fit for collecting and storing in a cellar for decades."
+	icon_state = "champagnebottle"
+	center_of_mass = list("x"=16, "y"=4)
+	New()
+		..()
+		reagents.add_reagent("champagne",100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/mintsyrup
+	name = "Wintergreen Mint Syrup"
+	desc = "Minty fresh. NOTE: Do not use as a replacement for breath fresheners."
+	icon_state = "mint_syrup"
+	center_of_mass = list("x"=16, "y"=6)
+	New()
+		..()
+		reagents.add_reagent("mintsyrup", 100)
+
 /obj/item/weapon/reagent_containers/food/drinks/bottle/patron
 	name = "Wrapp Artiste patron"
 	desc = "Silver laced tequilla, served in space night clubs across the galaxy."