diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
similarity index 69%
rename from code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
rename to code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index a9df88fb802..24865194867 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -103,16 +103,9 @@
 	taste_description = "mild carbonated malt"
 	ph = 4
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-
 	glass_price = DRINK_PRICE_STOCK
 
-/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"
-
-	// Beer is a chemical composition of alcohol and various other things. It's a garbage nutrient but hey, it's still one. Also alcohol is bad, mmmkay?
+// Beer is a chemical composition of alcohol and various other things. It's a garbage nutrient but hey, it's still one. Also alcohol is bad, mmmkay?
 /datum/reagent/consumable/ethanol/beer/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user)
 	mytray.adjust_plant_health(-round(volume * 0.05))
 	mytray.adjust_waterlevel(round(volume * 0.7))
@@ -125,11 +118,6 @@
 	ph = 5
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/beer/maltliquor
 	name = "Malt Liquor"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety is stronger than usual, super cheap, and super terrible."
@@ -138,11 +126,6 @@
 	ph = 4.8
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/beer/green
 	name = "Green Beer"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety is dyed a festive green."
@@ -151,12 +134,6 @@
 	ph = 6
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/beer/green/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.color != color)
 		drinker.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY)
@@ -173,16 +150,6 @@
 	ph = 6
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/shot_glass/kahlua
-	required_drink_type = /datum/reagent/consumable/ethanol/kahlua
-	icon_state ="shotglasscream"
-
-/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/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick)
 	drinker.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
@@ -202,16 +169,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/datum/glass_style/shot_glass/whiskey
-	required_drink_type = /datum/reagent/consumable/ethanol/whiskey
-	icon_state = "shotglassbrown"
-
-/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/reagent/consumable/ethanol/whiskey/kong
 	name = "Kong"
 	description = "Makes You Go Ape!®"
@@ -219,14 +176,6 @@
 	taste_description = "the grip of a giant ape"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/shot_glass/whiskey/kong
-	required_drink_type = /datum/reagent/consumable/ethanol/whiskey/kong
-
-/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/reagent/consumable/ethanol/whiskey/candycorn
 	name = "Candy Corn Liquor"
 	description = "Like they drank in 2D speakeasies."
@@ -234,14 +183,6 @@
 	taste_description = "pancake syrup"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/shot_glass/whiskey/candycorn
-	required_drink_type = /datum/reagent/consumable/ethanol/whiskey/candycorn
-
-/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/reagent/consumable/ethanol/whiskey/candycorn/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(SPT_PROB(5, seconds_per_tick))
 		drinker.adjust_hallucinations(4 SECONDS * REM * seconds_per_tick)
@@ -258,12 +199,6 @@
 	taste_description = "jitters and death"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick)
 	drinker.AdjustSleeping(-40 * REM * seconds_per_tick)
@@ -324,16 +259,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED|REAGENT_CLEANS //Very high proof
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/vodka
 
-/datum/glass_style/shot_glass/vodka
-	required_drink_type = /datum/reagent/consumable/ethanol/vodka
-	icon_state = "shotglassclear"
-
-/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/reagent/consumable/ethanol/bilk
 	name = "Bilk"
 	description = "This appears to be beer mixed with milk. Disgusting."
@@ -343,12 +268,6 @@
 	taste_description = "desperation and lactate"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.getBruteLoss() && SPT_PROB(5, seconds_per_tick))
 		drinker.heal_bodypart_damage(brute = 1)
@@ -365,13 +284,6 @@
 	ph = 3.5
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick)
 	return ..()
@@ -386,12 +298,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/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/reagent/consumable/ethanol/rum
 	name = "Rum"
 	description = "Yohoho and all that."
@@ -401,16 +307,6 @@
 	ph = 6.5
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/rum
 
-/datum/glass_style/shot_glass/rum
-	required_drink_type = /datum/reagent/consumable/ethanol/rum
-	icon_state = "shotglassbrown"
-
-/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/reagent/consumable/ethanol/tequila
 	name = "Tequila"
 	description = "A strong and mildly flavoured, Mexican produced spirit. Feeling thirsty, hombre?"
@@ -421,16 +317,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/datum/glass_style/shot_glass/tequila
-	required_drink_type = /datum/reagent/consumable/ethanol/tequila
-	icon_state = "shotglassgold"
-
-/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/reagent/consumable/ethanol/vermouth
 	name = "Vermouth"
 	description = "You suddenly feel a craving for a martini..."
@@ -440,16 +326,6 @@
 	ph = 3.25
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/shot_glass/vermouth
-	required_drink_type = /datum/reagent/consumable/ethanol/vermouth
-	icon_state = "shotglassclear"
-
-/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/reagent/consumable/ethanol/wine
 	name = "Wine"
 	description = "A premium alcoholic beverage made from distilled grape juice."
@@ -461,16 +337,6 @@
 	glass_price = DRINK_PRICE_STOCK
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/wine
 
-/datum/glass_style/shot_glass/wine
-	required_drink_type = /datum/reagent/consumable/ethanol/wine
-	icon_state = "shotglassred"
-
-/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/reagent/consumable/ethanol/wine/on_merge(data)
 	. = ..()
 	if(src.data && data && data["vintage"] != src.data["vintage"])
@@ -505,12 +371,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/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/reagent/consumable/ethanol/amaretto
 	name = "Amaretto"
 	description = "A gentle drink that carries a sweet aroma."
@@ -520,16 +380,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/datum/glass_style/shot_glass/amaretto
-	required_drink_type = /datum/reagent/consumable/ethanol/amaretto
-	icon_state = "shotglassgold"
-
-/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/reagent/consumable/ethanol/cognac
 	name = "Cognac"
 	description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
@@ -540,16 +390,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/datum/glass_style/shot_glass/cognac
-	required_drink_type = /datum/reagent/consumable/ethanol/cognac
-	icon_state = "shotglassbrown"
-
-/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/reagent/consumable/ethanol/absinthe
 	name = "Absinthe"
 	description = "A powerful alcoholic drink. Rumored to cause hallucinations but does not."
@@ -558,16 +398,6 @@
 	taste_description = "death and licorice"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/shot_glass/absinthe
-	required_drink_type = /datum/reagent/consumable/ethanol/absinthe
-	icon_state = "shotglassgreen"
-
-/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/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(SPT_PROB(5, seconds_per_tick) && !HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE))
 		drinker.adjust_hallucinations(8 SECONDS)
@@ -582,12 +412,6 @@
 	addiction_types = list(/datum/addiction/alcohol = 5, /datum/addiction/maintenance_drugs = 2)
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/ale
 	name = "Ale"
 	description = "A dark alcoholic beverage made with malted barley and yeast."
@@ -598,12 +422,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/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/reagent/consumable/ethanol/goldschlager
 	name = "Goldschlager"
 	description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
@@ -616,17 +434,6 @@
 	// This drink is really popular with a certain demographic.
 	var/teenage_girl_quality = DRINK_VERYGOOD
 
-/datum/glass_style/shot_glass/goldschlager
-	required_drink_type = /datum/reagent/consumable/ethanol/goldschlager
-	icon_state = "shotglassgold"
-
-/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/reagent/consumable/ethanol/goldschlager/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)
 	// Reset quality each time, since the bottle can be shared
 	quality = initial(quality)
@@ -659,17 +466,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_HIGH
 
-/datum/glass_style/shot_glass/patron
-	required_drink_type = /datum/reagent/consumable/ethanol/patron
-	icon_state = "shotglassclear"
-
-/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/reagent/consumable/ethanol/gintonic
 	name = "Gin and Tonic"
 	description = "An all time classic, mild cocktail."
@@ -681,13 +477,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/ethanol/rum_coke
 	name = "Rum and Coke"
 	description = "Rum, mixed with cola."
@@ -698,12 +487,6 @@
 	ph = 4
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/cuba_libre
 	name = "Cuba Libre"
 	description = "Viva la Revolucion! Viva Cuba Libre!"
@@ -713,13 +496,6 @@
 	taste_description = "a refreshing marriage of citrus and rum"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/cuba_libre/on_mob_life(mob/living/carbon/cubano, seconds_per_tick, times_fired)
 	if(cubano.mind && cubano.mind.has_antag_datum(/datum/antagonist/rev)) //Cuba Libre, the traditional drink of revolutions! Heals revolutionaries.
 		cubano.adjustBruteLoss(-1 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
@@ -738,12 +514,6 @@
 	taste_description = "cola"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/martini
 	name = "Classic Martini"
 	description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
@@ -754,12 +524,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/ethanol/vodkamartini
 	name = "Vodka Martini"
 	description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
@@ -769,11 +533,6 @@
 	taste_description = "shaken, not stirred"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/white_russian
 	name = "White Russian"
@@ -784,13 +543,6 @@
 	taste_description = "bitter cream"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/screwdrivercocktail
 	name = "Screwdriver"
 	description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
@@ -800,13 +552,6 @@
 	taste_description = "oranges"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/screwdrivercocktail/on_transfer(atom/atom, methods = TOUCH, trans_volume)
 	if(!(methods & INGEST))
 		return ..()
@@ -861,13 +606,6 @@
 	taste_description = "sweet 'n creamy"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bloody_mary
 	name = "Bloody Mary"
 	description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
@@ -877,13 +615,6 @@
 	taste_description = "tomatoes with a hint of lime and liquid murder"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.blood_volume < BLOOD_VOLUME_NORMAL)
 		drinker.blood_volume = min(drinker.blood_volume + (3 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL) //Bloody Mary quickly restores blood loss.
@@ -900,13 +631,6 @@
 	glass_price = DRINK_PRICE_EASY
 	var/tough_text
 
-/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/reagent/consumable/ethanol/brave_bull/on_mob_metabolize(mob/living/drinker)
 	tough_text = pick("brawny", "tenacious", "tough", "hardy", "sturdy") //Tuff stuff
 	to_chat(drinker, span_notice("You feel [tough_text]!"))
@@ -931,13 +655,6 @@
 	glass_price = DRINK_PRICE_MEDIUM
 	var/obj/effect/light_holder
 
-/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/reagent/consumable/ethanol/tequila_sunrise/on_mob_metabolize(mob/living/drinker)
 	to_chat(drinker, span_notice("You feel gentle warmth spread through your body!"))
 	light_holder = new(drinker)
@@ -963,18 +680,6 @@
 	taste_description = "spicy toxins"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/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/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_bodytemperature(15 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
 	return ..()
@@ -992,13 +697,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	var/datum/brain_trauma/special/beepsky/beepsky_hallucination
 
-/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/reagent/consumable/ethanol/beepsky_smash/on_mob_metabolize(mob/living/carbon/drinker)
 	if(HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE))
 		metabolization_rate = 0.8
@@ -1043,12 +741,6 @@
 	taste_description = "creamy alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/manly_dorf
 	name = "The Manly Dorf"
 	description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
@@ -1059,13 +751,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	var/dorf_mode = FALSE
 
-/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/reagent/consumable/ethanol/manly_dorf/on_mob_metabolize(mob/living/drinker)
 	if(ishuman(drinker))
 		var/mob/living/carbon/human/potential_dwarf = drinker
@@ -1089,13 +774,6 @@
 	taste_description = "a mixture of cola and alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/moonshine
 	name = "Moonshine"
 	description = "You've really hit rock bottom now... your liver packed its bags and left last night."
@@ -1104,12 +782,6 @@
 	taste_description = "bitterness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/b52
 	name = "B-52"
 	description = "Coffee, Irish Cream, and cognac. You will get bombed."
@@ -1120,18 +792,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/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/reagent/consumable/ethanol/b52/on_mob_metabolize(mob/living/drinker)
 	playsound(drinker, 'sound/effects/explosion_distant.ogg', 100, FALSE)
 
@@ -1144,13 +804,6 @@
 	taste_description = "giving up on the day"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/margarita
 	name = "Margarita"
 	description = "On the rocks with salt on the rim. Arriba~!"
@@ -1161,13 +814,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/ethanol/black_russian
 	name = "Black Russian"
 	description = "For the lactose-intolerant. Still as classy as a White Russian."
@@ -1177,13 +823,6 @@
 	taste_description = "bitterness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/manhattan
 	name = "Manhattan"
 	description = "The Detective's undercover drink of choice. He never could stomach gin..."
@@ -1194,13 +833,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/ethanol/manhattan_proj
 	name = "Manhattan Project"
 	description = "A scientist's drink of choice, for pondering ways to blow up the station."
@@ -1210,13 +842,6 @@
 	taste_description = "death, the destroyer of worlds"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.set_drugginess(1 MINUTES * REM * seconds_per_tick)
 	return ..()
@@ -1230,12 +855,6 @@
 	taste_description = "soda"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/drinking_glass/whiskeysoda
-	required_drink_type = /datum/reagent/consumable/ethanol/whiskeysoda
-	name = "whiskey soda"
-	desc = "Ultimate refreshment."
-	icon_state = "whiskeysodaglass2"
-
 /datum/reagent/consumable/ethanol/antifreeze
 	name = "Anti-freeze"
 	description = "The ultimate refreshment. Not what it sounds like."
@@ -1245,13 +864,6 @@
 	taste_description = "Jack Frost's piss"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_bodytemperature(20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
 	return ..()
@@ -1265,13 +877,6 @@
 	taste_description = "creamy berries"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(ishuman(drinker)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes.
 		var/mob/living/carbon/human/unshoed = drinker
@@ -1289,13 +894,6 @@
 	taste_description = "refreshing cold"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/demonsblood
 	name = "Demon's Blood"
 	description = "AHHHH!!!!"
@@ -1305,13 +903,6 @@
 	taste_description = "sweet tasting iron"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/demonsblood/on_mob_metabolize(mob/living/metabolizer)
 	. = ..()
 	RegisterSignal(metabolizer, COMSIG_LIVING_BLOOD_CRAWL_PRE_CONSUMED, PROC_REF(pre_bloodcrawl_consumed))
@@ -1348,13 +939,6 @@
 	taste_description = "bitter iron"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/devilskiss/on_mob_metabolize(mob/living/metabolizer)
 	. = ..()
 	RegisterSignal(metabolizer, COMSIG_LIVING_BLOOD_CRAWL_CONSUMED, PROC_REF(on_bloodcrawl_consumed))
@@ -1399,13 +983,6 @@
 	taste_description = "tart bitterness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/ginfizz
 	name = "Gin Fizz"
 	description = "Refreshingly lemony, deliciously dry."
@@ -1415,13 +992,6 @@
 	taste_description = "dry, tart lemons"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bahama_mama
 	name = "Bahama Mama"
 	description = "A tropical cocktail with a complex blend of flavors."
@@ -1431,13 +1001,6 @@
 	taste_description = "pineapple, coconut, and a hint of coffee"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/singulo
 	name = "Singulo"
 	description = "A blue-space beverage!"
@@ -1473,13 +1036,6 @@
 		drinker.emote("burp")
 	return ..()
 
-/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/reagent/consumable/ethanol/sbiten
 	name = "Sbiten"
 	description = "A spicy Vodka! Might be a little hot for the little guys!"
@@ -1493,13 +1049,6 @@
 	drinker.adjust_bodytemperature(50 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, BODYTEMP_HEAT_DAMAGE_LIMIT) //310.15 is the normal bodytemp.
 	return ..()
 
-/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/reagent/consumable/ethanol/red_mead
 	name = "Red Mead"
 	description = "The true Viking drink! Even though it has a strange red color."
@@ -1509,13 +1058,6 @@
 	taste_description = "sweet and salty alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/mead
 	name = "Mead"
 	description = "A Viking drink, though a cheap one."
@@ -1526,13 +1068,6 @@
 	taste_description = "sweet, sweet alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/iced_beer
 	name = "Iced Beer"
 	description = "A beer which is so cold the air around it freezes."
@@ -1541,12 +1076,6 @@
 	taste_description = "refreshingly cold"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, T0C) //310.15 is the normal bodytemp.
 	return ..()
@@ -1559,13 +1088,6 @@
 	taste_description = "a poor excuse for alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/aloe
 	name = "Aloe"
 	description = "So very, very, very good."
@@ -1577,12 +1099,6 @@
 	//somewhat annoying mix
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/ethanol/andalusia
 	name = "Andalusia"
 	description = "A nice, strangely named drink."
@@ -1592,12 +1108,6 @@
 	taste_description = "lemons"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/alliescocktail
 	name = "Allies Cocktail"
 	description = "A drink made from your allies. Not as sweet as those made from your enemies."
@@ -1608,13 +1118,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/ethanol/acid_spit
 	name = "Acid Spit"
 	description = "A drink for the daring, can be deadly if incorrectly prepared!"
@@ -1624,12 +1127,6 @@
 	taste_description = "stomach acid"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/amasec
 	name = "Amasec"
 	description = "Official drink of the Nanotrasen Gun-Club!"
@@ -1639,13 +1136,6 @@
 	taste_description = "dark and metallic"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/changelingsting
 	name = "Changeling Sting"
 	description = "You take a tiny sip and feel a burning sensation..."
@@ -1655,13 +1145,6 @@
 	taste_description = "your brain coming out your nose"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/changelingsting/on_mob_life(mob/living/carbon/target, seconds_per_tick, times_fired)
 	var/datum/antagonist/changeling/changeling = target.mind?.has_antag_datum(/datum/antagonist/changeling)
 	changeling?.adjust_chemicals(metabolization_rate * REM * seconds_per_tick)
@@ -1676,12 +1159,6 @@
 	taste_description = "the spirit of Ireland"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/syndicatebomb
 	name = "Syndicate Bomb"
 	description = "Tastes like terrorism!"
@@ -1691,13 +1168,6 @@
 	taste_description = "purified antagonism"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(SPT_PROB(2.5, seconds_per_tick))
 		playsound(get_turf(drinker), 'sound/effects/explosionfar.ogg', 100, TRUE)
@@ -1712,13 +1182,6 @@
 	taste_description = "psychic links"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/erikasurprise
 	name = "Erika Surprise"
 	description = "The surprise is, it's green!"
@@ -1728,13 +1191,6 @@
 	taste_description = "tartness and bananas"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/driestmartini
 	name = "Driest Martini"
 	description = "Only for the experienced. You think you see sand floating in the glass."
@@ -1745,13 +1201,6 @@
 	taste_description = "a beach"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bananahonk
 	name = "Banana Honk"
 	description = "A drink from Clown Heaven."
@@ -1762,13 +1211,6 @@
 	taste_description = "a bad joke"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER)
 	if((liver && HAS_TRAIT(liver, TRAIT_COMEDY_METABOLISM)) || ismonkey(drinker))
@@ -1786,13 +1228,6 @@
 	taste_description = "a pencil eraser"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(ishuman(drinker) && HAS_TRAIT(drinker, TRAIT_MIMING))
 		drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION)
@@ -1809,13 +1244,6 @@
 	taste_description = "molasses and a mouthful of pool water"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour.
 	name = "Whiskey Sour"
 	description = "Lemon juice/whiskey/sugar mixture. Moderate alcohol content."
@@ -1824,12 +1252,6 @@
 	quality = DRINK_GOOD
 	taste_description = "sour lemons"
 
-/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/reagent/consumable/ethanol/hcider
 	name = "Hard Cider"
 	description = "Apple juice, for adults."
@@ -1840,16 +1262,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/datum/glass_style/shot_glass/hcider
-	required_drink_type = /datum/reagent/consumable/ethanol/hcider
-	icon_state = "shotglassbrown"
-
-/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/reagent/consumable/ethanol/fetching_fizz //A reference to one of my favorite games of all time. Pulls nearby ores to the imbiber!
 	name = "Fetching Fizz"
 	description = "Whiskey sour/iron/uranium mixture resulting in a highly magnetic slurry. Mild alcohol content." //Requires no alcohol to make but has alcohol anyway because ~magic~
@@ -1860,13 +1272,6 @@
 	taste_description = "charged metal" // the same as teslium, honk honk.
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/fetching_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	for(var/obj/item/stack/ore/O in orange(3, drinker))
 		step_towards(O, get_turf(drinker))
@@ -1883,13 +1288,6 @@
 	taste_description = "bravado in the face of disaster"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/hearty_punch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.health <= 0)
 		drinker.adjustBruteLoss(-3 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
@@ -1908,12 +1306,6 @@
 	taste_description = "a wall of bricks"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/atomicbomb
 	name = "Atomic Bomb"
 	description = "Nuclear proliferation never tasted so good."
@@ -1924,13 +1316,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_HIGH
 
-/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/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.set_drugginess(100 SECONDS * REM * seconds_per_tick)
 	if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE))
@@ -1956,13 +1341,6 @@
 	taste_description = "your brains smashed out by a lemon wrapped around a gold brick"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/gargle_blaster/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_dizzy(3 SECONDS * REM * seconds_per_tick)
 	switch(current_cycle)
@@ -1989,13 +1367,6 @@
 	metabolization_rate = 1 * REAGENTS_METABOLISM
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/neurotoxin/proc/pick_paralyzed_limb()
 	return (pick(TRAIT_PARALYSIS_L_ARM,TRAIT_PARALYSIS_R_ARM,TRAIT_PARALYSIS_R_LEG,TRAIT_PARALYSIS_L_LEG))
 
@@ -2041,13 +1412,6 @@
 	taste_description = "giving peace a chance"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.set_slurring_if_lower(1 SECONDS * REM * seconds_per_tick)
 
@@ -2090,20 +1454,6 @@
 	taste_description = "custard and alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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 = "Tasty grape juice in a fun little container. Non-alcoholic!"
-	icon_state = "grapebox"
-	drink_type = FRUIT
-
 /datum/reagent/consumable/ethanol/narsour
 	name = "Nar'Sour"
 	description = "Side effects include self-mutilation and hoarding plasteel."
@@ -2113,13 +1463,6 @@
 	taste_description = "bloody"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/narsour/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_timed_status_effect(6 SECONDS * REM * seconds_per_tick, /datum/status_effect/speech/slurring/cult, max_duration = 6 SECONDS)
 	drinker.adjust_stutter_up_to(6 SECONDS * REM * seconds_per_tick, 6 SECONDS)
@@ -2133,12 +1476,6 @@
 	taste_description = "a warm flowery orange taste which recalls the ocean air and summer wind of the caribbean"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/creme_de_menthe
 	name = "Creme de Menthe"
 	description = "A minty liqueur excellent for refreshing, cool drinks."
@@ -2147,12 +1484,6 @@
 	taste_description = "a minty, cool, and invigorating splash of cold streamwater"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/creme_de_cacao
 	name = "Creme de Cacao"
 	description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities."
@@ -2161,12 +1492,6 @@
 	taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/creme_de_coconut
 	name = "Creme de Coconut"
 	description = "A coconut liqueur for smooth, creamy, tropical drinks."
@@ -2175,12 +1500,6 @@
 	taste_description = "a sweet milky flavor with notes of toasted sugar"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/quadruple_sec
 	name = "Quadruple Sec"
 	description = "Kicks just as hard as licking the power cell on a baton, but tastier."
@@ -2190,13 +1509,6 @@
 	taste_description = "an invigorating bitter freshness which suffuses your being; no enemy of the station will go unrobusted this day"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	//Securidrink in line with the Screwdriver for engineers or Nothing for mimes
 	var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER)
@@ -2214,13 +1526,6 @@
 	taste_description = "THE LAW"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	//Securidrink in line with the Screwdriver for engineers or Nothing for mimes but STRONG..
 	var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER)
@@ -2239,13 +1544,6 @@
 	taste_description = "chocolate and mint dancing around your mouth"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/stinger
 	name = "Stinger"
 	description = "A snappy way to end the day."
@@ -2255,13 +1553,6 @@
 	taste_description = "a slap on the face in the best possible way"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bastion_bourbon
 	name = "Bastion Bourbon"
 	description = "Soothing hot herbal brew with restorative properties. Hints of citrus and berry flavors."
@@ -2274,17 +1565,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_HIGH
 
-/datum/glass_style/shot_glass/bastion_bourbon
-	required_drink_type = /datum/reagent/consumable/ethanol/bastion_bourbon
-	icon_state = "shotglassgreen"
-
-/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/reagent/consumable/ethanol/bastion_bourbon/on_mob_metabolize(mob/living/drinker)
 	var/heal_points = 10
 	if(drinker.health <= 0)
@@ -2318,17 +1598,6 @@
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/shot_glass/squirt_cider
-	required_drink_type = /datum/reagent/consumable/ethanol/squirt_cider
-	icon_state = "shotglassgreen"
-
-/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/reagent/consumable/ethanol/squirt_cider/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.satiety += 5 * REM * seconds_per_tick //for context, vitamins give 15 satiety per second
 	..()
@@ -2343,13 +1612,6 @@
 	taste_description = "ethylic alcohol with a hint of sugar"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/sugar_rush
 	name = "Sugar Rush"
 	description = "Sweet, light, and fruity - as girly as it gets."
@@ -2360,13 +1622,6 @@
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.satiety -= 10 * REM * seconds_per_tick //junky as hell! a whole glass will keep you from being able to eat junk food
 	..()
@@ -2381,13 +1636,6 @@
 	taste_description = "a bitter SPIKE with a sour aftertaste"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/crevice_spike/on_mob_metabolize(mob/living/drinker) //damage only applies when drink first enters system and won't again until drink metabolizes out
 	drinker.adjustBruteLoss(3 * min(5,volume), required_bodytype = affected_bodytype) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15
 
@@ -2400,12 +1648,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/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/reagent/consumable/ethanol/peppermint_patty
 	name = "Peppermint Patty"
 	description = "This lightly alcoholic drink combines the benefits of menthol and cocoa."
@@ -2415,19 +1657,11 @@
 	quality = DRINK_GOOD
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.apply_status_effect(/datum/status_effect/throat_soothed)
 	drinker.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, drinker.get_body_temp_normal())
 	..()
 
-
 /datum/reagent/consumable/ethanol/alexander
 	name = "Alexander"
 	description = "Named after a Greek hero, this mix is said to embolden a user's shield as if they were in a phalanx."
@@ -2438,13 +1672,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	var/obj/item/shield/mighty_shield
 
-/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/reagent/consumable/ethanol/alexander/on_mob_metabolize(mob/living/drinker)
 	if(ishuman(drinker))
 		var/mob/living/carbon/human/the_human = drinker
@@ -2474,13 +1701,6 @@
 	taste_description = "sweet, creamy cacao"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/sidecar
 	name = "Sidecar"
 	description = "The one ride you'll gladly give up the wheel for."
@@ -2491,13 +1711,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/ethanol/between_the_sheets
 	name = "Between the Sheets"
 	description = "A provocatively named classic. Funny enough, doctors recommend drinking it before taking a nap while underneath bedsheets."
@@ -2508,13 +1721,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired)
 	..()
 	var/is_between_the_sheets = FALSE
@@ -2546,13 +1752,6 @@
 	taste_description = "divine windiness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/mojito
 	name = "Mojito"
 	description = "A drink that looks as refreshing as it tastes."
@@ -2563,13 +1762,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/ethanol/moscow_mule
 	name = "Moscow Mule"
 	description = "A chilly drink that reminds you of the Derelict."
@@ -2579,13 +1771,6 @@
 	taste_description = "refreshing spiciness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/fernet
 	name = "Fernet"
 	description = "An incredibly bitter herbal liqueur used as a digestif."
@@ -2594,11 +1779,6 @@
 	taste_description = "utter bitterness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/fernet/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.nutrition <= NUTRITION_LEVEL_STARVING)
 		drinker.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype)
@@ -2615,13 +1795,6 @@
 	taste_description = "sweet relief"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/fernet_cola/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.nutrition <= NUTRITION_LEVEL_STARVING)
 		drinker.adjustToxLoss(0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype)
@@ -2639,12 +1812,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_HIGH
 
-/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/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_nutrition(-5 * REM * seconds_per_tick)
 	drinker.overeatduration = 0
@@ -2666,12 +1833,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_bodytemperature(-20 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, T0C)
 	return ..()
@@ -2692,13 +1853,6 @@
 	taste_description = "bubbling possibility"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(ishuman(drinker) && HAS_TRAIT(drinker, TRAIT_MIMING))
 		drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION)
@@ -2717,13 +1871,6 @@
 	var/list/tastes = list("bad coding" = 1) //List of tastes. See above.
 	ph = 4
 
-/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/reagent/consumable/ethanol/fruit_wine/on_new(list/data)
 	if(!data)
 		return
@@ -2828,12 +1975,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/ethanol/wizz_fizz
 	name = "Wizz Fizz"
 	description = "A magical potion, fizzy and wild! However the taste, you will find, is quite mild."
@@ -2843,13 +1984,6 @@
 	taste_description = "friendship! It is magic, after all"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	//A healing drink similar to Quadruple Sec, Ling Stings, and Screwdrivers for the Wizznerds; the check is consistent with the changeling sting
 	if(drinker?.mind?.has_antag_datum(/datum/antagonist/wizard))
@@ -2868,13 +2002,6 @@
 	taste_description = "the pain of ten thousand slain mosquitos"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	//Bugs should not drink Bug spray.
 	if(ismoth(drinker) || isflyperson(drinker))
@@ -2895,12 +2022,6 @@
 	taste_description = "an honest day's work at the orchard"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/jack_rose
 	name = "Jack Rose"
 	description = "A light cocktail perfect for sipping with a slice of pie."
@@ -2910,17 +2031,6 @@
 	taste_description = "a sweet and sour slice of apple"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/shot_glass/jack_rose
-	required_drink_type = /datum/reagent/consumable/ethanol/jack_rose
-	icon_state = "shotglassred"
-
-/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/reagent/consumable/ethanol/turbo
 	name = "Turbo"
 	description = "A turbulent cocktail associated with outlaw hoverbike racing. Not for the faint of heart."
@@ -2930,13 +2040,6 @@
 	taste_description = "the outlaw spirit"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(SPT_PROB(2, seconds_per_tick))
 		to_chat(drinker, span_notice("[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]"))
@@ -2952,13 +2055,6 @@
 	taste_description = "simpler times"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/human/metabolizer, seconds_per_tick, times_fired)
 	if(SPT_PROB(10, seconds_per_tick) && istype(metabolizer))
 		metabolizer.age += 1
@@ -2987,13 +2083,6 @@
 	taste_description = "artifical fruityness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/rubberneck/on_mob_metabolize(mob/living/drinker)
 	. = ..()
 	ADD_TRAIT(drinker, TRAIT_SHOCKIMMUNE, type)
@@ -3011,13 +2100,6 @@
 	taste_description = "green apples and blue raspberries"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/trappist
 	name = "Trappist Beer"
 	description = "A strong dark ale brewed by space-monks."
@@ -3027,13 +2109,6 @@
 	taste_description = "dried plums and malt"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.mind?.holy_role)
 		drinker.adjustFireLoss(-2.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
@@ -3049,13 +2124,6 @@
 	taste_description = "alternate realities"
 	var/stored_teleports = 0
 
-/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/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.get_drunk_amount() > 40)
 		if(stored_teleports)
@@ -3075,13 +2143,6 @@
 	quality = DRINK_FANTASTIC
 	taste_description = "triumph with a hint of bitterness"
 
-/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/reagent/consumable/ethanol/mauna_loa
 	name = "Mauna Loa"
 	description = "Extremely hot; not for the faint of heart!"
@@ -3091,13 +2152,6 @@
 	taste_description = "fiery, with an aftertaste of burnt flesh"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	// Heats the user up while the reagent is in the body. Occasionally makes you burst into flames.
 	drinker.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick)
@@ -3115,13 +2169,6 @@
 	taste_description = "sugary tartness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/pina_colada
 	name = "Pina Colada"
 	description = "A fresh pineapple drink with coconut rum. Yum."
@@ -3130,13 +2177,6 @@
 	quality = DRINK_FANTASTIC
 	taste_description = "pineapple, coconut, and a hint of the ocean"
 
-/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/reagent/consumable/ethanol/pina_olivada
 	name = "Piña Olivada"
 	description = "An oddly designed concoction of olive oil and pineapple juice."
@@ -3159,12 +2199,6 @@
 		to_chat(drinker, span_notice(pick(messages)))
 	return ..()
 
-/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/reagent/consumable/ethanol/pruno // pruno mix is in drink_reagents
 	name = "Pruno"
 	color = "#E78108"
@@ -3173,12 +2207,6 @@
 	taste_description = "your tastebuds being individually shanked"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/pruno/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_disgust(5 * REM * seconds_per_tick)
 	..()
@@ -3192,13 +2220,6 @@
 	taste_description = "sweetness followed by a soft sourness and warmth"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/godfather
 	name = "Godfather"
 	description = "A rough cocktail with illegal connections."
@@ -3209,13 +2230,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/ethanol/godmother
 	name = "Godmother"
 	description = "A twist on a classic, liked more by mature women."
@@ -3225,13 +2239,6 @@
 	taste_description = "sweetness and a zesty twist"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/kortara
 	name = "Kortara"
 	description = "A sweet, milky nut-based drink enjoyed on Tizira. Frequently mixed with fruit juices and cocoa for extra refreshment."
@@ -3241,12 +2248,6 @@
 	taste_description = "sweet nectar"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/kortara/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(drinker.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
 		drinker.heal_bodypart_damage(1,0)
@@ -3261,13 +2262,6 @@
 	taste_description = "mint choc chip"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/sea_breeze/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.apply_status_effect(/datum/status_effect/throat_soothed)
 	..()
@@ -3281,13 +2275,6 @@
 	taste_description = "strikes and gutters"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/drunken_espatier
 	name = "Drunken Espatier"
 	description = "Look, if you had to get into a shootout in the cold vacuum of space, you'd want to be drunk too."
@@ -3297,13 +2284,6 @@
 	taste_description = "sorrow"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.add_mood_event("numb", /datum/mood_event/narcotic_medium, name) //comfortably numb
 	..()
@@ -3326,13 +2306,6 @@
 	nutriment_factor = 3 * REAGENTS_METABOLISM
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/protein_blend/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	drinker.adjust_nutrition(2 * REM * seconds_per_tick)
 	if(!islizard(drinker))
@@ -3350,11 +2323,6 @@
 	taste_description = "sweet 'shrooms"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/triumphal_arch
 	name = "Triumphal Arch"
 	description = "A drink celebrating the Lizard Empire and its military victories. It's popular at bars on Unification Day."
@@ -3364,13 +2332,6 @@
 	taste_description = "victory"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/triumphal_arch/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(islizard(drinker))
 		drinker.add_mood_event("triumph", /datum/mood_event/memories_of_home, name)
@@ -3386,13 +2347,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	var/datum/brain_trauma/special/bluespace_prophet/prophet_trauma
 
-/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/reagent/consumable/ethanol/the_juice/on_mob_metabolize(mob/living/carbon/drinker)
 	. = ..()
 	prophet_trauma = new()
@@ -3436,12 +2390,6 @@
 	taste_description = "blue orange"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/navy_rum //IN THE NAVY
 	name = "Navy Rum"
 	description = "Rum as the finest sailors drink."
@@ -3451,12 +2399,6 @@
 	taste_description = "a life on the waves"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/bitters //why do they call them bitters, anyway? they're more spicy than anything else
 	name = "Andromeda Bitters"
 	description = "A bartender's best friend, often used to lend a delicate spiciness to any drink. Produced in New Trinidad, now and forever."
@@ -3466,12 +2408,6 @@
 	taste_description = "spiced alcohol"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 /datum/reagent/consumable/ethanol/admiralty //navy rum, vermouth, fernet
 	name = "Admiralty"
 	description = "A refined, bitter drink made with navy rum, vermouth and fernet."
@@ -3481,13 +2417,6 @@
 	taste_description = "haughty arrogance"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/long_haul //Rum, Curacao, Sugar, dash of bitters, lengthened with soda water
 	name = "Long Haul"
 	description = "A favourite amongst freighter pilots, unscrupulous smugglers, and nerf herders."
@@ -3497,13 +2426,6 @@
 	taste_description = "companionship"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/long_john_silver //navy rum, bitters, lemonade
 	name = "Long John Silver"
 	description = "A long drink of navy rum, bitters, and lemonade. Particularly popular aboard the Mothic Fleet as it's light on ration credits and heavy on flavour."
@@ -3513,13 +2435,6 @@
 	taste_description = "rum and spices"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/tropical_storm //dark rum, pineapple juice, triple citrus, curacao
 	name = "Tropical Storm"
 	description = "A taste of the Caribbean in one glass."
@@ -3529,13 +2444,6 @@
 	taste_description = "the tropics"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/dark_and_stormy //rum and ginger beer- simple and classic
 	name = "Dark and Stormy"
 	description = "A classic drink arriving to thunderous applause." //thank you, thank you, I'll be here forever
@@ -3545,13 +2453,6 @@
 	taste_description = "ginger and rum"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/salt_and_swell //navy rum, tochtause syrup, egg whites, dash of saline-glucose solution
 	name = "Salt and Swell"
 	description = "A bracing sour with an interesting salty taste."
@@ -3561,13 +2462,6 @@
 	taste_description = "salt and spice"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/tiltaellen //yoghurt, salt, vinegar
 	name = "Tiltällen"
 	description = "A lightly fermented yoghurt drink with salt and a light dash of vinegar. Has a distinct sour cheesy flavour."
@@ -3577,12 +2471,6 @@
 	taste_description = "sour cheesy yoghurt"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/tich_toch
 	name = "Tich Toch"
 	description = "A mix of Tiltällen, Töchtaüse Syrup, and vodka. It's not exactly to everyones' tastes."
@@ -3592,13 +2480,6 @@
 	taste_description = "spicy sour cheesy yoghurt"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/helianthus
 	name = "Helianthus"
 	description = "A dark yet radiant mixture of absinthe and hallucinogens. The choice of all true artists."
@@ -3610,13 +2491,6 @@
 	var/hal_amt = 4
 	var/hal_cap = 24
 
-/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/reagent/consumable/ethanol/helianthus/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(SPT_PROB(5, seconds_per_tick))
 		drinker.adjust_hallucinations_up_to(4 SECONDS * REM * seconds_per_tick, 48 SECONDS)
@@ -3633,12 +2507,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/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/reagent/consumable/ethanol/the_hat
 	name = "The Hat"
 	description = "A fancy drink, usually served in a man's hat."
@@ -3649,12 +2517,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/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/reagent/consumable/ethanol/gin_garden
 	name = "Gin Garden"
 	description = "Excellent cooling alcoholic drink with not so ordinary taste."
@@ -3664,13 +2526,6 @@
 	taste_description = "light gin with sweet ginger and cucumber"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/gin_garden/on_mob_life(mob/living/carbon/doll, seconds_per_tick, times_fired)
 	doll.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal())
 	..()
@@ -3683,13 +2538,6 @@
 	taste_description = "static with a hint of sweetness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/wine_voltaic/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume) //can't be on life because of the way blood works.
 	. = ..()
 	if(!(methods & (INGEST|INJECT|PATCH)) || !iscarbon(exposed_mob))
@@ -3709,13 +2557,6 @@
 	taste_description = "the howling storm"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/ethanol/telepole/on_mob_metabolize(mob/living/affected_mob)
 	. = ..()
 	ADD_TRAIT(affected_mob, TRAIT_SHOCKIMMUNE, type)
@@ -3743,13 +2584,6 @@
 	taste_description = "victory, with a hint of insanity"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 /datum/reagent/consumable/ethanol/pod_tesla/on_mob_metabolize(mob/living/affected_mob)
 	..()
 	affected_mob.add_traits(list(TRAIT_SHOCKIMMUNE,TRAIT_TESLA_SHOCKIMMUNE,TRAIT_FEARLESS), type)
@@ -3767,5 +2601,6 @@
 	var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
 	if(istype(stomach))
 		stomach.adjust_charge(reac_volume * 5)
+
 #undef ALCOHOL_EXPONENT
 #undef ALCOHOL_THRESHOLD_MODIFIER
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
similarity index 69%
rename from code/modules/reagents/chemistry/reagents/drink_reagents.dm
rename to code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index 418eceb8a97..5b7e5171baa 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -1,9 +1,3 @@
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 /datum/reagent/consumable/orangejuice
 	name = "Orange Juice"
 	description = "Both delicious AND rich in Vitamin C, what more do you need?"
@@ -13,20 +7,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice
 
-/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/reagent/consumable/orangejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(affected_mob.getOxyLoss() && SPT_PROB(16, seconds_per_tick))
 		affected_mob.adjustOxyLoss(-1, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
@@ -41,12 +21,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice
 
-/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/reagent/consumable/tomatojuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(affected_mob.getFireLoss() && SPT_PROB(10, seconds_per_tick))
 		affected_mob.heal_bodypart_damage(0, 1)
@@ -62,12 +36,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice
 
-/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/reagent/consumable/limejuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
 		affected_mob.adjustToxLoss(-1, FALSE, required_biotype = affected_biotype)
@@ -81,12 +49,6 @@
 	taste_description = "carrots"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/carrotjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_eye_blur(-2 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_temp_blindness(-2 SECONDS * REM * seconds_per_tick)
@@ -107,12 +69,6 @@
 	taste_description = "berries"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/applejuice
 	name = "Apple Juice"
 	description = "The sweet juice of an apple, fit for all ages."
@@ -120,13 +76,6 @@
 	taste_description = "apples"
 	ph = 3.2 // ~ 2.7 -> 3.7
 
-/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/reagent/consumable/poisonberryjuice
 	name = "Poison Berry Juice"
 	description = "A tasty juice blended from various kinds of very deadly and toxic berries."
@@ -134,12 +83,6 @@
 	taste_description = "berries"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype)
 	. = TRUE
@@ -152,12 +95,6 @@
 	taste_description = "juicy watermelon"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/lemonjuice
 	name = "Lemon Juice"
 	description = "This juice is VERY sour."
@@ -166,12 +103,6 @@
 	ph = 2
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/drinking_glass/lemonjuice
-	required_drink_type = /datum/reagent/consumable/lemonjuice
-	name = "glass of lemon juice"
-	desc = "Sour..."
-	icon_state = "lemonglass"
-
 /datum/reagent/consumable/banana
 	name = "Banana Juice"
 	description = "The raw essence of a banana. HONK"
@@ -179,12 +110,6 @@
 	taste_description = "banana"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/banana/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	var/obj/item/organ/internal/liver/liver = affected_mob.get_organ_slot(ORGAN_SLOT_LIVER)
 	if((liver && HAS_TRAIT(liver, TRAIT_COMEDY_METABOLISM)) || ismonkey(affected_mob))
@@ -202,12 +127,6 @@
 	required_drink_type = /datum/reagent/consumable/nothing
 	icon_state = "shotglass"
 
-/datum/glass_style/drinking_glass/nothing
-	required_drink_type = /datum/reagent/consumable/nothing
-	name = "nothing"
-	desc = "Absolutely nothing."
-	icon_state = "nothing"
-
 /datum/reagent/consumable/nothing/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	if(ishuman(drinker) && HAS_TRAIT(drinker, TRAIT_MIMING))
 		drinker.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION)
@@ -251,12 +170,6 @@
 	taste_description = "irish sadness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/grapejuice
 	name = "Grape Juice"
 	description = "The juice of a bunch of grapes. Guaranteed non-alcoholic."
@@ -264,13 +177,6 @@
 	taste_description = "grape soda"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/plumjuice
 	name = "Plum Juice"
 	description = "Refreshing and slightly acidic beverage."
@@ -278,13 +184,6 @@
 	taste_description = "plums"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/milk
 	name = "Milk"
 	description = "An opaque white liquid produced by the mammary glands of mammals."
@@ -294,20 +193,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/condiment/milk
 
-/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
-
 // Milk is good for humans, but bad for plants.
 // The sugars cannot be used by plants, and the milk fat harms growth. Except shrooms.
 /datum/reagent/consumable/milk/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user)
@@ -333,12 +218,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/condiment/soymilk
 
-/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/reagent/consumable/soymilk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
 		affected_mob.heal_bodypart_damage(1, 0)
@@ -353,12 +232,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/cream
 
-/datum/glass_style/drinking_glass/cream
-	required_drink_type = /datum/reagent/consumable/cream
-	name = "glass of cream"
-	desc = "Ewwww..."
-	icon_state = "glass_white"
-
 /datum/reagent/consumable/cream/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
 		affected_mob.heal_bodypart_damage(1, 0)
@@ -375,11 +248,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_STOCK
 
-/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/reagent/consumable/coffee/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick)
@@ -406,12 +274,6 @@
 	glass_price = DRINK_PRICE_STOCK
 	default_container = /obj/item/reagent_containers/cup/glass/mug/tea
 
-/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/reagent/consumable/tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick)
@@ -432,13 +294,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/tea/arnold_palmer
 	name = "Arnold Palmer"
 	description = "Encourages the patient to go golfing."
@@ -448,13 +303,6 @@
 	taste_description = "bitter tea"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/tea/arnold_palmer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(SPT_PROB(2.5, seconds_per_tick))
 		to_chat(affected_mob, span_notice("[pick("You remember to square your shoulders.","You remember to keep your head down.","You can't decide between squaring your shoulders and keeping your head down.","You remember to relax.","You think about how someday you'll get two strokes off your golf game.")]"))
@@ -469,13 +317,6 @@
 	taste_description = "bitter coldness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
@@ -493,13 +334,6 @@
 	taste_description = "bitter coldness and a hint of smoke"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
@@ -518,13 +352,6 @@
 	taste_description = "sweet tea"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/icetea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick)
@@ -542,12 +369,6 @@
 	taste_description = "cola"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
@@ -561,12 +382,6 @@
 	taste_description = "fruity overlysweet cola"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/roy_rogers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.set_jitter_if_lower(12 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick)
@@ -581,13 +396,6 @@
 	taste_description = "the future"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/affected_mob)
 	..()
 	affected_mob.add_movespeed_modifier(/datum/movespeed_modifier/reagent/nuka_cola)
@@ -618,12 +426,6 @@
 	/// If we activated the effect
 	var/effect_enabled = FALSE
 
-/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/reagent/consumable/rootbeer/on_mob_end_metabolize(mob/living/affected_mob)
 	REMOVE_TRAIT(affected_mob, TRAIT_DOUBLE_TAP, type)
 	if(current_cycle > 10)
@@ -655,12 +457,6 @@
 	taste_description = "carbonated oil"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/carbon/affected_atom)
 	..()
 	ADD_TRAIT(affected_atom, TRAIT_SHOCKIMMUNE, type)
@@ -688,12 +484,6 @@
 	taste_description = "sweet citrus soda"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick)
 	affected_mob.AdjustSleeping(-20 * REM * seconds_per_tick)
@@ -709,12 +499,6 @@
 	taste_description = "cherry soda" // FALSE ADVERTISING
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/dr_gibb/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_drowsiness(-12 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
@@ -727,12 +511,6 @@
 	taste_description = "cherry soda"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/space_up/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
 	..()
@@ -744,12 +522,6 @@
 	taste_description = "tangy lime and lemon soda"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
 	..()
@@ -761,12 +533,6 @@
 	taste_description = "sweet and salty tang"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/pwr_game/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)
 	. = ..()
 	if(exposed_mob?.mind?.get_skill_level(/datum/skill/gaming) >= SKILL_LEVEL_LEGENDARY && (methods & INGEST) && !HAS_TRAIT(exposed_mob, TRAIT_GAMERGOD))
@@ -787,12 +553,6 @@
 	taste_description = "carbonated metallic soda"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
 	..()
@@ -804,12 +564,6 @@
 	taste_description = "carbonated water"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 // A variety of nutrients are dissolved in club soda, without sugar.
 // These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth.
 /datum/reagent/consumable/sodawater/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user)
@@ -829,12 +583,6 @@
 	taste_description = "tart and fresh"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/tonic/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
@@ -851,12 +599,6 @@
 	taste_description = "barbecue and nostalgia"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/monkey_energy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.set_jitter_if_lower(80 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick)
@@ -888,12 +630,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/glass/ice
 
-/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"
-
 /datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
 	..()
@@ -907,13 +643,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
@@ -934,13 +663,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_EASY
 
-/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/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
 	affected_mob.adjust_drowsiness(-12 SECONDS * REM * seconds_per_tick)
@@ -960,13 +682,6 @@
 	taste_description = "homely fruit"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/doctor_delight/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjustBruteLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
 	affected_mob.adjustFireLoss(-0.5 * REM * seconds_per_tick, FALSE, required_bodytype = affected_bodytype)
@@ -988,13 +703,6 @@
 	taste_description = "sweet tangy fruit"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/cinderella/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_disgust(-5 * REM * seconds_per_tick)
 	return ..()
@@ -1009,13 +717,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/bluecherryshake
 	name = "Blue Cherry Shake"
 	description = "An exotic milkshake."
@@ -1025,13 +726,6 @@
 	taste_description = "creamy blue cherry"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/vanillashake
 	name = "Vanilla Shake"
 	description = "A vanilla flavored milkshake. The basics are still good."
@@ -1042,13 +736,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/caramelshake
 	name = "Caramel Shake"
 	description = "A caramel flavored milkshake. Your teeth hurt looking at it."
@@ -1059,13 +746,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/choccyshake
 	name = "Chocolate Shake"
 	description = "A frosty chocolate milkshake."
@@ -1076,13 +756,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/strawberryshake
 	name = "Strawberry Shake"
 	description = "A strawberry milkshake."
@@ -1093,13 +766,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/bananashake
 	name = "Banana Shake"
 	description = "A banana milkshake. Stuff that clowns drink at their honkday parties."
@@ -1110,13 +776,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	glass_price = DRINK_PRICE_MEDIUM
 
-/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/reagent/consumable/pumpkin_latte
 	name = "Pumpkin Latte"
 	description = "A mix of pumpkin juice and coffee."
@@ -1126,13 +785,6 @@
 	taste_description = "creamy pumpkin"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/gibbfloats
 	name = "Gibb Floats"
 	description = "Ice cream on top of a Dr. Gibb glass."
@@ -1142,13 +794,6 @@
 	taste_description = "creamy cherry"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/pumpkinjuice
 	name = "Pumpkin Juice"
 	description = "Juiced from real pumpkin."
@@ -1171,13 +816,6 @@
 	taste_description = "extreme bitterness"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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" //needs own sprite mine are trash //your sprite is great tho
-
 /datum/reagent/consumable/grape_soda
 	name = "Grape Soda"
 	description = "Beloved by children and teetotalers."
@@ -1185,10 +823,6 @@
 	taste_description = "grape soda"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/drinking_glass/grape_soda
-	required_drink_type = /datum/reagent/consumable/grape_soda
-	name = "glass of grape juice"
-
 /datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
 	..()
@@ -1201,13 +835,6 @@
 	taste_description = "chocolate milk"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/hot_coco
 	name = "Hot Coco"
 	description = "Made with love! And coco beans."
@@ -1216,13 +843,6 @@
 	taste_description = "creamy chocolate"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
 	if(affected_mob.getBruteLoss() && SPT_PROB(10, seconds_per_tick))
@@ -1241,13 +861,6 @@
 	taste_description = "thick creamy chocolate"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/italian_coco/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
 	return ..()
@@ -1260,12 +873,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/menthol
 
-/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/reagent/consumable/menthol/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.apply_status_effect(/datum/status_effect/throat_soothed)
 	..()
@@ -1277,11 +884,6 @@
 	taste_description = "sweet pomegranates"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/drinking_glass/grenadine
-	required_drink_type = /datum/reagent/consumable/grenadine
-	name = "glass of grenadine"
-	desc = "Delicious flavored syrup."
-
 /datum/reagent/consumable/parsnipjuice
 	name = "Parsnip Juice"
 	description = "Why..."
@@ -1289,11 +891,6 @@
 	taste_description = "parsnip"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/has_foodtype/drinking_glass/parsnipjuice
-	required_drink_type = /datum/reagent/consumable/parsnipjuice
-	name = "glass of parsnip juice"
-	drink_type = FRUIT
-
 /datum/reagent/consumable/pineapplejuice
 	name = "Pineapple Juice"
 	description = "Tart, tropical, and hotly debated."
@@ -1302,19 +899,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/pineapplejuice
 
-/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/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink
 	name = "Peach Juice"
 	description = "Just peachy."
@@ -1322,11 +906,6 @@
 	taste_description = "peaches"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/datum/glass_style/has_foodtype/drinking_glass/peachjuice
-	required_drink_type = /datum/reagent/consumable/peachjuice
-	name = "glass of peach juice"
-	drink_type = FRUIT
-
 /datum/reagent/consumable/cream_soda
 	name = "Cream Soda"
 	description = "A classic space-American vanilla flavored soft drink."
@@ -1335,13 +914,6 @@
 	taste_description = "fizzy vanilla"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
 	..()
@@ -1354,12 +926,6 @@
 	taste_description = "sweet ginger spice"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 /datum/reagent/consumable/sol_dry/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_disgust(-5 * REM * seconds_per_tick)
 	..()
@@ -1372,13 +938,6 @@
 	taste_description = "sweet cherry syrup and ginger spice"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/shirley_temple/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_disgust(-3 * REM * seconds_per_tick)
 	return ..()
@@ -1392,13 +951,6 @@
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 	var/current_size = RESIZE_DEFAULT_SIZE
 
-/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/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(SPT_PROB(50, seconds_per_tick))
 		return ..()
@@ -1423,12 +975,6 @@
 	taste_description = "succulent bungo"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/prunomix
 	name = "Pruno Mixture"
 	color = "#E78108"
@@ -1436,12 +982,6 @@
 	taste_description = "garbage"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/aloejuice
 	name = "Aloe Juice"
 	color = "#A3C48B"
@@ -1449,12 +989,6 @@
 	taste_description = "vegetable"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/aloejuice/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired)
 	if(affected_mob.getToxLoss() && SPT_PROB(16, seconds_per_tick))
 		affected_mob.adjustToxLoss(-1, FALSE, required_biotype = affected_biotype)
@@ -1469,13 +1003,6 @@
 	taste_description = "cool refreshing watermelon"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	affected_mob.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
 	if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
@@ -1490,12 +1017,6 @@
 	taste_description = "mushrooms"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 /datum/reagent/consumable/mushroom_tea/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	if(islizard(affected_mob))
 		affected_mob.adjustOxyLoss(-0.5 * REM * seconds_per_tick, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
@@ -1511,12 +1032,6 @@
 	taste_description = "fiery itchy pain"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/toechtauese_syrup
 	name = "Töchtaüse Syrup"
 	description = "A harsh spicy and bitter syrup, made from töchtaüse berries. Useful as an ingredient, both for food and cocktails."
@@ -1525,12 +1040,6 @@
 	taste_description = "sugar, spice, and nothing nice"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/strawberry_banana
 	name = "strawberry banana smoothie"
 	description = "A classic smoothie made from strawberries and bananas."
@@ -1539,13 +1048,6 @@
 	taste_description = "strawberry and banana"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/berry_blast
 	name = "berry blast smoothie"
 	description = "A classic smoothie made from mixed berries."
@@ -1554,13 +1056,6 @@
 	taste_description = "mixed berry"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/funky_monkey
 	name = "funky monkey smoothie"
 	description = "A classic smoothie made from chocolate and bananas."
@@ -1569,13 +1064,6 @@
 	taste_description = "chocolate and banana"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/green_giant
 	name = "green giant smoothie"
 	description = "A green vegetable smoothie, made without vegetables."
@@ -1584,13 +1072,6 @@
 	taste_description = "green, just green"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/melon_baller
 	name = "melon baller smoothie"
 	description = "A classic smoothie made from melons."
@@ -1599,13 +1080,6 @@
 	taste_description = "fresh melon"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/vanilla_dream
 	name = "vanilla dream smoothie"
 	description = "A classic smoothie made from vanilla and fresh cream."
@@ -1614,13 +1088,6 @@
 	taste_description = "creamy vanilla"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 /datum/reagent/consumable/cucumberjuice
 	name = "Cucumber Juice"
 	description = "Ordinary cucumber juice, nothing from the fantasy world."
@@ -1628,27 +1095,14 @@
 	taste_description = "light cucumber"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 /datum/reagent/consumable/cucumberlemonade
 	name = "Cucumber Lemonade"
-	description = "Cucumber juice, sugar and soda, what else is needed for happiness?"
+	description = "Cucumber juice, sugar, and soda; what else do I need?"
 	color = "#6cd87a"
 	quality = DRINK_GOOD
 	taste_description = "citrus soda with cucumber"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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/reagent/consumable/cucumberlemonade/on_mob_life(mob/living/carbon/doll, seconds_per_tick, times_fired)
 	doll.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, doll.get_body_temp_normal())
 	if(doll.getToxLoss() && SPT_PROB(10, seconds_per_tick))
@@ -1662,13 +1116,6 @@
 	taste_description = "sludge seeping down your throat"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
-/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"
-
 /datum/reagent/consumable/mississippi_queen/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
 	switch(current_cycle)
 		if(10 to 20)
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm
new file mode 100644
index 00000000000..eda3827876c
--- /dev/null
+++ b/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!&#174;"
+
+/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"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/coffee_tea.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/coffee_tea.dm
new file mode 100644
index 00000000000..79ba13a4acb
--- /dev/null
+++ b/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"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm
new file mode 100644
index 00000000000..4a6592abe0e
--- /dev/null
+++ b/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"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/juices.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/juices.dm
new file mode 100644
index 00000000000..6f837d8f515
--- /dev/null
+++ b/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"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm
new file mode 100644
index 00000000000..e3da44023b1
--- /dev/null
+++ b/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"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_drinks.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_drinks.dm
new file mode 100644
index 00000000000..9074aff95ef
--- /dev/null
+++ b/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"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/smoothies_shakes.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/smoothies_shakes.dm
new file mode 100644
index 00000000000..9b39c87062a
--- /dev/null
+++ b/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"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/sodas.dm
new file mode 100644
index 00000000000..75c03448b3d
--- /dev/null
+++ b/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"
diff --git a/icons/obj/drinks/boxes.dmi b/icons/obj/drinks/boxes.dmi
index 8ed76d9760a..a0408465ee1 100644
Binary files a/icons/obj/drinks/boxes.dmi and b/icons/obj/drinks/boxes.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index c1f887d0a1d..dba73c831de 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4675,11 +4675,9 @@
 #include "code\modules\reagents\chemistry\machinery\pandemic.dm"
 #include "code\modules\reagents\chemistry\machinery\reagentgrinder.dm"
 #include "code\modules\reagents\chemistry\machinery\smoke_machine.dm"
-#include "code\modules\reagents\chemistry\reagents\alcohol_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\atmos_gas_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\cat2_medicine_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\catalyst_reagents.dm"
-#include "code\modules\reagents\chemistry\reagents\drink_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\drug_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\food_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\impure_reagents.dm"
@@ -4688,6 +4686,16 @@
 #include "code\modules\reagents\chemistry\reagents\pyrotechnic_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\reaction_agents_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\toxin_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\alcohol_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\drink_reagents.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\alcohol.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\coffee_tea.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\dairy.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\juices.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\mixed_alcohol.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\mixed_drinks.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\smoothies_shakes.dm"
+#include "code\modules\reagents\chemistry\reagents\drinks\glass_styles\sodas.dm"
 #include "code\modules\reagents\chemistry\reagents\impure_reagents\impure_medicine_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\impure_reagents\impure_toxin_reagents.dm"
 #include "code\modules\reagents\chemistry\reagents\unique\eigenstasium.dm"