Drinks

Adds new drinks, recipies, etcetera.

code/game/machinery/vending.dm

@@ -646,7 +646,9 @@
 					/obj/item/weapon/reagent_containers/food/drinks/flask/barflask = 2, /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask = 2,
 					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 2,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5)
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 2,/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/chartreusegreen = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/chartreuseyellow =5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/cremewhite = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/brandy = 4)
 	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10)
 	vend_delay = 15
 	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"

code/modules/reagents/Chemistry-Reagents.dm

@@ -3753,5 +3753,143 @@ datum
 				..()
 				return
 
+//////////////////////////SKULL'S BOOZE///////////////////////
+
+		ethanol/daiquiri
+			name = "Daiquiri"
+			id = "daiquiri"
+			description = "A splendid looking cocktail."
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 2
+
+		ethanol/icepick
+			name = "Ice Pick"
+			id = "icepick"
+			description = "Big. And red. Hmm..."
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 1
+
+		ethanol/puosseecafe
+			name = "Puossee-Cafe"
+			id = "puosseecafe"
+			description = "Smells of the French and liquore."
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 2
+
+		ethanol/mintjulep
+			name = "Mint Julep"
+			id = "mintjulep"
+			description = "As old as time itself, but how does it taste?"
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 1
+
+		ethanol/johncollins
+			name = "John Collins"
+			id = "johncollins"
+			description = "Crystal clear, yellow, and smells of gin. How could this go wrong?"
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 3
+
+		ethanol/gimlet
+			name = "Gimlet"
+			id = "gimlet"
+			description = "Small, elegant, and kicks."
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 3
+
+		ethanol/starsandstripes
+			name = "Stars and Stripes"
+			id = "starsandstripes"
+			description = "Someone, somewhere, is saluting."
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 1
+
+		ethanol/metropolitan
+			name = "Metropolitan"
+			id = "metropolitan"
+			description = "What more could you ask for?"
+			color = "#664300" // rgb: 102, 67, 0
+			boozepwr = 2
+
+		ethanol/caruso
+			name = "Caruso"
+			id = "caruso"
+			description = "Green, almost alien."
+			color = "#664300"
+			boozepwr = 2
+
+		ethanol/aprilshower
+			name = "April Shower"
+			id = "aprilshower"
+			description = "Smells of brandy."
+			color = "#664300"
+			boozepwr = 2
+
+		ethanol/carthusiansazerac
+			name = "Carthusian Sazerac"
+			id = "carthusiansazerac"
+			description = "Whiskey and... Syrup?"
+			color = "#664300"
+			boozepwr = 3
+
+		ethanol/deweycocktail
+			name = "Dewey Cocktail"
+			id = "deweycocktail"
+			description = "Colours, look at all the colours!"
+			color = "#664300"
+			boozepwr = 2
+
+		ethanol/chartreusegreen
+			name = "Green Chartreuse"
+			id = "chartreusegreen"
+			description = "A green, strong liqueur."
+			color = "#664300" //FIND PROPER COLOURS!
+			boozepwr = 5
+			dizzy_adj = 4
+			slur_start = 15			//amount absorbed after which mob starts slurring
+			confused_start = 30		//amount absorbed after which mob starts confusing directions
+
+		ethanol/chartreuseyellow
+			name = "Yellow Chartreuse"
+			id = "chartreuseyellow"
+			description = "A yellow, strong liqueur."
+			color = "#664300" //FIND PROPER COLOURS!
+			boozepwr = 5
+			dizzy_adj = 4
+			slur_start = 15			//amount absorbed after which mob starts slurring
+			confused_start = 30		//amount absorbed after which mob starts confusing directions
+
+		ethanol/cremewhite
+			name = "White Creme de Menthe"
+			id = "cremewhite"
+			description = "Mint-flavoured alcohol, in a bottle."
+			color = "#664300" //FIND PROPER COLOURS!
+			boozepwr = 2
+			dizzy_adj = 2
+			slur_start = 35			//amount absorbed after which mob starts slurring
+			confused_start = 140	//amount absorbed after which mob starts confusing directions
+
+		ethanol/cremeyvette
+			name = "Creme de Yvette"
+			id = "cremeyvette"
+			description = "Berry-flavoured alcohol, in a bottle."
+			color = "#664300" //FIND PROPER COLOURS!
+			boozepwr = 2
+			dizzy_adj = 2
+			slur_start = 35			//amount absorbed after which mob starts slurring
+			confused_start = 140	//amount absorbed after which mob starts confusing directions
+
+		ethanol/brandy
+			name = "Brandy"
+			id = "brandy"
+			description = "Cheap knock off for cognac."
+			color = "#664300" //FIND PROPER COLOURS!
+			boozepwr = 2
+			dizzy_adj = 2
+			slur_start = 35			//amount absorbed after which mob starts slurring
+			confused_start = 140	//amount absorbed after which mob starts confusing directions
+
+
+
 // Undefine the alias for REAGENTS_EFFECT_MULTIPLER
 #undef REM

code/modules/reagents/Chemistry-Recipes.dm

@@ -1237,7 +1237,7 @@ datum
 					O.show_message(text("\red The contents of the slime core harden and begin to emit a warm, bright light."), 1)
 				var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
 				F.loc = get_turf(holder.my_atom)
-			
+
 //Purple
 
 		slimepsteroid
@@ -1848,7 +1848,91 @@ datum
 			required_reagents = list("grapejuice" = 2, "cola" = 1)
 			result_amount = 3
 
+//////////////////////////SKULL'S BOOZE///////////////////////
 
+		daiquiri
+			name = "Daiquiri"
+			id = "daiquiri"
+			result = "daiquiri"
+			required_reagents = list("limejuice" = 1, "rum" = 1)
+			result_amount = 2
+
+		icepick
+			name = "Ice Pick"
+			id = "icepick"
+			result = "icepick"
+			required_reagents = list("icetea" = 1, "vodka" = 1)
+			result_amount = 2
+
+		puosseecafe
+			name = "Puossee-Cafe"
+			id = "puosseecafe"
+			result = "puosseecafe"
+			required_reagents = list("brandy" = 1, "chartreusegreen" = 1, "chartreuseyellow" = 1, "cremewhite" = 1, "grenadine" = 1)
+			result_amount = 5
+
+		mintjulep
+			name = "Mint Julep"
+			id = "mintjulep"
+			result = "mintjulep"
+			required_reagents = list("water" = 1, "whiskey" = 1, "ice" = 1)
+			result_amount = 2
+
+		johncollins
+			name = "John Collins"
+			id = "johncollins"
+			result = "johncollins"
+			required_reagents = list("whiskeysoda" = 2, "orangejuice" = 1, "grenadine" = 1, "ice" = 1)
+			result_amount = 5
+
+		gimlet
+			name = "Gimlet"
+			id = "gimlet"
+			result = "gimlet"
+			required_reagents = list("limejuice" = 1, "gin" = 1, "sodawater" = 1)
+			result_amount = 3
+
+		starsandstripes
+			name = "Stars and Stripes"
+			id = "starsandstripes"
+			result = "starsandstripes"
+			required_reagents = list("cream" = 1, "cremeyvette" = 1, "grenadine" = 1)
+			result_amount = 3
+
+/*		metropolitan				MISSING SPRITE!
+			name = "Metropolitan"
+			id = "metropolitan"
+			result = "metropolitan"
+			required_reagents = list("brandy" = 1, "vermouth" = 1, "grenadine" = 1)
+			result_amount = 3 */
+
+		caruso
+			name = "Caruso"
+			id = "caruso"
+			result = "caruso"
+			required_reagents = list("martini" = 2, "cremewhite" = 1)
+			result_amount = 3
+
+		aprilshower
+			name = "April Shower"
+			id = "aprilshower"
+			result = "aprilshower"
+			required_reagents = list("brandy" = 1, "chartreuseyellow" = 1, "orangejuice" = 1)
+			result_amount = 3
+
+		carthusiansazerac
+			name = "Carthusian Sazerac"
+			id = "carthusiansazerac"
+			result = "carthusiansazerac"
+			required_reagents = list("whiskey" = 1, "chartreusegreen" = 1, "grenadine" = 1, "absinthe" = 1)
+			result_amount = 4
+
+		deweycocktail
+			name = "Dewey Cocktail"
+			id = "deweycocktail"
+			result = "deweycocktail"
+			required_reagents = list("cremeyvette" = 1, "gin" = 1, "grenadine" = 1)
+			result_amount = 3
 
 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
 

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

@@ -276,6 +276,48 @@
 		..()
 		reagents.add_reagent("pwine", 100)
 
+//////////////////////////SKULL'S BOOZE///////////////////////
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/chartreusegreen
+	name = "Green Chartreuse"
+	desc = "A green, strong liqueur."
+	icon_state = "chartreusegreenbottle"
+	New()
+		..()
+		reagents.add_reagent("chartreusegreen", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/chartreuseyellow
+	name = "Yellow Chartreuse"
+	desc = "A yellow, strong liqueur."
+	icon_state = "chartreuseyellowbottle"
+	New()
+		..()
+		reagents.add_reagent("chartreuseyellow", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cremewhite
+	name = "White Creme de Menthe"
+	desc = "Mint-flavoured alcohol, in a bottle."
+	icon_state = "whitecremebottle"
+	New()
+		..()
+		reagents.add_reagent("cremewhite", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cremeyvette
+	name = "Creme de Yvette"
+	desc = "Berry-flavoured alcohol, in a bottle."
+	icon_state = "cremedeyvettebottle"
+	New()
+		..()
+		reagents.add_reagent("cremeyvette", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/brandy
+	name = "Brandy"
+	desc = "Cheap knock off for cognac."
+	icon_state = "brandybottle"
+	New()
+		..()
+		reagents.add_reagent("brandy", 100)
+
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice

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

@@ -1,5 +1,5 @@
- 
- 
+
+
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass
 	name = "glass"
 	desc = "Your standard drinking glass."
@@ -482,6 +482,74 @@
 					icon_state = "pwineglass"
 					name = "Glass of ???"
 					desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
+				if("daiquiri")
+					icon_state = "daiquiri"
+					name = "Glass of Daiquiri"
+					desc = "A splendid looking cocktail."
+				if("icepick")
+					icon_state = "icepick"
+					name = "Glass of Ice Pick"
+					desc = "Big. And red. Hmm..."
+				if("puosseecafe")
+					icon_state = "pousseecafe"
+					name = "Glass of Puossee-Cafe"
+					desc = "Smells of French and liquore."
+				if("mintjulep")
+					icon_state = "mintjulep"
+					name = "Glass of Mint Julep"
+					desc = "As old as time itself, but how does it taste?"
+				if("johncollins")
+					icon_state = "johnscollins"
+					name = "Glass of John Collins"
+					desc = "Named after a man, perhaps?"
+				if("gimlet")
+					icon_state = "gimlet"
+					name = "Glass of Gimlet"
+					desc = "Small, elegant, and packs a punch."
+				if("starsandstripes")
+					icon_state = "starsandstripes"
+					name = "Glass of Stars and Stripes"
+					desc = "Someone, somewhere, is saluting."
+				if("metropolitan")
+					icon_state = "metropolitan"
+					name = "Glass of Metropolitan"
+					desc = "What more could you ask for?"
+				if("caruso")
+					icon_state = "caruso"
+					name = "Glass of Caruso"
+					desc = "Green, almost alien."
+				if("aprilshower")
+					icon_state = "aprilshower"
+					name = "April Shower"
+					desc = "Smells of brandy."
+				if("carthusiansazerac")
+					icon_state = "carthusiansazerac"
+					name = "Carthusian Sazerac"
+					desc = "Whiskey and... Syrup?"
+				if("deweycocktail")
+					icon_state = "deweycocktail"
+					name = "Glass of the Dewey Cocktail"
+					desc = "Colours, look at all of the colours!"
+				if("chartreusegreen")
+					icon_state = "greenchartreuseglass"
+					name = "Glass of Chartreuse Green"
+					desc = "A strong, green liqueur."
+				if("chartreuseyellow")
+					icon_state = "chartreuseyellowglass"
+					name = "Glass of Chartreuse Yellow"
+					desc = "A strong, yellow liqueur."
+				if("cremewhite")
+					icon_state = "whitecremeglass"
+					name = "Glass of White Creme de Menthe"
+					desc = "Mint-flavoured alcohol."
+				if("cremeyvette")
+					icon_state = "cremedeyvetteglass"
+					name = "Creme de Yvette"
+					desc = "Berry-flavoured alcohol."
+				if("brandy")
+					icon_state = "brandyglass"
+					name = "Brandy"
+					desc = "Cheap knock off for cognac."
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"