Split drinks into different files (#75898)

Splits our nearly 4000 and 1600 line long files. Mostly just moves the
glass appearances into their own files.

code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm

@@ -0,0 +1,239 @@
+/datum/glass_style/drinking_glass/beer
+	required_drink_type = /datum/reagent/consumable/ethanol/beer
+	name = "glass of beer"
+	desc = "A freezing pint of beer."
+	icon_state = "beerglass"
+
+/datum/glass_style/drinking_glass/beer/light
+	required_drink_type = /datum/reagent/consumable/ethanol/beer/light
+	name = "glass of light beer"
+	desc = "A freezing pint of watery light beer."
+
+/datum/glass_style/drinking_glass/beer/light
+	required_drink_type = /datum/reagent/consumable/ethanol/beer/maltliquor
+	name = "glass of malt liquor"
+	desc = "A freezing pint of malt liquor."
+
+/datum/glass_style/drinking_glass/beer/green
+	required_drink_type = /datum/reagent/consumable/ethanol/beer/green
+	name = "glass of green beer"
+	desc = "A freezing pint of green beer. Festive."
+	icon_state = "greenbeerglass"
+
+/datum/glass_style/drinking_glass/kahlua
+	required_drink_type = /datum/reagent/consumable/ethanol/kahlua
+	name = "glass of RR coffee liquor"
+	desc = "DAMN, THIS THING LOOKS ROBUST!"
+	icon_state ="kahluaglass"
+
+/datum/glass_style/drinking_glass/whiskey
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey
+	name = "glass of whiskey"
+	desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
+	icon_state = "whiskeyglass"
+
+/datum/glass_style/drinking_glass/whiskey/kong
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey/kong
+	name = "glass of Kong"
+	desc = "Makes You Go Ape!®"
+
+/datum/glass_style/drinking_glass/whiskey/candycorn
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey/candycorn
+	name = "glass of candy corn liquor"
+	desc = "Good for your Imagination."
+
+/datum/glass_style/drinking_glass/thirteenloko
+	required_drink_type = /datum/reagent/consumable/ethanol/thirteenloko
+	name = "glass of Thirteen Loko"
+	desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
+	icon_state = "thirteen_loko_glass"
+
+/datum/glass_style/drinking_glass/vodka
+	required_drink_type = /datum/reagent/consumable/ethanol/vodka
+	name = "glass of vodka"
+	desc = "The glass contain wodka. Xynta."
+	icon_state = "ginvodkaglass"
+
+/datum/glass_style/drinking_glass/gin
+	required_drink_type = /datum/reagent/consumable/ethanol/gin
+	name = "glass of gin"
+	desc = "A crystal clear glass of Griffeater gin."
+	icon_state = "ginvodkaglass"
+
+/datum/glass_style/drinking_glass/rum
+	required_drink_type = /datum/reagent/consumable/ethanol/rum
+	name = "glass of rum"
+	desc = "Now you want to pray for a pirate suit, don't you?"
+	icon_state = "rumglass"
+
+/datum/glass_style/drinking_glass/tequila
+	required_drink_type = /datum/reagent/consumable/ethanol/tequila
+	name = "glass of tequila"
+	desc = "Now all that's missing is the weird colored shades!"
+	icon_state = "tequilaglass"
+
+/datum/glass_style/drinking_glass/vermouth
+	required_drink_type = /datum/reagent/consumable/ethanol/vermouth
+	name = "glass of vermouth"
+	desc = "You wonder why you're even drinking this straight."
+	icon_state = "vermouthglass"
+
+/datum/glass_style/drinking_glass/wine
+	required_drink_type = /datum/reagent/consumable/ethanol/wine
+	name = "glass of wine"
+	desc = "A very classy looking drink."
+	icon_state = "wineglass"
+
+/datum/glass_style/drinking_glass/grappa
+	required_drink_type = /datum/reagent/consumable/ethanol/grappa
+	name = "glass of grappa"
+	desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking."
+	icon_state = "grappa"
+
+/datum/glass_style/drinking_glass/amaretto
+	required_drink_type = /datum/reagent/consumable/ethanol/amaretto
+	name = "glass of amaretto"
+	desc = "A sweet and syrupy looking drink."
+	icon_state = "amarettoglass"
+/datum/glass_style/drinking_glass/cognac
+	required_drink_type = /datum/reagent/consumable/ethanol/cognac
+	name = "glass of cognac"
+	desc = "Damn, you feel like some kind of French aristocrat just by holding this."
+	icon_state = "cognacglass"
+
+/datum/glass_style/drinking_glass/absinthe
+	required_drink_type = /datum/reagent/consumable/ethanol/absinthe
+	name = "glass of absinthe"
+	desc = "It's as strong as it smells."
+	icon_state = "absinthe"
+
+/datum/glass_style/drinking_glass/hooch
+	required_drink_type = /datum/reagent/consumable/ethanol/hooch
+	name = "glass of ale"
+	desc = "A freezing pint of delicious Ale."
+	icon_state = "aleglass"
+
+/datum/glass_style/drinking_glass/goldschlager
+	required_drink_type = /datum/reagent/consumable/ethanol/goldschlager
+	name = "glass of goldschlager"
+	desc = "100% proof that teen girls will drink anything with gold in it."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "goldschlagerglass"
+
+/datum/glass_style/drinking_glass/patron
+	required_drink_type = /datum/reagent/consumable/ethanol/patron
+	name = "glass of patron"
+	desc = "Drinking patron in the bar, with all the subpar ladies."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "patronglass"
+
+/datum/glass_style/drinking_glass/sake
+	required_drink_type = /datum/reagent/consumable/ethanol/sake
+	name = "cup of sake"
+	desc = "A traditional cup of sake."
+	icon_state = "sakecup"
+
+/datum/glass_style/drinking_glass/fernet
+	required_drink_type = /datum/reagent/consumable/ethanol/fernet
+	name = "glass of fernet"
+	desc = "A glass of pure Fernet. Only an absolute madman would drink this alone." //Hi Kevum
+
+/datum/glass_style/drinking_glass/fruit_wine
+	required_drink_type = /datum/reagent/consumable/ethanol/fruit_wine
+	// This should really be dynamic like "glass of pineapple wine" or something
+	// but seeing as fruit wine half doesn't work already I'm not inclined to add support for that now
+	name = "glass of fruit wine"
+	desc = "A wine made from grown plants."
+
+/datum/glass_style/drinking_glass/champagne
+	required_drink_type = /datum/reagent/consumable/ethanol/champagne
+	name = "Champagne"
+	desc = "The flute clearly displays the slowly rising bubbles."
+	icon_state = "champagne_glass"
+
+/datum/glass_style/drinking_glass/pruno
+	required_drink_type = /datum/reagent/consumable/ethanol/pruno
+	name = "glass of pruno"
+	desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done."
+	icon_state = "glass_orange"
+
+/datum/glass_style/drinking_glass/navy_rum
+	required_drink_type = /datum/reagent/consumable/ethanol/navy_rum
+	name = "glass of navy rum"
+	desc = "Splice the mainbrace, and God save the King."
+	icon_state = "ginvodkaglass"
+
+/datum/glass_style/drinking_glass/curacao
+	required_drink_type = /datum/reagent/consumable/ethanol/curacao
+	name = "glass of curaçao"
+	desc = "It's blue, da ba dee."
+	icon_state = "curacao"
+
+/datum/glass_style/drinking_glass/bitters
+	required_drink_type = /datum/reagent/consumable/ethanol/bitters
+	name = "glass of bitters"
+	desc = "Typically you'd want to mix this with something- but you do you."
+	icon_state = "bitters"
+
+
+// Shot glasses
+
+/datum/glass_style/shot_glass/kahlua
+	required_drink_type = /datum/reagent/consumable/ethanol/kahlua
+	icon_state ="shotglasscream"
+
+/datum/glass_style/shot_glass/whiskey
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey
+	icon_state = "shotglassbrown"
+
+/datum/glass_style/shot_glass/whiskey/kong
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey/kong
+
+/datum/glass_style/shot_glass/whiskey/candycorn
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey/candycorn
+
+/datum/glass_style/shot_glass/vodka
+	required_drink_type = /datum/reagent/consumable/ethanol/vodka
+	icon_state = "shotglassclear"
+
+/datum/glass_style/shot_glass/rum
+	required_drink_type = /datum/reagent/consumable/ethanol/rum
+	icon_state = "shotglassbrown"
+
+/datum/glass_style/shot_glass/tequila
+	required_drink_type = /datum/reagent/consumable/ethanol/tequila
+	icon_state = "shotglassgold"
+
+/datum/glass_style/shot_glass/vermouth
+	required_drink_type = /datum/reagent/consumable/ethanol/vermouth
+	icon_state = "shotglassclear"
+
+/datum/glass_style/shot_glass/wine
+	required_drink_type = /datum/reagent/consumable/ethanol/wine
+	icon_state = "shotglassred"
+
+/datum/glass_style/shot_glass/amaretto
+	required_drink_type = /datum/reagent/consumable/ethanol/amaretto
+	icon_state = "shotglassgold"
+
+/datum/glass_style/shot_glass/cognac
+	required_drink_type = /datum/reagent/consumable/ethanol/cognac
+	icon_state = "shotglassbrown"
+
+/datum/glass_style/shot_glass/absinthe
+	required_drink_type = /datum/reagent/consumable/ethanol/absinthe
+	icon_state = "shotglassgreen"
+
+/datum/glass_style/drinking_glass/hooch
+	required_drink_type = /datum/reagent/consumable/ethanol/hooch
+	name = "Hooch"
+	desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+	icon_state = "glass_brown2"
+
+/datum/glass_style/shot_glass/goldschlager
+	required_drink_type = /datum/reagent/consumable/ethanol/goldschlager
+	icon_state = "shotglassgold"
+
+/datum/glass_style/shot_glass/patron
+	required_drink_type = /datum/reagent/consumable/ethanol/patron
+	icon_state = "shotglassclear"

code/modules/reagents/chemistry/reagents/drinks/glass_styles/coffee_tea.dm

@@ -0,0 +1,75 @@
+// Coffees and Teas
+
+/datum/glass_style/drinking_glass/coffee
+	required_drink_type = /datum/reagent/consumable/coffee
+	name = "glass of coffee"
+	desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
+	icon_state = "glass_brown"
+
+/datum/glass_style/drinking_glass/tea
+	required_drink_type = /datum/reagent/consumable/tea
+	name = "glass of tea"
+	desc = "Drinking it from here would not seem right."
+	icon_state = "teaglass"
+
+/datum/glass_style/drinking_glass/icecoffee
+	required_drink_type = /datum/reagent/consumable/icecoffee
+	name = "iced coffee"
+	desc = "A drink to perk you up and refresh you!"
+	icon = 'icons/obj/drinks/coffee.dmi'
+	icon_state = "icedcoffeeglass"
+
+/datum/glass_style/drinking_glass/hot_ice_coffee
+	required_drink_type = /datum/reagent/consumable/hot_ice_coffee
+	name = "hot ice coffee"
+	desc = "A sharp drink - This can't have come cheap."
+	icon = 'icons/obj/drinks/coffee.dmi'
+	icon_state = "hoticecoffee"
+
+/datum/glass_style/drinking_glass/icetea
+	required_drink_type = /datum/reagent/consumable/icetea
+	name = "iced tea"
+	desc = "All natural, antioxidant-rich flavour sensation."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "icedteaglass"
+
+/datum/glass_style/drinking_glass/soy_latte
+	required_drink_type = /datum/reagent/consumable/soy_latte
+	name = "soy latte"
+	desc = "A nice and refreshing beverage while you're reading."
+	icon = 'icons/obj/drinks/coffee.dmi'
+	icon_state = "soy_latte"
+
+/datum/glass_style/drinking_glass/cafe_latte
+	required_drink_type = /datum/reagent/consumable/cafe_latte
+	name = "cafe latte"
+	desc = "A nice, strong and refreshing beverage while you're reading."
+	icon = 'icons/obj/drinks/coffee.dmi'
+	icon_state = "cafe_latte"
+
+/datum/glass_style/drinking_glass/pumpkin_latte
+	required_drink_type = /datum/reagent/consumable/pumpkin_latte
+	name = "pumpkin latte"
+	desc = "A mix of coffee and pumpkin juice."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "pumpkin_latte"
+
+/datum/glass_style/has_foodtype/drinking_glass/hot_coco
+	required_drink_type = /datum/reagent/consumable/hot_coco
+	name = "glass of hot coco"
+	desc = "A favorite winter drink to warm you up."
+	icon_state = "chocolateglass"
+	drink_type = SUGAR | DAIRY
+
+/datum/glass_style/drinking_glass/italian_coco
+	required_drink_type = /datum/reagent/consumable/italian_coco
+	name = "glass of italian coco"
+	desc = "A spin on a winter favourite, made to please."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "italiancoco"
+
+/datum/glass_style/drinking_glass/mushroom_tea
+	required_drink_type = /datum/reagent/consumable/mushroom_tea
+	name = "glass of mushroom tea"
+	desc = "Oddly savoury for a drink."
+	icon_state = "mushroom_tea_glass"

code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm

@@ -0,0 +1,34 @@
+// Dairy
+
+/datum/glass_style/has_foodtype/drinking_glass/milk
+	required_drink_type = /datum/reagent/consumable/milk
+	name = "glass of milk"
+	desc = "White and nutritious goodness!"
+	icon_state = "glass_white"
+	drink_type = DAIRY | BREAKFAST
+
+/datum/glass_style/has_foodtype/juicebox/milk
+	required_drink_type = /datum/reagent/consumable/milk
+	name = "carton of milk"
+	desc = "An excellent source of calcium for growing space explorers."
+	icon_state = "milkbox"
+	drink_type = DAIRY | BREAKFAST
+
+/datum/glass_style/has_foodtype/juicebox/chocolate_milk
+	required_drink_type = /datum/reagent/consumable/milk/chocolate_milk
+	name = "carton of chocolate milk"
+	desc = "Milk for cool kids!"
+	icon_state = "chocolatebox"
+	drink_type = SUGAR | DAIRY
+
+/datum/glass_style/drinking_glass/soymilk
+	required_drink_type = /datum/reagent/consumable/soymilk
+	name = "glass of soy milk"
+	desc = "White and nutritious soy goodness!"
+	icon_state = "glass_white"
+
+/datum/glass_style/drinking_glass/cream
+	required_drink_type = /datum/reagent/consumable/cream
+	name = "glass of cream"
+	desc = "Ewwww..."
+	icon_state = "glass_white"

code/modules/reagents/chemistry/reagents/drinks/glass_styles/juices.dm

@@ -0,0 +1,175 @@
+// Fruit/veggie juices and syrups
+
+/datum/glass_style/has_foodtype/drinking_glass/orangejuice
+	required_drink_type = /datum/reagent/consumable/orangejuice
+	name = "glass of orange juice"
+	desc = "Vitamins! Yay!"
+	icon_state = "glass_orange"
+	drink_type = FRUIT | BREAKFAST
+
+/datum/glass_style/has_foodtype/juicebox/orangejuice
+	required_drink_type = /datum/reagent/consumable/orangejuice
+	name = "orange juice box"
+	desc = "A great source of vitamins. Stay healthy!"
+	icon_state = "orangebox"
+	drink_type = FRUIT | BREAKFAST
+
+/datum/glass_style/has_foodtype/juicebox/applejuice
+	required_drink_type = /datum/reagent/consumable/applejuice
+	name = "apple juice box"
+	desc = "Sweet apple juice. Don't be late for school!"
+	icon_state = "juicebox"
+	drink_type = FRUIT
+
+/datum/glass_style/has_foodtype/juicebox/grapejuice
+	required_drink_type = /datum/reagent/consumable/grapejuice
+	name = "grape juice box"
+	desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
+	icon_state = "grapebox"
+	drink_type = FRUIT
+
+/datum/glass_style/has_foodtype/drinking_glass/plumjuice
+	required_drink_type = /datum/reagent/consumable/plumjuice
+	name = "glass of plum juice"
+	desc = "Noice."
+	icon_state = "plumjuiceglass"
+	drink_type = FRUIT
+
+/datum/glass_style/has_foodtype/drinking_glass/parsnipjuice
+	required_drink_type = /datum/reagent/consumable/parsnipjuice
+	name = "glass of parsnip juice"
+	drink_type = FRUIT
+
+/datum/glass_style/has_foodtype/drinking_glass/pineapplejuice
+	required_drink_type = /datum/reagent/consumable/pineapplejuice
+	name = "glass of pineapple juice"
+	desc = "Tart, tropical, and hotly debated."
+	drink_type = FRUIT | PINEAPPLE
+
+/datum/glass_style/has_foodtype/juicebox/pineapplejuice
+	required_drink_type = /datum/reagent/consumable/pineapplejuice
+	name = "pineapple juice box"
+	desc = "Why would you even want this?"
+	icon_state = "pineapplebox"
+	drink_type = FRUIT | PINEAPPLE
+
+/datum/glass_style/has_foodtype/drinking_glass/peachjuice
+	required_drink_type = /datum/reagent/consumable/peachjuice
+	name = "glass of peach juice"
+	drink_type = FRUIT
+
+/datum/glass_style/drinking_glass/tomatojuice
+	required_drink_type = /datum/reagent/consumable/tomatojuice
+	name = "glass of tomato juice"
+	desc = "Are you sure this is tomato juice?"
+	icon_state = "glass_red"
+
+/datum/glass_style/drinking_glass/limejuice
+	required_drink_type = /datum/reagent/consumable/limejuice
+	name = "glass of lime juice"
+	desc = "A glass of sweet-sour lime juice."
+	icon_state = "glass_green"
+
+/datum/glass_style/drinking_glass/carrotjuice
+	required_drink_type = /datum/reagent/consumable/carrotjuice
+	name = "glass of  carrot juice"
+	desc = "It's just like a carrot but without crunching."
+	icon_state = "carrotjuice"
+
+/datum/glass_style/drinking_glass/berryjuice
+	required_drink_type = /datum/reagent/consumable/berryjuice
+	name = "glass of berry juice"
+	desc = "Berry juice. Or maybe it's jam. Who cares?"
+	icon_state = "berryjuice"
+
+/datum/glass_style/drinking_glass/poisonberryjuice
+	required_drink_type = /datum/reagent/consumable/poisonberryjuice
+	name = "glass of berry juice"
+	desc = "Berry juice. Or maybe it's poison. Who cares?"
+	icon_state = "poisonberryjuice"
+
+/datum/glass_style/drinking_glass/watermelonjuice
+	required_drink_type = /datum/reagent/consumable/watermelonjuice
+	name = "glass of watermelon juice"
+	desc = "A glass of watermelon juice."
+	icon_state = "glass_red"
+
+/datum/glass_style/drinking_glass/lemonjuice
+	required_drink_type = /datum/reagent/consumable/lemonjuice
+	name = "glass of lemon juice"
+	desc = "Sour..."
+	icon_state = "lemonglass"
+
+/datum/glass_style/drinking_glass/banana
+	required_drink_type = /datum/reagent/consumable/banana
+	name = "glass of banana juice"
+	desc = "The raw essence of a banana. HONK."
+	icon_state = "banana"
+
+/datum/glass_style/drinking_glass/nothing
+	required_drink_type = /datum/reagent/consumable/nothing
+	name = "nothing"
+	desc = "Absolutely nothing."
+	icon_state = "nothing"
+
+/datum/glass_style/drinking_glass/potato_juice
+	required_drink_type = /datum/reagent/consumable/potato_juice
+	name = "glass of potato juice"
+	desc = "Bleh..."
+	icon_state = "glass_brown"
+
+/datum/glass_style/drinking_glass/bungojuice
+	required_drink_type = /datum/reagent/consumable/bungojuice
+	name = "glass of bungo juice"
+	desc = "Exotic! You feel like you are on vacation already."
+	icon_state = "glass_yellow"
+
+/datum/glass_style/drinking_glass/prunomix
+	required_drink_type = /datum/reagent/consumable/prunomix
+	name = "glass of pruno mixture"
+	desc = "Fruit, sugar, yeast, and water pulped together into a pungent slurry."
+	icon_state = "glass_orange"
+
+/datum/glass_style/drinking_glass/aloejuice
+	required_drink_type = /datum/reagent/consumable/aloejuice
+	name = "glass of aloe juice"
+	desc = "A healthy and refreshing juice."
+	icon_state = "glass_yellow"
+
+/datum/glass_style/drinking_glass/toechtauese_juice
+	required_drink_type = /datum/reagent/consumable/toechtauese_juice
+	name = "glass of töchtaüse juice"
+	desc = "Raw, unadulterated töchtaüse juice. One swig will fill you with regrets."
+	icon_state = "toechtauese_syrup"
+
+/datum/glass_style/drinking_glass/toechtauese_syrup
+	required_drink_type = /datum/reagent/consumable/toechtauese_syrup
+	name = "glass of töchtaüse syrup"
+	desc = "Not for drinking on its own."
+	icon_state = "toechtauese_syrup"
+
+/datum/glass_style/drinking_glass/cucumberjuice
+	required_drink_type = /datum/reagent/consumable/cucumberjuice
+	name = "glass of cucumber juice"
+	desc = "A glass of cucumber juice."
+	icon_state = "glass_cucumber"
+
+
+// Effectively misc
+
+/datum/glass_style/drinking_glass/menthol
+	required_drink_type = /datum/reagent/consumable/menthol
+	name = "glass of menthol"
+	desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
+	icon_state = "glass_green"
+
+/datum/glass_style/drinking_glass/grenadine
+	required_drink_type = /datum/reagent/consumable/grenadine
+	name = "glass of grenadine"
+	desc = "Delicious flavored syrup."
+
+/datum/glass_style/drinking_glass/ice
+	required_drink_type = /datum/reagent/consumable/ice
+	name = "glass of ice"
+	desc = "Generally, you're supposed to put something else in there too..."
+	icon_state = "iceglass"

code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm

@@ -0,0 +1,929 @@
+/datum/glass_style/drinking_glass/bilk
+	required_drink_type = /datum/reagent/consumable/ethanol/bilk
+	name = "glass of bilk"
+	desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
+	icon_state = "glass_brown"
+
+/datum/glass_style/drinking_glass/threemileisland
+	required_drink_type = /datum/reagent/consumable/ethanol/threemileisland
+	name = "Three Mile Island Ice Tea"
+	desc = "A glass of this is sure to prevent a meltdown."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "threemileislandglass"
+
+/datum/glass_style/drinking_glass/gintonic
+	required_drink_type = /datum/reagent/consumable/ethanol/gintonic
+	name = "Gin and Tonic"
+	desc = "A mild but still great cocktail. Drink up, like a true Englishman."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "gintonicglass"
+
+/datum/glass_style/drinking_glass/rum_coke
+	required_drink_type = /datum/reagent/consumable/ethanol/rum_coke
+	name = "Rum and Coke"
+	desc = "The classic go-to of space-fratboys."
+	icon_state = "whiskeycolaglass"
+
+/datum/glass_style/drinking_glass/cuba_libre
+	required_drink_type = /datum/reagent/consumable/ethanol/cuba_libre
+	name = "Cuba Libre"
+	desc = "A classic mix of rum, cola, and lime. A favorite of revolutionaries everywhere!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "cubalibreglass"
+
+/datum/glass_style/drinking_glass/whiskey_cola
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey_cola
+	name = "whiskey cola"
+	desc = "An innocent-looking mixture of cola and whiskey. Delicious."
+	icon_state = "whiskeycolaglass"
+
+/datum/glass_style/drinking_glass/martini
+	required_drink_type = /datum/reagent/consumable/ethanol/martini
+	name = "Classic Martini"
+	desc = "Damn, the bartender even stirred it, not shook it."
+	icon_state = "martiniglass"
+
+/datum/glass_style/drinking_glass/vodkamartini
+	required_drink_type = /datum/reagent/consumable/ethanol/vodkamartini
+	name = "Vodka martini"
+	desc = "A bastardisation of the classic martini. Still great."
+	icon_state = "martiniglass"
+
+/datum/glass_style/drinking_glass/white_russian
+	required_drink_type = /datum/reagent/consumable/ethanol/white_russian
+	name = "White Russian"
+	desc = "A very nice looking drink. But that's just, like, your opinion, man."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "whiterussianglass"
+
+/datum/glass_style/drinking_glass/screwdrivercocktail
+	required_drink_type = /datum/reagent/consumable/ethanol/screwdrivercocktail
+	name = "Screwdriver"
+	desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "screwdriverglass"
+
+/datum/glass_style/drinking_glass/booger
+	required_drink_type = /datum/reagent/consumable/ethanol/booger
+	name = "Booger"
+	desc = "Ewww..."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "booger"
+
+/datum/glass_style/drinking_glass/bloody_mary
+	required_drink_type = /datum/reagent/consumable/ethanol/bloody_mary
+	name = "Bloody Mary"
+	desc = "Tomato juice, mixed with Vodka and a li'l bit of lime. Tastes like liquid murder."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "bloodymaryglass"
+
+/datum/glass_style/drinking_glass/brave_bull
+	required_drink_type = /datum/reagent/consumable/ethanol/brave_bull
+	name = "Brave Bull"
+	desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "bravebullglass"
+
+/datum/glass_style/drinking_glass/tequila_sunrise
+	required_drink_type = /datum/reagent/consumable/ethanol/tequila_sunrise
+	name = "tequila Sunrise"
+	desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "tequilasunriseglass"
+
+/datum/glass_style/drinking_glass/toxins_special
+	required_drink_type = /datum/reagent/consumable/ethanol/toxins_special
+	name = "Toxins Special"
+	desc = "Whoah, this thing is on FIRE!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "toxinsspecialglass"
+
+/datum/glass_style/drinking_glass/beepsky_smash
+	required_drink_type = /datum/reagent/consumable/ethanol/beepsky_smash
+	name = "Beepsky Smash"
+	desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "beepskysmashglass"
+
+/datum/glass_style/drinking_glass/irish_cream
+	required_drink_type = /datum/reagent/consumable/ethanol/irish_cream
+	name = "Irish Cream"
+	desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
+	icon_state = "irishcreamglass"
+
+/datum/glass_style/drinking_glass/manly_dorf
+	required_drink_type = /datum/reagent/consumable/ethanol/manly_dorf
+	name = "The Manly Dorf"
+	desc = "A manly concoction made from Ale and Beer. Intended for true men only."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "manlydorfglass"
+
+/datum/glass_style/drinking_glass/longislandicedtea
+	required_drink_type = /datum/reagent/consumable/ethanol/longislandicedtea
+	name = "Long Island Iced Tea"
+	desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "longislandicedteaglass"
+
+/datum/glass_style/drinking_glass/moonshine
+	required_drink_type = /datum/reagent/consumable/ethanol/moonshine
+	name = "Moonshine"
+	desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+	icon_state = "glass_clear"
+
+/datum/glass_style/drinking_glass/b52
+	required_drink_type = /datum/reagent/consumable/ethanol/b52
+	name = "B-52"
+	desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "b52glass"
+
+/datum/glass_style/drinking_glass/irishcoffee
+	required_drink_type = /datum/reagent/consumable/ethanol/irishcoffee
+	name = "Irish Coffee"
+	desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
+	icon = 'icons/obj/drinks/coffee.dmi'
+	icon_state = "irishcoffeeglass"
+
+/datum/glass_style/drinking_glass/margarita
+	required_drink_type = /datum/reagent/consumable/ethanol/margarita
+	name = "Margarita"
+	desc = "On the rocks with salt on the rim. Arriba~!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "margaritaglass"
+
+/datum/glass_style/drinking_glass/black_russian
+	required_drink_type = /datum/reagent/consumable/ethanol/black_russian
+	name = "Black Russian"
+	desc = "For the lactose-intolerant. Still as classy as a White Russian."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "blackrussianglass"
+
+/datum/glass_style/drinking_glass/manhattan
+	required_drink_type = /datum/reagent/consumable/ethanol/manhattan
+	name = "Manhattan"
+	desc = "The Detective's undercover drink of choice. He never could stomach gin..."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "manhattanglass"
+
+/datum/glass_style/drinking_glass/manhattan_proj
+	required_drink_type = /datum/reagent/consumable/ethanol/manhattan_proj
+	name = "Manhattan Project"
+	desc = "A scientist's drink of choice, for thinking how to blow up the station."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "proj_manhattanglass"
+
+/datum/glass_style/drinking_glass/whiskeysoda
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskeysoda
+	name = "whiskey soda"
+	desc = "Ultimate refreshment."
+	icon_state = "whiskeysodaglass2"
+
+/datum/glass_style/drinking_glass/antifreeze
+	required_drink_type = /datum/reagent/consumable/ethanol/antifreeze
+	name = "Anti-freeze"
+	desc = "The ultimate refreshment."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "antifreeze"
+
+/datum/glass_style/drinking_glass/barefoot
+	required_drink_type = /datum/reagent/consumable/ethanol/barefoot
+	name = "Barefoot"
+	desc = "Barefoot and pregnant."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "b&p"
+
+/datum/glass_style/drinking_glass/snowwhite
+	required_drink_type = /datum/reagent/consumable/ethanol/snowwhite
+	name = "Snow White"
+	desc = "A cold refreshment."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "snowwhite"
+
+/datum/glass_style/drinking_glass/demonsblood
+	required_drink_type = /datum/reagent/consumable/ethanol/demonsblood
+	name = "Demons Blood"
+	desc = "Just looking at this thing makes the hair at the back of your neck stand up."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "demonsblood"
+
+/datum/glass_style/drinking_glass/devilskiss
+	required_drink_type = /datum/reagent/consumable/ethanol/devilskiss
+	name = "Devils Kiss"
+	desc = "Creepy time!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "devilskiss"
+
+/datum/glass_style/drinking_glass/vodkatonic
+	required_drink_type = /datum/reagent/consumable/ethanol/vodkatonic
+	name = "vodka and tonic"
+	desc = "For when a gin and tonic isn't Russian enough."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "vodkatonicglass"
+
+/datum/glass_style/drinking_glass/ginfizz
+	required_drink_type = /datum/reagent/consumable/ethanol/ginfizz
+	name = "gin fizz"
+	desc = "Refreshingly lemony, deliciously dry."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "ginfizzglass"
+
+/datum/glass_style/drinking_glass/bahama_mama
+	required_drink_type = /datum/reagent/consumable/ethanol/bahama_mama
+	name = "Bahama Mama"
+	desc = "A tropical cocktail with a complex blend of flavors."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "bahama_mama"
+
+/datum/glass_style/drinking_glass/singulo
+	required_drink_type = /datum/reagent/consumable/ethanol/singulo
+	name = "Singulo"
+	desc = "A blue-space beverage."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "singulo"
+
+/datum/glass_style/drinking_glass/sbiten
+	required_drink_type = /datum/reagent/consumable/ethanol/sbiten
+	name = "Sbiten"
+	desc = "A spicy mix of Vodka and Spice. Very hot."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "sbitenglass"
+
+/datum/glass_style/drinking_glass/red_mead
+	required_drink_type = /datum/reagent/consumable/ethanol/red_mead
+	name = "Red Mead"
+	desc = "A true Viking's beverage, made with the blood of their enemies."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "red_meadglass"
+
+/datum/glass_style/drinking_glass/mead
+	required_drink_type = /datum/reagent/consumable/ethanol/mead
+	name = "Mead"
+	desc = "A drink from Valhalla."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "meadglass"
+
+/datum/glass_style/drinking_glass/iced_beer
+	required_drink_type = /datum/reagent/consumable/ethanol/iced_beer
+	name = "iced beer"
+	desc = "A beer so frosty, the air around it freezes."
+	icon_state = "iced_beerglass"
+
+/datum/glass_style/drinking_glass/grog
+	required_drink_type = /datum/reagent/consumable/ethanol/grog
+	name = "Grog"
+	desc = "A fine and cepa drink for Space."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "grogglass"
+
+/datum/glass_style/drinking_glass/aloe
+	required_drink_type = /datum/reagent/consumable/ethanol/aloe
+	name = "Aloe"
+	desc = "Very, very, very good."
+	icon_state = "aloe"
+
+/datum/glass_style/drinking_glass/andalusia
+	required_drink_type = /datum/reagent/consumable/ethanol/andalusia
+	name = "Andalusia"
+	desc = "A nice, strangely named drink."
+	icon_state = "andalusia"
+
+/datum/glass_style/drinking_glass/alliescocktail
+	required_drink_type = /datum/reagent/consumable/ethanol/alliescocktail
+	name = "Allies cocktail"
+	desc = "A drink made from your allies."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "alliescocktail"
+
+/datum/glass_style/drinking_glass/acid_spit
+	required_drink_type = /datum/reagent/consumable/ethanol/acid_spit
+	name = "Acid Spit"
+	desc = "A drink from Nanotrasen. Made from live aliens."
+	icon_state = "acidspitglass"
+
+/datum/glass_style/drinking_glass/amasec
+	required_drink_type = /datum/reagent/consumable/ethanol/amasec
+	name = "Amasec"
+	desc = "Always handy before COMBAT!!!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "amasecglass"
+
+/datum/glass_style/drinking_glass/changelingsting
+	required_drink_type = /datum/reagent/consumable/ethanol/changelingsting
+	name = "Changeling Sting"
+	desc = "A stingy drink."
+	icon = 'icons/obj/drinks/soda.dmi'
+	icon_state = "changelingsting"
+
+/datum/glass_style/drinking_glass/irishcarbomb
+	required_drink_type = /datum/reagent/consumable/ethanol/irishcarbomb
+	name = "Irish Car Bomb"
+	desc = "An Irish car bomb."
+	icon_state = "irishcarbomb"
+
+/datum/glass_style/drinking_glass/syndicatebomb
+	required_drink_type = /datum/reagent/consumable/ethanol/syndicatebomb
+	name = "Syndicate Bomb"
+	desc = "A syndicate bomb."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "syndicatebomb"
+
+/datum/glass_style/drinking_glass/hiveminderaser
+	required_drink_type = /datum/reagent/consumable/ethanol/hiveminderaser
+	name = "Hivemind Eraser"
+	desc = "For when even mindshields can't save you."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "hiveminderaser"
+
+/datum/glass_style/drinking_glass/erikasurprise
+	required_drink_type = /datum/reagent/consumable/ethanol/erikasurprise
+	name = "Erika Surprise"
+	desc = "The surprise is, it's green!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "erikasurprise"
+
+/datum/glass_style/drinking_glass/driestmartini
+	required_drink_type = /datum/reagent/consumable/ethanol/driestmartini
+	name = "Driest Martini"
+	desc = "Only for the experienced. You think you see sand floating in the glass."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "driestmartiniglass"
+
+/datum/glass_style/drinking_glass/bananahonk
+	required_drink_type = /datum/reagent/consumable/ethanol/bananahonk
+	name = "Banana Honk"
+	desc = "A drink from Clown Heaven."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "bananahonkglass"
+
+/datum/glass_style/drinking_glass/silencer
+	required_drink_type = /datum/reagent/consumable/ethanol/silencer
+	name = "Silencer"
+	desc = "A drink from Mime Heaven."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "silencerglass"
+
+/datum/glass_style/drinking_glass/drunkenblumpkin
+	required_drink_type = /datum/reagent/consumable/ethanol/drunkenblumpkin
+	name = "Drunken Blumpkin"
+	desc = "A drink for the drunks."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "drunkenblumpkin"
+
+/datum/glass_style/drinking_glass/whiskey_sour
+	required_drink_type = /datum/reagent/consumable/ethanol/whiskey_sour
+	name = "whiskey sour"
+	desc = "Lemon juice mixed with whiskey and a dash of sugar. Surprisingly satisfying."
+	icon_state = "whiskey_sour"
+
+/datum/glass_style/drinking_glass/hcider
+	required_drink_type = /datum/reagent/consumable/ethanol/hcider
+	name = "hard cider"
+	desc = "Tastes like autumn... no wait, fall!"
+	icon_state = "whiskeyglass"
+
+/datum/glass_style/drinking_glass/fetching_fizz
+	required_drink_type = /datum/reagent/consumable/ethanol/fetching_fizz
+	name = "Fetching Fizz"
+	desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "fetching_fizz"
+
+/datum/glass_style/drinking_glass/hearty_punch
+	required_drink_type = /datum/reagent/consumable/ethanol/hearty_punch
+	name = "Hearty Punch"
+	desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "hearty_punch"
+
+/datum/glass_style/drinking_glass/bacchus_blessing
+	required_drink_type = /datum/reagent/consumable/ethanol/bacchus_blessing
+	name = "Bacchus' Blessing"
+	desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?"
+	icon_state = "glass_brown2"
+
+/datum/glass_style/drinking_glass/atomicbomb
+	required_drink_type = /datum/reagent/consumable/ethanol/atomicbomb
+	name = "Atomic Bomb"
+	desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "atomicbombglass"
+
+/datum/glass_style/drinking_glass/gargle_blaster
+	required_drink_type = /datum/reagent/consumable/ethanol/gargle_blaster
+	name = "Pan-Galactic Gargle Blaster"
+	desc = "Like having your brain smashed out by a slice of lemon wrapped around a large gold brick."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "gargleblasterglass"
+
+/datum/glass_style/drinking_glass/neurotoxin
+	required_drink_type = /datum/reagent/consumable/ethanol/neurotoxin
+	name = "Neurotoxin"
+	desc = "A drink that is guaranteed to knock you silly."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "neurotoxinglass"
+
+/datum/glass_style/drinking_glass/hippies_delight
+	required_drink_type = /datum/reagent/consumable/ethanol/hippies_delight
+	name = "Hippie's Delight"
+	desc = "A drink enjoyed by people during the 1960's."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "hippiesdelightglass"
+
+/datum/glass_style/has_foodtype/drinking_glass/eggnog
+	required_drink_type = /datum/reagent/consumable/ethanol/eggnog
+	name = "eggnog"
+	desc = "For enjoying the most wonderful time of the year."
+	icon_state = "glass_yellow"
+	drink_type = FRUIT
+
+/datum/glass_style/has_foodtype/juicebox/eggnog
+	required_drink_type = /datum/reagent/consumable/ethanol/eggnog
+	name = "carton of eggnog"
+	desc = "A big juicebox for adults."
+	icon_state = "nog2"
+	drink_type = FRUIT
+
+/datum/glass_style/drinking_glass/narsour
+	required_drink_type = /datum/reagent/consumable/ethanol/narsour
+	name = "Nar'Sour"
+	desc = "A new hit cocktail inspired by THE ARM Breweries will have you shouting Fuu ma'jin in no time!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "narsour"
+
+/datum/glass_style/drinking_glass/triple_sec
+	required_drink_type = /datum/reagent/consumable/ethanol/triple_sec
+	name = "Triple Sec"
+	desc = "A glass of straight Triple Sec."
+	icon_state = "glass_orange"
+
+/datum/glass_style/drinking_glass/creme_de_menthe
+	required_drink_type = /datum/reagent/consumable/ethanol/creme_de_menthe
+	name = "Creme de Menthe"
+	desc = "You can almost feel the first breath of spring just looking at it."
+	icon_state = "glass_green"
+
+/datum/glass_style/drinking_glass/creme_de_cacao
+	required_drink_type = /datum/reagent/consumable/ethanol/creme_de_cacao
+	name = "Creme de Cacao"
+	desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
+	icon_state = "glass_brown"
+
+/datum/glass_style/drinking_glass/creme_de_coconut
+	required_drink_type = /datum/reagent/consumable/ethanol/creme_de_coconut
+	name = "Creme de Coconut"
+	desc = "An unintimidating glass of coconut liqueur."
+	icon_state = "glass_white"
+
+/datum/glass_style/drinking_glass/quadruple_sec
+	required_drink_type = /datum/reagent/consumable/ethanol/quadruple_sec
+	name = "Quadruple Sec"
+	desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "quadruple_sec"
+
+/datum/glass_style/drinking_glass/quintuple_sec
+	required_drink_type = /datum/reagent/consumable/ethanol/quintuple_sec
+	name = "Quintuple Sec"
+	desc = "Now you are become law, destroyer of clowns."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "quintuple_sec"
+
+/datum/glass_style/drinking_glass/grasshopper
+	required_drink_type = /datum/reagent/consumable/ethanol/grasshopper
+	name = "Grasshopper"
+	desc = "You weren't aware edible beverages could be that green."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "grasshopper"
+
+/datum/glass_style/drinking_glass/stinger
+	required_drink_type = /datum/reagent/consumable/ethanol/stinger
+	name = "Stinger"
+	desc = "You wonder what would happen if you pointed this at a heat source..."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "stinger"
+
+/datum/glass_style/drinking_glass/bastion_bourbon
+	required_drink_type = /datum/reagent/consumable/ethanol/bastion_bourbon
+	name = "Bastion Bourbon"
+	desc = "If you're feeling low, count on the buttery flavor of our own bastion bourbon."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "bastion_bourbon"
+
+/datum/glass_style/drinking_glass/squirt_cider
+	required_drink_type = /datum/reagent/consumable/ethanol/squirt_cider
+	name = "Squirt Cider"
+	desc = "Squirt cider will toughen you right up. Too bad about the musty aftertaste."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "squirt_cider"
+
+/datum/glass_style/drinking_glass/fringe_weaver
+	required_drink_type = /datum/reagent/consumable/ethanol/fringe_weaver
+	name = "Fringe Weaver"
+	desc = "It's a wonder it doesn't spill out of the glass."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "fringe_weaver"
+
+/datum/glass_style/drinking_glass/sugar_rush
+	required_drink_type = /datum/reagent/consumable/ethanol/sugar_rush
+	name = "Sugar Rush"
+	desc = "If you can't mix a Sugar Rush, you can't tend bar."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "sugar_rush"
+
+/datum/glass_style/drinking_glass/crevice_spike
+	required_drink_type = /datum/reagent/consumable/ethanol/crevice_spike
+	name = "Crevice Spike"
+	desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "crevice_spike"
+
+/datum/glass_style/drinking_glass/peppermint_patty
+	required_drink_type = /datum/reagent/consumable/ethanol/peppermint_patty
+	name = "Peppermint Patty"
+	desc = "A boozy minty hot cocoa that warms your belly on a cold night."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "peppermint_patty"
+
+/datum/glass_style/drinking_glass/alexander
+	required_drink_type = /datum/reagent/consumable/ethanol/alexander
+	name = "Alexander"
+	desc = "A creamy, indulgent delight that is stronger than it seems."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "alexander"
+
+/datum/glass_style/drinking_glass/amaretto_alexander
+	required_drink_type = /datum/reagent/consumable/ethanol/amaretto_alexander
+	name = "Amaretto Alexander"
+	desc = "A creamy, indulgent delight that is in fact as gentle as it seems."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "alexanderam"
+
+/datum/glass_style/drinking_glass/sidecar
+	required_drink_type = /datum/reagent/consumable/ethanol/sidecar
+	name = "Sidecar"
+	desc = "The one ride you'll gladly give up the wheel for."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "sidecar"
+
+/datum/glass_style/drinking_glass/between_the_sheets
+	required_drink_type = /datum/reagent/consumable/ethanol/between_the_sheets
+	name = "Between the Sheets"
+	desc = "The only drink that comes with a label reminding you of Nanotrasen's zero-tolerance promiscuity policy."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "between_the_sheets"
+
+/datum/glass_style/drinking_glass/kamikaze
+	required_drink_type = /datum/reagent/consumable/ethanol/kamikaze
+	name = "Kamikaze"
+	desc = "Divinely windy."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "kamikaze"
+
+/datum/glass_style/drinking_glass/mojito
+	required_drink_type = /datum/reagent/consumable/ethanol/mojito
+	name = "Mojito"
+	desc = "A drink that looks as refreshing as it tastes."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "mojito"
+
+/datum/glass_style/drinking_glass/moscow_mule
+	required_drink_type = /datum/reagent/consumable/ethanol/moscow_mule
+	name = "Moscow Mule"
+	desc = "A chilly drink that reminds you of the Derelict."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "moscow_mule"
+
+/datum/glass_style/drinking_glass/fernet_cola
+	required_drink_type = /datum/reagent/consumable/ethanol/fernet_cola
+	name = "glass of fernet cola"
+	desc = "A sawed-off cola bottle filled with Fernet Cola. Nothing better after eating like a lardass."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "godlyblend"
+
+/datum/glass_style/drinking_glass/fanciulli
+	required_drink_type = /datum/reagent/consumable/ethanol/fanciulli
+	name = "glass of fanciulli"
+	desc = "A glass of Fanciulli. It's just Manhattan with Fernet."
+	icon_state = "fanciulli"
+
+/datum/glass_style/drinking_glass/branca_menta
+	required_drink_type = /datum/reagent/consumable/ethanol/branca_menta
+	name = "glass of branca menta"
+	desc = "A glass of Branca Menta, perfect for those lazy and hot Sunday summer afternoons." //Get lazy literally by drinking this
+	icon_state = "minted_fernet"
+
+/datum/glass_style/drinking_glass/blank_paper
+	required_drink_type = /datum/reagent/consumable/ethanol/blank_paper
+	name = "glass of blank paper"
+	desc = "A fizzy cocktail for those looking to start fresh."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "blank_paper"
+
+/datum/glass_style/drinking_glass/wizz_fizz
+	required_drink_type = /datum/reagent/consumable/ethanol/wizz_fizz
+	name = "Wizz Fizz"
+	desc = "The glass bubbles and froths with an almost magical intensity."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "wizz_fizz"
+
+/datum/glass_style/drinking_glass/bug_spray
+	required_drink_type = /datum/reagent/consumable/ethanol/bug_spray
+	name = "Bug Spray"
+	desc = "Your eyes begin to water as the sting of alcohol reaches them."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "bug_spray"
+
+/datum/glass_style/drinking_glass/applejack
+	required_drink_type = /datum/reagent/consumable/ethanol/applejack
+	name = "Applejack"
+	desc = "You feel like you could drink this all neight."
+	icon_state = "applejack_glass"
+
+/datum/glass_style/drinking_glass/jack_rose
+	required_drink_type = /datum/reagent/consumable/ethanol/jack_rose
+	name = "Jack Rose"
+	desc = "Enough of these, and you really will start to suppose your toeses are roses."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "jack_rose"
+
+/datum/glass_style/drinking_glass/turbo
+	required_drink_type = /datum/reagent/consumable/ethanol/turbo
+	name = "Turbo"
+	desc = "A turbulent cocktail for outlaw hoverbikers."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "turbo"
+
+/datum/glass_style/drinking_glass/old_timer
+	required_drink_type = /datum/reagent/consumable/ethanol/old_timer
+	name = "Old Timer"
+	desc = "WARNING! May cause premature aging!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "old_timer"
+
+/datum/glass_style/drinking_glass/rubberneck
+	required_drink_type = /datum/reagent/consumable/ethanol/rubberneck
+	name = "Rubberneck"
+	desc = "A popular drink amongst those adhering to an all synthetic diet."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "rubberneck"
+
+/datum/glass_style/drinking_glass/duplex
+	required_drink_type = /datum/reagent/consumable/ethanol/duplex
+	name = "Duplex"
+	desc = "To imbibe one component separately from the other is consider a great faux pas."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "duplex"
+
+/datum/glass_style/drinking_glass/trappist
+	required_drink_type = /datum/reagent/consumable/ethanol/trappist
+	name = "Trappist Beer"
+	desc = "boozy Catholicism in a glass."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "trappistglass"
+
+/datum/glass_style/drinking_glass/blazaam
+	required_drink_type = /datum/reagent/consumable/ethanol/blazaam
+	name = "Blazaam"
+	desc = "The glass seems to be sliding between realities. Doubles as a Berenstain remover."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "blazaamglass"
+
+/datum/glass_style/drinking_glass/planet_cracker
+	required_drink_type = /datum/reagent/consumable/ethanol/planet_cracker
+	name = "Planet Cracker"
+	desc = "Although historians believe the drink was originally created to commemorate the end of an important conflict in man's past, its origins have largely been forgotten and it is today seen more as a general symbol of human supremacy."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "planet_cracker"
+
+/datum/glass_style/drinking_glass/mauna_loa
+	required_drink_type = /datum/reagent/consumable/ethanol/mauna_loa
+	name = "Mauna Loa"
+	desc = "Lavaland in a drink... mug... volcano... thing."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "mauna_loa"
+
+/datum/glass_style/drinking_glass/painkiller
+	required_drink_type = /datum/reagent/consumable/ethanol/painkiller
+	name = "Painkiller"
+	desc = "A combination of tropical juices and rum. Surely this will make you feel better."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "painkiller"
+
+/datum/glass_style/drinking_glass/pina_colada
+	required_drink_type = /datum/reagent/consumable/ethanol/pina_colada
+	name = "Pina Colada"
+	desc = "If you like pina coladas, and getting caught in the rain... well, you'll like this drink."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "pina_colada"
+
+/datum/glass_style/drinking_glass/pina_olivada
+	required_drink_type = /datum/reagent/consumable/ethanol/pina_olivada
+	name = "Piña Olivada"
+	desc = "A balance of fruity pineapple with thick, rich olive oil. Stir well before drinking."
+	icon_state = "pina_olivada"
+
+/datum/glass_style/drinking_glass/ginger_amaretto
+	required_drink_type = /datum/reagent/consumable/ethanol/ginger_amaretto
+	name = "Ginger Amaretto"
+	desc = "The sprig of rosemary adds a nice aroma to the drink, and isn't just to be pretentious afterall!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "gingeramaretto"
+
+/datum/glass_style/drinking_glass/godfather
+	required_drink_type = /datum/reagent/consumable/ethanol/godfather
+	name = "Godfather"
+	desc = "A classic from old Italy and enjoyed by gangsters, pray the orange peel doesnt end up in your mouth."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "godfather"
+
+/datum/glass_style/drinking_glass/godmother
+	required_drink_type = /datum/reagent/consumable/ethanol/godmother
+	name = "Godmother"
+	desc = "A lovely fresh smelling cocktail, a true Sicilian delight."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "godmother"
+
+/datum/glass_style/drinking_glass/kortara
+	required_drink_type = /datum/reagent/consumable/ethanol/kortara
+	name = "glass of kortara"
+	desc = "The fermented nectar of the Korta nut, as enjoyed by lizards galaxywide."
+	icon_state = "kortara_glass"
+
+/datum/glass_style/drinking_glass/sea_breeze
+	required_drink_type = /datum/reagent/consumable/ethanol/sea_breeze
+	name = "Sea Breeze"
+	desc = "Minty, chocolatey, and creamy. It's like drinkable mint chocolate chip!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "sea_breeze"
+
+/datum/glass_style/drinking_glass/white_tiziran
+	required_drink_type = /datum/reagent/consumable/ethanol/white_tiziran
+	name = "White Tiziran"
+	desc = "I had a rough night and I hate the fucking humans, man."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "white_tiziran"
+
+/datum/glass_style/drinking_glass/drunken_espatier
+	required_drink_type = /datum/reagent/consumable/ethanol/drunken_espatier
+	name = "Drunken Espatier"
+	desc = "A drink to make facing death easier."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "drunken_espatier"
+
+/datum/glass_style/drinking_glass/protein_blend
+	required_drink_type = /datum/reagent/consumable/ethanol/protein_blend
+	name = "Protein Blend"
+	desc = "Vile, even by lizard standards."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "protein_blend"
+
+/datum/glass_style/drinking_glass/mushi_kombucha
+	required_drink_type = /datum/reagent/consumable/ethanol/mushi_kombucha
+	name = "glass of mushi kombucha"
+	icon_state = "glass_orange"
+
+/datum/glass_style/drinking_glass/triumphal_arch
+	required_drink_type = /datum/reagent/consumable/ethanol/triumphal_arch
+	name = "Triumphal Arch"
+	desc = "A toast to the Empire, long may it stand."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "triumphal_arch"
+
+/datum/glass_style/drinking_glass/the_juice
+	required_drink_type = /datum/reagent/consumable/ethanol/the_juice
+	name = "The Juice"
+	desc = "A concoction of not-so-edible things that apparently lets you feel like you're in two places at once"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "thejuice"
+
+/datum/glass_style/drinking_glass/admiralty
+	required_drink_type = /datum/reagent/consumable/ethanol/admiralty
+	name = "Admiralty"
+	desc = "Hail to the Admiral, for he brings fair tidings, and rum too."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "admiralty"
+
+/datum/glass_style/drinking_glass/long_haul
+	required_drink_type = /datum/reagent/consumable/ethanol/long_haul
+	name = "Long Haul"
+	desc = "A perfect companion for a lonely long haul flight."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "long_haul"
+
+/datum/glass_style/drinking_glass/long_john_silver
+	required_drink_type = /datum/reagent/consumable/ethanol/long_john_silver
+	name = "Long John Silver"
+	desc = "Named for a famous pirate, who may or may not have been fictional. But hey, why let the truth get in the way of a good yarn?" //Chopper Reid says "How the fuck are ya?"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "long_john_silver"
+
+/datum/glass_style/drinking_glass/tropical_storm
+	required_drink_type = /datum/reagent/consumable/ethanol/tropical_storm
+	name = "Tropical Storm"
+	desc = "Less destructive than the real thing."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "tropical_storm"
+
+/datum/glass_style/drinking_glass/dark_and_stormy
+	required_drink_type = /datum/reagent/consumable/ethanol/dark_and_stormy
+	name = "Dark and Stormy"
+	desc = "Thunder and lightning, very very frightening."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "dark_and_stormy"
+
+/datum/glass_style/drinking_glass/salt_and_swell
+	required_drink_type = /datum/reagent/consumable/ethanol/salt_and_swell
+	name = "Salt and Swell"
+	desc = "Ah, I do like to be beside the seaside."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "salt_and_swell"
+
+/datum/glass_style/drinking_glass/tiltaellen
+	required_drink_type = /datum/reagent/consumable/ethanol/tiltaellen
+	name = "glass of tiltällen"
+	desc = "Eww... it's curdled."
+	icon_state = "tiltaellen"
+
+/datum/glass_style/drinking_glass/tich_toch
+	required_drink_type = /datum/reagent/consumable/ethanol/tich_toch
+	name = "Tich Toch"
+	desc = "Oh god."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "tich_toch"
+
+/datum/glass_style/drinking_glass/helianthus
+	required_drink_type = /datum/reagent/consumable/ethanol/helianthus
+	name = "Helianthus"
+	desc = "Another reason to cut off an ear..."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "helianthus"
+
+/datum/glass_style/drinking_glass/plumwine
+	required_drink_type = /datum/reagent/consumable/ethanol/plumwine
+	name = "plum wine"
+	desc = "Looks like an evening of writing fine poetry."
+	icon_state = "plumwineglass"
+
+/datum/glass_style/drinking_glass/the_hat
+	required_drink_type = /datum/reagent/consumable/ethanol/the_hat
+	name = "The Hat"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "thehatglass"
+
+/datum/glass_style/drinking_glass/gin_garden
+	required_drink_type = /datum/reagent/consumable/ethanol/gin_garden
+	name = "gin garden"
+	desc = "Hey, someone forgot the herb and... the cucumber in my cocktail!"
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "gin_garden"
+
+/datum/glass_style/drinking_glass/wine_voltaic
+	required_drink_type = /datum/reagent/consumable/ethanol/wine_voltaic
+	name = "Voltaic Yellow Wine"
+	desc = "Electrically charged wine. Recharges ethereals, but also nontoxic."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "wine_voltaic"
+
+/datum/glass_style/drinking_glass/telepole
+	required_drink_type = /datum/reagent/consumable/ethanol/telepole
+	name = "Telepole"
+	desc = "A liquid grounding rod. Recharges ethereals and grants temporary shock resistance."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "telepole"
+
+/datum/glass_style/drinking_glass/pod_tesla
+	required_drink_type = /datum/reagent/consumable/ethanol/pod_tesla
+	name = "Pod Tesla"
+	desc = "Ride the lightning! Recharges ethereals, suppresses phobias, and grants strong temporary shock resistance."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "pod_tesla"
+
+
+// Shot glasses
+
+/datum/glass_style/shot_glass/toxins_special
+	required_drink_type = /datum/reagent/consumable/ethanol/toxins_special
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "toxinsspecialglass"
+
+/datum/glass_style/shot_glass/b52
+	required_drink_type = /datum/reagent/consumable/ethanol/b52
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "b52glass"
+
+/datum/glass_style/shot_glass/hcider
+	required_drink_type = /datum/reagent/consumable/ethanol/hcider
+	icon_state = "shotglassbrown"
+
+/datum/glass_style/shot_glass/bastion_bourbon
+	required_drink_type = /datum/reagent/consumable/ethanol/bastion_bourbon
+	icon_state = "shotglassgreen"
+
+/datum/glass_style/shot_glass/squirt_cider
+	required_drink_type = /datum/reagent/consumable/ethanol/squirt_cider
+	icon_state = "shotglassgreen"
+
+/datum/glass_style/shot_glass/jack_rose
+	required_drink_type = /datum/reagent/consumable/ethanol/jack_rose
+	icon_state = "shotglassred"

code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_drinks.dm

@@ -0,0 +1,77 @@
+// Mixed drinks
+
+/datum/glass_style/drinking_glass/lemonade
+	required_drink_type = /datum/reagent/consumable/lemonade
+	name = "pitcher of lemonade"
+	desc = "This drink leaves you feeling nostalgic for some reason."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "lemonpitcher"
+
+/datum/glass_style/drinking_glass/arnold_palmer
+	required_drink_type = /datum/reagent/consumable/tea/arnold_palmer
+	name = "Arnold Palmer"
+	desc = "You feel like taking a few golf swings after a few swigs of this."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "arnold_palmer"
+
+/datum/glass_style/drinking_glass/roy_rogers
+	required_drink_type = /datum/reagent/consumable/roy_rogers
+	name = "Roy Rogers"
+	desc = "90% sugar in a glass."
+	icon_state = "royrogers"
+
+/datum/glass_style/drinking_glass/doctor_delight
+	required_drink_type = /datum/reagent/consumable/doctor_delight
+	name = "Doctor's Delight"
+	desc = "The space doctor's favorite. Guaranteed to restore bodily injury; side effects include cravings and hunger."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "doctorsdelightglass"
+
+/datum/glass_style/drinking_glass/cinderella
+	required_drink_type = /datum/reagent/consumable/cinderella
+	name = "Cinderella"
+	desc = "There is not a single drop of alcohol in this thing."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "cinderella"
+
+/datum/glass_style/drinking_glass/triple_citrus
+	required_drink_type = /datum/reagent/consumable/triple_citrus
+	name = "glass of triple citrus"
+	desc = "A mixture of citrus juices. Tangy, yet smooth."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "triplecitrus"
+
+/datum/glass_style/drinking_glass/shirley_temple
+	required_drink_type = /datum/reagent/consumable/shirley_temple
+	name = "Shirley Temple"
+	desc = "Ginger ale with processed grenadine. "
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "shirleytemple"
+
+/datum/glass_style/drinking_glass/red_queen
+	required_drink_type = /datum/reagent/consumable/red_queen
+	name = "Red Queen"
+	desc = "DRINK ME."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "red_queen"
+
+/datum/glass_style/drinking_glass/agua_fresca
+	required_drink_type = /datum/reagent/consumable/agua_fresca
+	name = "Agua Fresca"
+	desc = "90% water, but still refreshing."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "aguafresca"
+
+/datum/glass_style/drinking_glass/cucumberlemonade
+	required_drink_type = /datum/reagent/consumable/cucumberlemonade
+	name = "cucumber lemonade"
+	desc = "The smell of cucumber from lemonade, I'm sure I won't get poisoned."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "cucumber_lemonade"
+
+/datum/glass_style/drinking_glass/mississippi_queen
+	required_drink_type = /datum/reagent/consumable/mississippi_queen
+	name = "Mississippi Queen"
+	desc = "Mullets and cut-up jorts not included."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "mississippiglass"

code/modules/reagents/chemistry/reagents/drinks/glass_styles/smoothies_shakes.dm

@@ -0,0 +1,100 @@
+
+// Shakes and smoothies
+
+/datum/glass_style/drinking_glass/cherryshake
+	required_drink_type = /datum/reagent/consumable/cherryshake
+	name = "cherry shake"
+	desc = "A cherry flavored milkshake."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "cherryshake"
+
+/datum/glass_style/drinking_glass/bluecherryshake
+	required_drink_type = /datum/reagent/consumable/bluecherryshake
+	name = "blue cherry shake"
+	desc = "An exotic blue milkshake."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "bluecherryshake"
+
+/datum/glass_style/drinking_glass/vanillashake
+	required_drink_type = /datum/reagent/consumable/vanillashake
+	name = "vanilla shake"
+	desc = "A vanilla flavored milkshake."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "vanillashake"
+
+/datum/glass_style/drinking_glass/caramelshake
+	required_drink_type = /datum/reagent/consumable/caramelshake
+	name = "caramel shake"
+	desc = "A caramel flavored milkshake."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "caramelshake"
+
+/datum/glass_style/drinking_glass/choccyshake
+	required_drink_type = /datum/reagent/consumable/choccyshake
+	name = "chocolate shake"
+	desc = "A chocolate flavored milkshake."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "choccyshake"
+
+/datum/glass_style/drinking_glass/strawberryshake
+	required_drink_type = /datum/reagent/consumable/strawberryshake
+	name = "strawberry shake"
+	desc = "A strawberry flavored milkshake."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "strawberryshake"
+
+/datum/glass_style/drinking_glass/bananashake
+	required_drink_type = /datum/reagent/consumable/bananashake
+	name = "banana shake"
+	desc = "A banana flavored milkshake."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "bananashake"
+
+/datum/glass_style/drinking_glass/gibbfloats
+	required_drink_type = /datum/reagent/consumable/gibbfloats
+	name = "Gibbfloat"
+	desc = "Dr. Gibb with ice cream on top."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "gibbfloats"
+
+/datum/glass_style/drinking_glass/strawberry_banana
+	required_drink_type = /datum/reagent/consumable/strawberry_banana
+	name = "strawberry banana smoothie"
+	desc = "A classic drink which countless souls have bonded over..."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "strawberry_banana"
+
+/datum/glass_style/drinking_glass/berry_blast
+	required_drink_type = /datum/reagent/consumable/berry_blast
+	name = "berry blast smoothie"
+	desc = "A classic drink, freshly made with hand picked berries. Or, maybe not."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "berry_blast"
+
+/datum/glass_style/drinking_glass/funky_monkey
+	required_drink_type = /datum/reagent/consumable/funky_monkey
+	name = "funky monkey smoothie"
+	desc = "A classic drink made with chocolate and banana. No monkeys were harmed, officially."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "funky_monkey"
+
+/datum/glass_style/drinking_glass/green_giant
+	required_drink_type = /datum/reagent/consumable/green_giant
+	name = "green giant smoothie"
+	desc = "A classic drink, if you enjoy juiced wheatgrass and chia seeds."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "green_giant"
+
+/datum/glass_style/drinking_glass/melon_baller
+	required_drink_type = /datum/reagent/consumable/melon_baller
+	name = "melon baller smoothie"
+	desc = "A wonderfully fresh melon smoothie. Guaranteed to brighten your day."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "melon_baller"
+
+/datum/glass_style/drinking_glass/vanilla_dream
+	required_drink_type = /datum/reagent/consumable/vanilla_dream
+	name = "vanilla dream smoothie"
+	desc = "A classic drink made with vanilla and fresh cream."
+	icon = 'icons/obj/drinks/shakes.dmi'
+	icon_state = "vanilla_dream"

code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm

@@ -0,0 +1,97 @@
+// Soft Drinks/Sodas
+
+/datum/glass_style/drinking_glass/space_cola
+	required_drink_type = /datum/reagent/consumable/space_cola
+	name = "glass of Space Cola"
+	desc = "A glass of refreshing Space Cola."
+	icon_state = "spacecola"
+
+/datum/glass_style/drinking_glass/nuka_cola
+	required_drink_type = /datum/reagent/consumable/nuka_cola
+	name = "glass of Nuka Cola"
+	desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
+	icon = 'icons/obj/drinks/soda.dmi'
+	icon_state = "nuka_colaglass"
+
+/datum/glass_style/drinking_glass/rootbeer
+	required_drink_type = /datum/reagent/consumable/rootbeer
+	name = "glass of root beer"
+	desc = "A glass of highly potent, incredibly sugary root beer."
+	icon_state = "spacecola"
+
+/datum/glass_style/drinking_glass/grey_bull
+	required_drink_type = /datum/reagent/consumable/grey_bull
+	name = "glass of Grey Bull"
+	desc = "Surprisingly it isn't grey."
+	icon_state = "grey_bull_glass"
+
+/datum/glass_style/drinking_glass/spacemountainwind
+	required_drink_type = /datum/reagent/consumable/spacemountainwind
+	name = "glass of Space Mountain Wind"
+	desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
+	icon_state = "Space_mountain_wind_glass"
+
+/datum/glass_style/drinking_glass/dr_gibb
+	required_drink_type = /datum/reagent/consumable/dr_gibb
+	name = "glass of Dr. Gibb"
+	desc = "Dr. Gibb. Not as dangerous as the container_name might imply."
+	icon_state = "dr_gibb_glass"
+
+/datum/glass_style/drinking_glass/space_up
+	required_drink_type = /datum/reagent/consumable/space_up
+	name = "glass of Space-Up"
+	desc = "Space-up. It helps you keep your cool."
+	icon_state = "space-up_glass"
+
+/datum/glass_style/drinking_glass/lemon_lime
+	required_drink_type = /datum/reagent/consumable/lemon_lime
+	name = "glass of lemon-lime"
+	desc = "You're pretty certain a real fruit has never actually touched this."
+	icon_state = "lemonlime"
+
+/datum/glass_style/drinking_glass/pwr_game
+	required_drink_type = /datum/reagent/consumable/pwr_game
+	name = "glass of Pwr Game"
+	desc = "Goes well with a Vlad's salad."
+	icon_state = "pwrgame"
+
+/datum/glass_style/drinking_glass/shamblers
+	required_drink_type = /datum/reagent/consumable/shamblers
+	name = "glass of Shambler's juice"
+	desc = "Mmm mm, shambly."
+	icon_state = "shamblerjuice"
+
+/datum/glass_style/drinking_glass/sodawater
+	required_drink_type = /datum/reagent/consumable/sodawater
+	name = "glass of soda water"
+	desc = "Soda water. Why not make a scotch and soda?"
+	icon_state = "glass_clearcarb"
+
+/datum/glass_style/drinking_glass/tonic
+	required_drink_type = /datum/reagent/consumable/tonic
+	name = "glass of tonic water"
+	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+	icon_state = "glass_clearcarb"
+
+/datum/glass_style/drinking_glass/monkey_energy
+	required_drink_type = /datum/reagent/consumable/monkey_energy
+	name = "glass of Monkey Energy"
+	desc = "You can unleash the ape, but without the pop of the can?"
+	icon_state = "monkey_energy_glass"
+
+/datum/glass_style/drinking_glass/grape_soda
+	required_drink_type = /datum/reagent/consumable/grape_soda
+	name = "glass of grape juice"
+
+/datum/glass_style/drinking_glass/cream_soda
+	required_drink_type = /datum/reagent/consumable/cream_soda
+	name = "Cream Soda"
+	desc = "A classic space-American vanilla flavored soft drink."
+	icon = 'icons/obj/drinks/mixed_drinks.dmi'
+	icon_state = "cream_soda"
+
+/datum/glass_style/drinking_glass/sol_dry
+	required_drink_type = /datum/reagent/consumable/sol_dry
+	name = "Sol Dry"
+	desc = "A soothing, mellow drink made from ginger."
+	icon_state = "soldry"