Merge pull request #16669 from SatinIsle/coffeeeeeee

Barista love

code/modules/food/drinkingglass/glass_boxes.dm

@@ -81,4 +81,16 @@
 
 /obj/item/storage/box/glasses/coffeemug
 	name = "box of coffee mugs"
-	starts_with = list(/obj/item/reagent_containers/food/drinks/glass2/coffeemug = 7)
+	starts_with = list(/obj/item/reagent_containers/food/drinks/glass2/coffeemug = 7)
+
+/obj/item/storage/box/glasses/coffeecup_tall
+	name = "box of tall cups"
+	starts_with = list(/obj/item/reagent_containers/food/drinks/tall = 7)
+
+/obj/item/storage/box/glasses/coffeecup_grande
+	name = "box of grande cups"
+	starts_with = list(/obj/item/reagent_containers/food/drinks/grande = 7)
+
+/obj/item/storage/box/glasses/coffeecup_venti
+	name = "box of venti cups"
+	starts_with = list(/obj/item/reagent_containers/food/drinks/venti = 7)

code/modules/food/food/drinks/cup.dm

@@ -17,7 +17,12 @@
 			icon_state = "cup_brown"
 
 		if(R.cup_name)
-			name = R.cup_name
+			var/prefix = " "
+			for(var/datum/reagent/S in reagents.reagent_list)
+				if(S.cup_prefix)
+					var/current_prefix = prefix
+					prefix = "[current_prefix][S.cup_prefix] "
+			name = "cup of[prefix][R.cup_name]"
 		else
 			name = "Cup of.. what?"
 

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

@@ -67,7 +67,12 @@
 		icon_state = "cup_brown"
 
 	if(R.cup_name)
-		name = R.cup_name
+		var/prefix = " "
+		for(var/datum/reagent/S in reagents.reagent_list)
+			if(S.cup_prefix)
+				var/current_prefix = prefix
+				prefix = "[current_prefix][S.cup_prefix] "
+		name = "cup of[prefix][R.cup_name]"
 	else
 		name = "Cup of.. what?"
 
@@ -160,4 +165,148 @@
 	reagents.add_reagent("nutriment", 30)
 	reagents.add_reagent("iron", 10)
 	reagents.add_reagent("protein", 15)
-	reagents.add_reagent("water", 45)
+	reagents.add_reagent("water", 45)
+
+
+////////////////Fancy coffee cups
+
+/obj/item/reagent_containers/food/drinks/tall
+	name = "tall cup"
+	desc = "A larger coffee cup."
+	icon_state = "tall_cup_empty"
+	amount_per_transfer_from_this = 5
+	volume = 40
+	center_of_mass = list("x"=16, "y"=16)
+
+/obj/item/reagent_containers/food/drinks/tall/on_reagent_change()
+	if (!length(reagents?.reagent_list))
+		icon_state = "tall_cup_empty"
+		name = "tall cup"
+		desc = "A larger coffee cup."
+		center_of_mass = list("x"=16, "y"=16)
+		return
+	var/datum/reagent/R = reagents.get_master_reagent()
+
+	if(R.cup_icon_state)
+		icon_state = "tall_[R.cup_icon_state]"
+	else
+		icon_state = "tall_cup_brown"
+
+	if(R.cup_name)
+		var/prefix = " "
+		for(var/datum/reagent/S in reagents.reagent_list)
+			if(S.cup_prefix)
+				var/current_prefix = prefix
+				prefix = "[current_prefix][S.cup_prefix] "
+		name = "tall[prefix][R.cup_name]"
+	else
+		name = "tall.. what?"
+
+	if(R.cup_desc)
+		desc = R.cup_desc
+	else
+		desc = "You can't really tell what this is."
+
+	if(R.cup_center_of_mass)
+		center_of_mass = R.cup_center_of_mass
+	else
+		center_of_mass = list("x"=16, "y"=16)
+
+	if(R.price_tag)
+		price_tag = R.price_tag
+	else
+		price_tag = null
+
+/obj/item/reagent_containers/food/drinks/grande
+	name = "grande cup"
+	desc = "A much taller coffee cup for people who really need their coffee."
+	icon_state = "grande_cup_empty"
+	amount_per_transfer_from_this = 5
+	volume = 50
+	center_of_mass = list("x"=16, "y"=16)
+
+/obj/item/reagent_containers/food/drinks/grande/on_reagent_change()
+	if (!length(reagents?.reagent_list))
+		icon_state = "grande_cup_empty"
+		name = "grande cup"
+		desc = "A much taller coffee cup for people who really need their coffee."
+		center_of_mass = list("x"=16, "y"=16)
+		return
+	var/datum/reagent/R = reagents.get_master_reagent()
+
+	if(R.cup_icon_state)
+		icon_state = "grande_[R.cup_icon_state]"
+	else
+		icon_state = "grande_cup_brown"
+
+	if(R.cup_name)
+		var/prefix = " "
+		for(var/datum/reagent/S in reagents.reagent_list)
+			if(S.cup_prefix)
+				var/current_prefix = prefix
+				prefix = "[current_prefix][S.cup_prefix] "
+		name = "grande[prefix][R.cup_name]"
+	else
+		name = "grande.. what?"
+
+	if(R.cup_desc)
+		desc = R.cup_desc
+	else
+		desc = "You can't really tell what this is."
+
+	if(R.cup_center_of_mass)
+		center_of_mass = R.cup_center_of_mass
+	else
+		center_of_mass = list("x"=16, "y"=16)
+
+	if(R.price_tag)
+		price_tag = R.price_tag
+	else
+		price_tag = null
+
+/obj/item/reagent_containers/food/drinks/venti
+	name = "venti cup"
+	desc = "A huge coffee cup for people who literally cannot function without it."
+	icon_state = "venti_cup_empty"
+	amount_per_transfer_from_this = 5
+	volume = 60
+	center_of_mass = list("x"=16, "y"=16)
+
+/obj/item/reagent_containers/food/drinks/venti/on_reagent_change()
+	if (!length(reagents?.reagent_list))
+		icon_state = "venti_cup_empty"
+		name = "venti cup"
+		desc = "A huge coffee cup for people who literally cannot function without it."
+		center_of_mass = list("x"=16, "y"=16)
+		return
+	var/datum/reagent/R = reagents.get_master_reagent()
+
+	if(R.cup_icon_state)
+		icon_state = "venti_[R.cup_icon_state]"
+	else
+		icon_state = "venti_cup_brown"
+
+	if(R.cup_name)
+		var/prefix = " "
+		for(var/datum/reagent/S in reagents.reagent_list)
+			if(S.cup_prefix)
+				var/current_prefix = prefix
+				prefix = "[current_prefix][S.cup_prefix] "
+		name = "venti[prefix][R.cup_name]"
+	else
+		name = "venti.. what?"
+
+	if(R.cup_desc)
+		desc = R.cup_desc
+	else
+		desc = "You can't really tell what this is."
+
+	if(R.cup_center_of_mass)
+		center_of_mass = R.cup_center_of_mass
+	else
+		center_of_mass = list("x"=16, "y"=16)
+
+	if(R.price_tag)
+		price_tag = R.price_tag
+	else
+		price_tag = null

code/modules/reagents/machinery/dispenser/cartridge_presets.dm

@@ -117,10 +117,14 @@
 	spawn_reagent = "lemonjuice"
 /obj/item/reagent_containers/chem_disp_cartridge/grapesoda
 	spawn_reagent = "grapesoda"
+/obj/item/reagent_containers/chem_disp_cartridge/pineapple
+	spawn_reagent = "pineapplejuice"
 
 // Bar, coffee
 /obj/item/reagent_containers/chem_disp_cartridge/coffee
 	spawn_reagent = "coffee"
+/obj/item/reagent_containers/chem_disp_cartridge/drip_coffee
+	spawn_reagent = "drip_coffee"
 /obj/item/reagent_containers/chem_disp_cartridge/cafe_latte
 	spawn_reagent = "cafe_latte"
 /obj/item/reagent_containers/chem_disp_cartridge/soy_latte
@@ -129,6 +133,8 @@
 	spawn_reagent = "hot_coco"
 /obj/item/reagent_containers/chem_disp_cartridge/milk
 	spawn_reagent = "milk"
+/obj/item/reagent_containers/chem_disp_cartridge/milk_foam
+	spawn_reagent = "milk_foam"
 /obj/item/reagent_containers/chem_disp_cartridge/cream
 	spawn_reagent = "cream"
 /obj/item/reagent_containers/chem_disp_cartridge/mint
@@ -144,6 +150,48 @@
 /obj/item/reagent_containers/chem_disp_cartridge/decafchai
 	spawn_reagent = "chaiteadecaf"
 
+// syrups
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin
+	spawn_reagent = "syrup_pumpkin"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel
+	spawn_reagent = "syrup_caramel"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel
+	spawn_reagent = "syrup_salted_caramel"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish
+	spawn_reagent = "syrup_irish"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond
+	spawn_reagent = "syrup_almond"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon
+	spawn_reagent = "syrup_cinnamon"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio
+	spawn_reagent = "syrup_pistachio"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla
+	spawn_reagent = "syrup_vanilla"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee
+	spawn_reagent = "syrup_toffee"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry
+	spawn_reagent = "syrup_cherry"
+/obj/item/reagent_containers/chem_disp_cartridge/grenadine
+	spawn_reagent = "grenadine"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch
+	spawn_reagent = "syrup_butterscotch"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate
+	spawn_reagent = "syrup_chocolate"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate
+	spawn_reagent = "syrup_white_chocolate"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry
+	spawn_reagent = "syrup_strawberry"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut
+	spawn_reagent = "syrup_coconut"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger
+	spawn_reagent = "syrup_ginger"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread
+	spawn_reagent = "syrup_gingerbread"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint
+	spawn_reagent = "syrup_peppermint"
+/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
+	spawn_reagent = "syrup_birthday"
+
 // ERT
 /obj/item/reagent_containers/chem_disp_cartridge/inaprov
 	spawn_reagent = "inaprovaline"

code/modules/reagents/machinery/dispenser/dispenser2_energy.dm

@@ -47,7 +47,7 @@
 /obj/machinery/chemical_dispenser/bar_soft
 	dispense_reagents = list(
 		"water", "ice", "coffee", "cream", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic",
-		"sodawater", "lemonjuice", "lemon_lime", "sugar", "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda"
+		"sodawater", "lemonjuice", "lemon_lime", "sugar", "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda", "pineapplejuice"
 		)
 
 /obj/machinery/chemical_dispenser/bar_alc
@@ -58,6 +58,13 @@
 
 /obj/machinery/chemical_dispenser/bar_coffee
 	dispense_reagents = list(
-		"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
-		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf", "greentea"
+		"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice", "water",
+		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf", "greentea", "milk_foam", "drip_coffee"
+		)
+
+/obj/machinery/chemical_dispenser/bar_syrup
+	dispense_reagents = list(
+		"syrup_pumpkin", "syrup_caramel", "syrup_salted_caramel", "syrup_irish", "syrup_almond", "syrup_cinnamon", "syrup_pistachio",
+		"syrup_vanilla", "syrup_toffee", "grenadine", "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry",
+		"syrup_coconut", "syrup_ginger", "syrup_gingerbread", "syrup_peppermint", "syrup_birthday"
 		)

code/modules/reagents/machinery/dispenser/dispenser_presets.dm

@@ -85,7 +85,8 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/reagent_containers/chem_disp_cartridge/watermelon,
 			/obj/item/reagent_containers/chem_disp_cartridge/lemon,
-			/obj/item/reagent_containers/chem_disp_cartridge/grapesoda
+			/obj/item/reagent_containers/chem_disp_cartridge/grapesoda,
+			/obj/item/reagent_containers/chem_disp_cartridge/pineapple
 		)
 
 /obj/machinery/chemical_dispenser/bar_alc
@@ -130,11 +131,14 @@
 /obj/machinery/chemical_dispenser/bar_coffee/full
 	spawn_cartridges = list(
 			/obj/item/reagent_containers/chem_disp_cartridge/coffee,
+			/obj/item/reagent_containers/chem_disp_cartridge/drip_coffee,
 			/obj/item/reagent_containers/chem_disp_cartridge/cafe_latte,
 			/obj/item/reagent_containers/chem_disp_cartridge/soy_latte,
 			/obj/item/reagent_containers/chem_disp_cartridge/hot_coco,
 			/obj/item/reagent_containers/chem_disp_cartridge/milk,
 			/obj/item/reagent_containers/chem_disp_cartridge/cream,
+			/obj/item/reagent_containers/chem_disp_cartridge/milk_foam,
+			/obj/item/reagent_containers/chem_disp_cartridge/water,
 			/obj/item/reagent_containers/chem_disp_cartridge/sugar,
 			/obj/item/reagent_containers/chem_disp_cartridge/tea,
 			/obj/item/reagent_containers/chem_disp_cartridge/ice,
@@ -148,3 +152,34 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/chaitea,
 			/obj/item/reagent_containers/chem_disp_cartridge/decafchai
 		)
+
+/obj/machinery/chemical_dispenser/bar_syrup
+	name = "syrup dispenser"
+	desc = "Allow your customers to test your patience to the extremes."
+	icon_state = "syrup_dispenser"
+	ui_title = "Syrup Dispenser"
+	accept_drinking = 1
+
+/obj/machinery/chemical_dispenser/bar_syrup/full
+	spawn_cartridges = list(
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry,
+			/obj/item/reagent_containers/chem_disp_cartridge/grenadine,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
+		)

code/modules/reagents/machinery/dispenser/supply.dm

@@ -38,6 +38,16 @@
 	containername = "coffee dispenser crate"
 	group = "Reagents"
 
+/datum/supply_pack/syrup_dispenser
+	name = "Syrup dispenser"
+	contains = list(
+			/obj/machinery/chemical_dispenser/bar_syrup{anchored = FALSE}
+		)
+	cost = 25
+	containertype = /obj/structure/largecrate
+	containername = "Syrup dispenser crate"
+	group = "Reagents"
+
 /datum/supply_pack/reagents
 	name = "Chemistry dispenser refill"
 	contains = list(
@@ -123,7 +133,8 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/reagent_containers/chem_disp_cartridge/watermelon,
 			/obj/item/reagent_containers/chem_disp_cartridge/lemon,
-			/obj/item/reagent_containers/chem_disp_cartridge/grapesoda
+			/obj/item/reagent_containers/chem_disp_cartridge/grapesoda,
+			/obj/item/reagent_containers/chem_disp_cartridge/pineapple
 		)
 	cost = 50
 	containertype = /obj/structure/closet/crate
@@ -134,11 +145,14 @@
 	name = "Coffee machine dispenser refill"
 	contains = list(
 			/obj/item/reagent_containers/chem_disp_cartridge/coffee,
+			/obj/item/reagent_containers/chem_disp_cartridge/drip_coffee,
 			/obj/item/reagent_containers/chem_disp_cartridge/cafe_latte,
 			/obj/item/reagent_containers/chem_disp_cartridge/soy_latte,
 			/obj/item/reagent_containers/chem_disp_cartridge/hot_coco,
 			/obj/item/reagent_containers/chem_disp_cartridge/milk,
 			/obj/item/reagent_containers/chem_disp_cartridge/cream,
+			/obj/item/reagent_containers/chem_disp_cartridge/milk_foam,
+			/obj/item/reagent_containers/chem_disp_cartridge/water,
 			/obj/item/reagent_containers/chem_disp_cartridge/sugar,
 			/obj/item/reagent_containers/chem_disp_cartridge/tea,
 			/obj/item/reagent_containers/chem_disp_cartridge/ice,
@@ -148,13 +162,44 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/reagent_containers/chem_disp_cartridge/berry,
 			/obj/item/reagent_containers/chem_disp_cartridge/greentea,
-			/obj/item/reagent_containers/chem_disp_cartridge/decaf
+			/obj/item/reagent_containers/chem_disp_cartridge/decaf,
+			/obj/item/reagent_containers/chem_disp_cartridge/chaitea,
+			/obj/item/reagent_containers/chem_disp_cartridge/decafchai
 		)
 	cost = 50
 	containertype = /obj/structure/closet/crate
 	containername = "coffee drinks crate"
 	group = "Reagents"
 
+/datum/supply_pack/syrup_reagents
+	name = "Syrup machine dispenser refill"
+	contains = list(
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_irish,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_almond,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry,
+			/obj/item/reagent_containers/chem_disp_cartridge/grenadine,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint,
+			/obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday
+		)
+	cost = 50
+	containertype = /obj/structure/closet/crate
+	containername = "Syrup crate"
+	group = "Reagents"
+
 /datum/supply_pack/dispenser_cartridges
 	name = "Empty dispenser cartridges"
 	contains = list(

code/modules/reagents/reactions/instant/drinks.dm

@@ -82,6 +82,90 @@
 	required_reagents = list("ice" = 1, "coffee" = 2)
 	result_amount = 3
 
+/decl/chemical_reaction/instant/drinks/icecoffee/alt
+	name = "Iced Drip Coffee"
+	id = "icecoffee"
+	result = "icecoffee"
+	required_reagents = list("ice" = 1, "drip_coffee" = 2)
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/blackeye
+	name = "Black Eye Coffee"
+	id = "black_eye"
+	result = "black_eye"
+	required_reagents = list("drip_coffee" = 1, "coffee" = 1)
+	result_amount = 1
+
+/decl/chemical_reaction/instant/drinks/americano
+	name = "Americano"
+	id = "americano"
+	result = "americano"
+	required_reagents = list("water" = 1, "long_black" = 2)
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/long_black
+	name = "Long Black Coffee"
+	id = "long_black"
+	result = "long_black"
+	required_reagents = list("water" = 1, "coffee" = 1)
+	result_amount = 2
+
+/decl/chemical_reaction/instant/drinks/macchiato
+	name = "Macchiato"
+	id = "macchiato"
+	result = "macchiato"
+	required_reagents = list("milk" = 1, "coffee" = 2)
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/cortado
+	name = "Cortado"
+	id = "cortado"
+	result = "cortado"
+	required_reagents = list("macchiato" = 3, "milk_foam" = 1) // 2 coffee, 1 milk, 1 milk foam
+	result_amount = 4
+
+/decl/chemical_reaction/instant/drinks/breve
+	name = "Breve"
+	id = "breve"
+	result = "breve"
+	required_reagents = list("cortado" = 4, "cream" = 1) // 2 coffee, 1 milk, 1 milk foam, 1 cream
+	result_amount = 5
+
+/decl/chemical_reaction/instant/drinks/cappuccino
+	name = "Cappuccino"
+	id = "cappuccino"
+	result = "cappuccino"
+	required_reagents = list("milk" = 1, "milk_foam" = 1, "cortado" = 4) // 2 coffee, 2 milk, 2 milk foam
+	result_amount = 6
+
+/decl/chemical_reaction/instant/drinks/flat_white
+	name = "Flat White Coffee"
+	id = "flat_white"
+	result = "flat_white"
+	required_reagents = list("milk" = 2, "drip_coffee" = 1) // 2 drip coffee, 4 milk I'M SORRY THAT ITS DRIP COFFEE, otherwise it just gets in the way of all other reactions
+	result_amount = 3
+
+/decl/chemical_reaction/instant/drinks/mocha
+	name = "Mocha"
+	id = "mocha"
+	result = "mocha"
+	required_reagents = list("milk" = 1, "cream" = 1, "milk_foam" = 1, "hot_coco" = 2, "breve" = 5) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
+	result_amount = 10
+
+/decl/chemical_reaction/instant/drinks/mocha/alt //incase they use cream before milk
+	name = "Mocha"
+	id = "mocha"
+	result = "mocha"
+	required_reagents = list("cream" = 2, "hot_coco" = 2, "cappuccino" = 6) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco
+	result_amount = 10
+
+/decl/chemical_reaction/instant/drinks/vienna
+	name = "Vienna"
+	id = "vienna"
+	result = "vienna"
+	required_reagents = list("cream" = 2, "coffee" = 1)
+	result_amount = 3
+
 /decl/chemical_reaction/instant/drinks/nuka_cola
 	name = "Nuclear Cola"
 	id = "nuka_cola"
@@ -499,7 +583,7 @@
 	name = "Cafe Latte"
 	id = "cafe_latte"
 	result = "cafe_latte"
-	required_reagents = list("coffee" = 1, "milk" = 1)
+	required_reagents = list("flat_white" = 1, "milk" = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/drinks/acidspit

code/modules/reagents/reagents/_reagents.dm

@@ -33,6 +33,7 @@
 	var/cup_name = null
 	var/cup_desc = null
 	var/cup_center_of_mass = null
+	var/cup_prefix = null
 
 	var/color = "#000000"
 	var/color_weight = 1

code/modules/reagents/reagents/dispenser.dm

@@ -86,6 +86,7 @@
 	taste_description = "pure alcohol"
 	reagent_state = LIQUID
 	color = "#404030"
+	cup_prefix = "alcoholic"
 
 	ingest_met = REM * 2
 

code/modules/reagents/reagents/food_drinks.dm

@@ -271,6 +271,7 @@
 	id = "glucose"
 	taste_description = "sweetness"
 	color = "#FFFFFF"
+	cup_prefix = "sweetened"
 
 	injectable = 1
 
@@ -314,6 +315,7 @@
 	color = "#EDB91F"
 	taste_description = "cheese"
 	allergen_type = ALLERGEN_DAIRY //Cheese is made from dairy
+	cup_prefix = "cheesy"
 
 /datum/reagent/nutriment/protein/egg
 	name = "egg yolk"
@@ -321,6 +323,7 @@
 	taste_description = "egg"
 	color = "#FFFFAA"
 	allergen_type = ALLERGEN_EGGS //Eggs contain egg
+	cup_prefix = "eggy"
 
 /datum/reagent/nutriment/protein/murk
 	name = "murkfin protein"
@@ -343,6 +346,7 @@
 	taste_description = "sweetness"
 	nutriment_factor = 10
 	color = "#FFFF00"
+	cup_prefix = "honey"
 
 /datum/reagent/nutriment/honey/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -373,6 +377,7 @@
 	nutriment_factor = 10
 	color = "#FFFFFF"
 	allergen_type = ALLERGEN_EGGS	//Mayo is made from eggs
+	cup_prefix = "mayo"
 
 /datum/reagent/nutriment/yeast
 	name = "Yeast"
@@ -436,6 +441,7 @@
 	nutriment_factor = 5
 	color = "#302000"
 	allergen_type = ALLERGEN_CHOCOLATE
+	cup_prefix = "coco"
 
 /datum/reagent/nutriment/chocolate
 	name = "Chocolate"
@@ -446,6 +452,7 @@
 	nutriment_factor = 5
 	taste_mult = 1.3
 	allergen_type = ALLERGEN_CHOCOLATE
+	cup_prefix = "chocolate"
 
 /datum/reagent/nutriment/instantjuice
 	name = "Juice Powder"
@@ -461,6 +468,7 @@
 	description = "Dehydrated, powdered grape juice."
 	taste_description = "dry grapes"
 	color = "#863333"
+	cup_prefix = "grape"
 
 /datum/reagent/nutriment/instantjuice/orange
 	name = "Orange Juice Powder"
@@ -468,6 +476,7 @@
 	description = "Dehydrated, powdered orange juice."
 	taste_description = "dry oranges"
 	color = "#e78108"
+	cup_prefix = "orange"
 
 /datum/reagent/nutriment/instantjuice/watermelon
 	name = "Watermelon Juice Powder"
@@ -475,6 +484,7 @@
 	description = "Dehydrated, powdered watermelon juice."
 	taste_description = "dry sweet watermelon"
 	color = "#b83333"
+	cup_prefix = "melon"
 
 /datum/reagent/nutriment/instantjuice/apple
 	name = "Apple Juice Powder"
@@ -482,6 +492,7 @@
 	description = "Dehydrated, powdered apple juice."
 	taste_description = "dry sweet apples"
 	color = "#c07c40"
+	cup_prefix = "apple"
 
 /datum/reagent/nutriment/soysauce
 	name = "Soy Sauce"
@@ -493,6 +504,7 @@
 	nutriment_factor = 2
 	color = "#792300"
 	allergen_type = ALLERGEN_BEANS //Soy (beans)
+	cup_prefix = "umami"
 
 /datum/reagent/nutriment/vinegar
 	name = "Vinegar"
@@ -502,6 +514,7 @@
 	reagent_state = LIQUID
 	nutriment_factor = 5
 	color = "#54410C"
+	cup_prefix = "acidic"
 
 /datum/reagent/nutriment/ketchup
 	name = "Ketchup"
@@ -512,6 +525,7 @@
 	nutriment_factor = 5
 	color = "#731008"
 	allergen_type = ALLERGEN_FRUIT 	//Tomatoes are a fruit.
+	cup_prefix = "tomato"
 
 /datum/reagent/nutriment/mustard
 	name = "Mustard"
@@ -521,6 +535,7 @@
 	reagent_state = LIQUID
 	nutriment_factor = 5
 	color = "#E3BD00"
+	cup_prefix = "mustard"
 
 /datum/reagent/nutriment/barbecue
 	name = "Barbeque Sauce"
@@ -530,6 +545,7 @@
 	reagent_state = LIQUID
 	nutriment_factor = 5
 	color = "#4F330F"
+	cup_prefix = "barbecue"
 
 /datum/reagent/nutriment/rice
 	name = "Rice"
@@ -562,6 +578,7 @@
 	nutriment_factor = 30
 	color = "#4F3500"
 	allergen_type = ALLERGEN_SEEDS //Peanuts(seeds)
+	cup_prefix = "peanut butter"
 
 /datum/reagent/nutriment/vanilla
 	name = "Vanilla Extract"
@@ -572,6 +589,7 @@
 	reagent_state = LIQUID
 	nutriment_factor = 2
 	color = "#0F0A00"
+	cup_prefix = "vanilla"
 
 /datum/reagent/nutriment/durian
 	name = "Durian Paste"
@@ -618,6 +636,7 @@
 	taste_description = "sugar"
 	nutriment_factor = 1
 	color = "#FF00FF"
+	cup_prefix = "sprinkled"
 
 /datum/reagent/nutriment/mint
 	name = "Mint"
@@ -626,6 +645,7 @@
 	taste_description = "mint"
 	reagent_state = LIQUID
 	color = "#CF3600"
+	cup_prefix = "minty"
 
 /datum/reagent/lipozine // The anti-nutriment.
 	name = "Lipozine"
@@ -650,6 +670,7 @@
 	color = "#FFFFFF"
 	overdose = REAGENTS_OVERDOSE
 	ingest_met = REM
+	cup_prefix = "salty"
 
 /datum/reagent/sodiumchloride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -669,6 +690,7 @@
 	reagent_state = SOLID
 	ingest_met = REM
 	color = "#000000"
+	cup_prefix = "peppery"
 
 /datum/reagent/enzyme
 	name = "Universal Enzyme"
@@ -686,6 +708,7 @@
 	description = "An exotic blend of spices for cooking. Definitely not worms."
 	reagent_state = SOLID
 	color = "#e08702"
+	cup_prefix = "spicy"
 
 /datum/reagent/browniemix
 	name = "Brownie Mix"
@@ -759,6 +782,7 @@
 	reagent_state = LIQUID
 	ingest_met = REM
 	color = "#B31008"
+	cup_prefix = "hot"
 
 /datum/reagent/capsaicin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	if(alien == IS_DIONA)
@@ -798,6 +822,7 @@
 	touch_met = 50 // Get rid of it quickly
 	ingest_met = REM
 	color = "#B31008"
+	cup_prefix = "dangerously hot"
 
 /datum/reagent/condensedcapsaicin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	if(alien == IS_DIONA)
@@ -986,6 +1011,7 @@
 	glass_name = "banana juice"
 	glass_desc = "The raw essence of a banana. HONK!"
 	allergen_type = ALLERGEN_FRUIT //Bananas are fruit
+	cup_prefix = "banana"
 
 /datum/reagent/drink/juice/berry
 	name = "Berry Juice"
@@ -997,6 +1023,7 @@
 	glass_name = "berry juice"
 	glass_desc = "Berry juice. Or maybe it's jam. Who cares?"
 	allergen_type = ALLERGEN_FRUIT //Berries are fruit
+	cup_prefix = "berry"
 
 /datum/reagent/drink/juice/pineapple
 	name = "Pineapple Juice"
@@ -1008,6 +1035,7 @@
 	glass_name = "pineapple juice"
 	glass_desc = "Pineapple juice. Or maybe it's spineapple. Who cares?"
 	allergen_type = ALLERGEN_FRUIT //Pineapples are fruit
+	cup_prefix = "pineapple"
 
 /datum/reagent/drink/juice/carrot
 	name = "Carrot juice"
@@ -1019,6 +1047,7 @@
 	glass_name = "carrot juice"
 	glass_desc = "It is just like a carrot but without crunching."
 	allergen_type = ALLERGEN_VEGETABLE //Carrots are vegetables
+	cup_prefix = "carrot"
 
 /datum/reagent/drink/juice/carrot/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -1033,6 +1062,7 @@
 
 	glass_name = "lettuce juice"
 	glass_desc = "This is just lettuce water. Fresh but boring."
+	cup_prefix = "lettuce"
 
 /datum/reagent/drink/juice
 	name = "Grape Juice"
@@ -1045,6 +1075,7 @@
 	glass_name = "grape juice"
 	glass_desc = "It's grrrrrape!"
 	allergen_type = ALLERGEN_FRUIT //Grapes are fruit
+	cup_prefix = "grape"
 
 /datum/reagent/drink/juice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -1079,6 +1110,7 @@
 	glass_name = "lemon juice"
 	glass_desc = "Sour..."
 	allergen_type = ALLERGEN_FRUIT //Lemons are fruit
+	cup_prefix = "lemon"
 
 
 /datum/reagent/drink/juice/apple
@@ -1092,6 +1124,7 @@
 	glass_name = "apple juice"
 	glass_desc = "An earth favorite."
 	allergen_type = ALLERGEN_FRUIT //Apples are fruit
+	cup_prefix = "apple"
 
 /datum/reagent/drink/juice/lime
 	name = "Lime Juice"
@@ -1104,6 +1137,7 @@
 	glass_name = "lime juice"
 	glass_desc = "A glass of sweet-sour lime juice"
 	allergen_type = ALLERGEN_FRUIT //Limes are fruit
+	cup_prefix = "lime"
 
 /datum/reagent/drink/juice/lime/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -1121,6 +1155,7 @@
 	glass_name = "orange juice"
 	glass_desc = "Vitamins! Yay!"
 	allergen_type = ALLERGEN_FRUIT //Oranges are fruit
+	cup_prefix = "orange"
 
 /datum/reagent/drink/juice/orange/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -1138,6 +1173,7 @@
 
 	glass_name = "poison berry juice"
 	glass_desc = "A glass of deadly juice."
+	cup_prefix = "poison"
 
 /datum/reagent/drink/juice/potato
 	name = "Potato Juice"
@@ -1151,6 +1187,7 @@
 	glass_name = "potato juice"
 	glass_desc = "Juice from a potato. Bleh."
 	allergen_type = ALLERGEN_VEGETABLE //Potatoes are vegetables
+	cup_prefix = "potato"
 
 /datum/reagent/drink/juice/turnip
 	name = "Turnip Juice"
@@ -1164,6 +1201,7 @@
 	glass_name = "turnip juice"
 	glass_desc = "Juice of the turnip. A step below the potato."
 	allergen_type = ALLERGEN_VEGETABLE //Turnips are vegetables
+	cup_prefix = "turnip"
 
 /datum/reagent/drink/juice/tomato
 	name = "Tomato Juice"
@@ -1172,6 +1210,7 @@
 	taste_description = "tomatoes"
 	color = "#731008"
 	sugary = FALSE
+	cup_prefix = "tomato"
 
 	glass_name = "tomato juice"
 	glass_desc = "Are you sure this is tomato juice?"
@@ -1189,6 +1228,7 @@
 	description = "Delicious juice made from watermelon."
 	taste_description = "sweet watermelon"
 	color = "#B83333"
+	cup_prefix = "melon"
 
 	glass_name = "watermelon juice"
 	glass_desc = "Delicious juice made from watermelon."
@@ -1207,7 +1247,7 @@
 	glass_desc = "White and nutritious goodness!"
 
 	cup_icon_state = "cup_cream"
-	cup_name = "cup of milk"
+	cup_name = "milk"
 	cup_desc = "White and nutritious goodness!"
 	allergen_type = ALLERGEN_DAIRY //Milk is dairy
 
@@ -1219,7 +1259,7 @@
 	color = "#74533b"
 
 	cup_icon_state = "cup_brown"
-	cup_name = "cup of chocolate milk"
+	cup_name = "chocolate milk"
 	cup_desc = "Deliciously fattening!"
 
 	glass_name = "chocolate milk"
@@ -1254,7 +1294,7 @@
 	glass_desc = "Ewwww..."
 
 	cup_icon_state = "cup_cream"
-	cup_name = "cup of cream"
+	cup_name = "cream"
 	cup_desc = "Ewwww..."
 	allergen_type = ALLERGEN_DAIRY //Cream is dairy
 
@@ -1269,10 +1309,26 @@
 	glass_desc = "White and nutritious soy goodness!"
 
 	cup_icon_state = "cup_cream"
-	cup_name = "cup of milk"
+	cup_name = "milk"
 	cup_desc = "White and nutritious goodness!"
 	allergen_type = ALLERGEN_BEANS //Would be made from soy beans
 
+/datum/reagent/drink/milk/foam
+	name = "Milk Foam"
+	id = "milk_foam"
+	description = "Light and airy foamed milk."
+	taste_description = "airy milk"
+	color = "#eeebdf"
+
+	glass_name = "foam"
+	glass_desc = "Fluffy..."
+
+	cup_icon_state = "cup_cream"
+	cup_name = "foam"
+	cup_desc = "Fluffy..."
+	allergen_type = ALLERGEN_DAIRY //Cream is dairy
+
+
 /datum/reagent/drink/tea
 	name = "Tea"
 	id = "tea"
@@ -1288,7 +1344,7 @@
 	glass_desc = "Tasty black tea, it has antioxidants, it's good for you!"
 
 	cup_icon_state = "cup_tea"
-	cup_name = "cup of tea"
+	cup_name = "tea"
 	cup_desc = "Tasty black tea, it has antioxidants, it's good for you!"
 	allergen_type = ALLERGEN_STIMULANT //Black tea strong enough to have significant caffeine content
 
@@ -1310,7 +1366,7 @@
 	glass_name = "cup of decaf tea"
 	glass_desc = "Tasty black tea, it has antioxidants, it's good for you, and won't keep you up at night!"
 
-	cup_name = "cup of decaf tea"
+	cup_name = "decaf tea"
 	cup_desc = "Tasty black tea, it has antioxidants, it's good for you, and won't keep you up at night!"
 	allergen_type = null //Certified cat-safe!
 
@@ -1328,7 +1384,7 @@
 	glass_special = list(DRINK_ICE)
 
 	cup_icon_state = "cup_tea"
-	cup_name = "cup of iced tea"
+	cup_name = "iced tea"
 	cup_desc = "No relation to a certain rap artist/ actor."
 
 /datum/reagent/drink/tea/icetea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -1352,7 +1408,7 @@
 /datum/reagent/drink/tea/icetea/decaf
 	name = "Decaf Iced Tea"
 	glass_name = "decaf iced tea"
-	cup_name = "cup of decaf iced tea"
+	cup_name = "decaf iced tea"
 	id = "iceteadecaf"
 	adj_dizzy = 0
 	adj_drowsy = 0
@@ -1369,13 +1425,13 @@
 	glass_name = "mint tea"
 	glass_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
 
-	cup_name = "cup of mint tea"
+	cup_name = "mint tea"
 	cup_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
 
 /datum/reagent/drink/tea/minttea/decaf
 	name = "Decaf Mint Tea"
 	glass_name = "decaf mint tea"
-	cup_name = "cup of decaf mint tea"
+	cup_name = "decaf mint tea"
 	id = "mintteadecaf"
 	adj_dizzy = 0
 	adj_drowsy = 0
@@ -1392,14 +1448,14 @@
 	glass_name = "lemon tea"
 	glass_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
 
-	cup_name = "cup of lemon tea"
+	cup_name = "lemon tea"
 	cup_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
 	allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemon juice, still tea
 
 /datum/reagent/drink/tea/lemontea/decaf
 	name = "Decaf Lemon Tea"
 	glass_name = "decaf lemon tea"
-	cup_name = "cup of decaf lemon tea"
+	cup_name = "decaf lemon tea"
 	id = "lemonteadecaf"
 	adj_dizzy = 0
 	adj_drowsy = 0
@@ -1416,14 +1472,14 @@
 	glass_name = "lime tea"
 	glass_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
 
-	cup_name = "cup of lime tea"
+	cup_name = "lime tea"
 	cup_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
 	allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lime juice, still tea
 
 /datum/reagent/drink/tea/limetea/decaf
 	name = "Decaf Lime Tea"
 	glass_name = "decaf lime tea"
-	cup_name = "cup of decaf lime tea"
+	cup_name = "decaf lime tea"
 	id = "limeteadecaf"
 	adj_dizzy = 0
 	adj_drowsy = 0
@@ -1440,14 +1496,14 @@
 	glass_name = "orange tea"
 	glass_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
 
-	cup_name = "cup of orange tea"
+	cup_name = "orange tea"
 	cup_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
 	allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with orange juice, still tea
 
 /datum/reagent/drink/tea/orangetea/decaf
 	name = "Decaf orange Tea"
 	glass_name = "decaf orange tea"
-	cup_name = "cup of decaf orange tea"
+	cup_name = "decaf orange tea"
 	id = "orangeteadecaf"
 	adj_dizzy = 0
 	adj_drowsy = 0
@@ -1464,14 +1520,14 @@
 	glass_name = "berry tea"
 	glass_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
 
-	cup_name = "cup of berry tea"
+	cup_name = "berry tea"
 	cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
 	allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with berry juice, still tea
 
 /datum/reagent/drink/tea/berrytea/decaf
 	name = "Decaf Berry Tea"
 	glass_name = "decaf berry tea"
-	cup_name = "cup of decaf berry tea"
+	cup_name = "decaf berry tea"
 	id = "berryteadecaf"
 	adj_dizzy = 0
 	adj_drowsy = 0
@@ -1488,7 +1544,7 @@
 	glass_name = "green tea"
 	glass_desc = "A subtle blend of green tea. It's apparently good for you!"
 
-	cup_name = "cup of green tea"
+	cup_name = "green tea"
 	cup_desc = "A subtle blend of green tea. It's apparently good for you!"
 
 /datum/reagent/drink/tea/chaitea
@@ -1501,14 +1557,14 @@
 	glass_name = "chai tea"
 	glass_desc = "A milky tea spiced with cinnamon and cloves."
 
-	cup_name = "cup of chai tea"
+	cup_name = "chai tea"
 	cup_desc = "A milky tea spiced with cinnamon and cloves."
 	allergen_type = ALLERGEN_STIMULANT|ALLERGEN_DAIRY //Made with milk and tea.
 
 /datum/reagent/drink/tea/chaitea/decaf
 	name = "Decaf Chai Tea"
 	glass_name = "decaf chai tea"
-	cup_name = "cup of decaf chai tea"
+	cup_name = "decaf chai tea"
 	id = "chaiteadecaf"
 	adj_dizzy = 0
 	adj_drowsy = 0
@@ -1529,7 +1585,7 @@
 	overdose = 45
 
 	cup_icon_state = "cup_coffee"
-	cup_name = "cup of coffee"
+	cup_name = "coffee"
 	cup_desc = "Don't drop it, or you'll send scalding liquid and ceramic shards everywhere."
 
 	glass_name = "coffee"
@@ -1604,7 +1660,7 @@
 	glass_name = "soy latte"
 
 	cup_icon_state = "cup_latte"
-	cup_name = "cup of soy latte"
+	cup_name = "soy latte"
 	cup_desc = "A nice and refreshing beverage while you are reading."
 	allergen_type = ALLERGEN_COFFEE|ALLERGEN_BEANS 	//Soy(beans) and coffee
 
@@ -1624,7 +1680,7 @@
 	glass_desc = "A nice, strong and refreshing beverage while you are reading."
 
 	cup_icon_state = "cup_latte"
-	cup_name = "cup of cafe latte"
+	cup_name = "cafe latte"
 	cup_desc = "A nice and refreshing beverage while you are reading."
 	allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY //Cream and coffee
 
@@ -1642,7 +1698,7 @@
 	adj_temp = 25
 
 	cup_icon_state = "cup_coffee"
-	cup_name = "cup of decaf"
+	cup_name = "decaf"
 	cup_desc = "Basically just brown, bitter water."
 
 	glass_name = "decaf coffee"
@@ -1663,10 +1719,186 @@
 	glass_desc = "Made with love! And cocoa beans."
 
 	cup_icon_state = "cup_coco"
-	cup_name = "cup of hot chocolate"
+	cup_name = "hot chocolate"
 	cup_desc = "Made with love! And cocoa beans."
 	allergen_type = ALLERGEN_CHOCOLATE
 
+/datum/reagent/drink/coffee/blackeye
+	name = "Black Eye Coffee"
+	id = "black_eye"
+	description = "Coffee but with more coffee for that extra coffee kick."
+	taste_description = "very concentrated coffee"
+	color = "#241001"
+	adj_temp = 5
+
+	glass_desc = "Coffee but with more coffee for that extra coffee kick."
+	glass_name = "black eye coffee"
+
+	cup_icon_state = "cup_coffee"
+	cup_name = "black eye coffee"
+	cup_desc = "Coffee but with more coffee for that extra coffee kick."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/drip
+	name = "Drip Coffee"
+	id = "drip_coffee"
+	description = "Coffee made by soaking beans in hot water and allowing it seep through."
+	taste_description = "very concentrated coffee"
+	color = "#3d1a00"
+	adj_temp = 5
+
+	glass_desc = "Coffee made by soaking beans in hot water and allowing it seep through."
+	glass_name = "drip coffee"
+
+	cup_icon_state = "cup_coffee"
+	cup_name = "drip brewed coffee"
+	cup_desc = "Coffee made by soaking beans in hot water and allowing it seep through."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/americano
+	name = "Americano"
+	id = "americano"
+	description = "A traditional coffee that is more dilute and perfect for a gentle start to the day."
+	taste_description = "pleasant coffee"
+	color = "#6d3205"
+	adj_temp = 5
+
+	glass_desc = "A traditional coffee that is more dilute and perfect for a gentle start to the day."
+	glass_name = "americano"
+
+	cup_icon_state = "cup_coffee"
+	cup_name = "americano"
+	cup_desc = "A traditional coffee that is more dilute and perfect for a gentle start to the day."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/long_black
+	name = "Long Black Coffee"
+	id = "long_black"
+	description = "A traditional coffee with a little more kick."
+	taste_description = "modestly bitter coffee"
+	color = "#6d3205"
+	adj_temp = 5
+
+	glass_desc = "A traditional coffee with a little more kick."
+	glass_name = "long_black"
+
+	cup_icon_state = "cup_coffee"
+	cup_name = "long black coffee"
+	cup_desc = "A traditional coffee with a little more kick."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/macchiato
+	name = "Macchiato"
+	id = "macchiato"
+	description = "A coffee mixed with steamed milk, it has swirling patterns on top."
+	taste_description = "milky coffee"
+	color = "#ad5817"
+	adj_temp = 5
+
+	glass_desc = "A coffee mixed with steamed milk, it has swirling patterns on top."
+	glass_name = "macchiato"
+
+	cup_icon_state = "cup_latte"
+	cup_name = "macchiato"
+	cup_desc = "A coffee mixed with steamed milk, it has swirling patterns on top."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/cortado
+	name = "Cortado"
+	id = "cortado"
+	description = "Espresso mixed with equal parts milk and a layer of foam on top."
+	taste_description = "milky coffee"
+	color = "#ad5817"
+	adj_temp = 5
+
+	glass_desc = "Espresso mixed with equal parts milk and a layer of foam on top."
+	glass_name = "macchiato"
+
+	cup_icon_state = "cup_latte"
+	cup_name = "cortado"
+	cup_desc = "Espresso mixed with equal parts milk and a layer of foam on top."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/breve
+	name = "Breve"
+	id = "breve"
+	description = "Espresso topped with half-and-half, with a layer of foam on top."
+	taste_description = "creamy coffee"
+	color = "#d1905e"
+	adj_temp = 5
+
+	glass_desc = "Espresso topped with half-and-half, with a layer of foam on top."
+	glass_name = "breve"
+
+	cup_icon_state = "cup_cream"
+	cup_name = "breve"
+	cup_desc = "Espresso topped with half-and-half, with a layer of foam on top."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/cappuccino
+	name = "Cappuccino"
+	id = "cappuccino"
+	description = "Espresso with a large portion of milk and a hefty layer of foam."
+	taste_description = "classic coffee"
+	color = "#d1905e"
+	adj_temp = 5
+
+	glass_desc = "Espresso with a large portion of milk and a hefty layer of foam."
+	glass_name = "cappuccino"
+
+	cup_icon_state = "cup_cream"
+	cup_name = "cappuccino"
+	cup_desc = "Espresso with a large portion of milk and a hefty layer of foam."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/flat_white
+	name = "Flat White Coffee"
+	id = "flat_white"
+	description = "A very milky coffee that is particularly light and airy."
+	taste_description = "very milky coffee"
+	color = "#ed9f64"
+	adj_temp = 5
+
+	glass_desc = "A very milky coffee that is particularly light and airy."
+	glass_name = "flat_white"
+
+	cup_icon_state = "cup_latte"
+	cup_name = "flat white coffee"
+	cup_desc = "A very milky coffee that is particularly light and airy."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/mocha
+	name = "Mocha"
+	id = "mocha"
+	description = "A chocolate and coffee mix topped with a lot of milk and foam."
+	taste_description = "chocolatey coffee"
+	color = "#984201"
+	adj_temp = 5
+
+	glass_desc = "A chocolate and coffee mix topped with a lot of milk and foam."
+	glass_name = "mocha"
+
+	cup_icon_state = "cup_cream"
+	cup_name = "mocha"
+	cup_desc = "A chocolate and coffee mix topped with a lot of milk and foam."
+	allergen_type = ALLERGEN_COFFEE
+
+/datum/reagent/drink/coffee/vienna
+	name = "Vienna"
+	id = "vienna"
+	description = "A very sweet espresso topped with a lot of whipped cream."
+	taste_description = "super sweet and creamy coffee"
+	color = "#8e7059"
+	adj_temp = 5
+
+	glass_desc = "A very sweet espresso topped with a lot of whipped cream."
+	glass_name = "vienna"
+
+	cup_icon_state = "cup_cream"
+	cup_name = "vienna"
+	cup_desc = "A very sweet espresso topped with a lot of whipped cream."
+	allergen_type = ALLERGEN_COFFEE
+
 /datum/reagent/drink/soda/sodawater
 	name = "Soda Water"
 	id = "sodawater"
@@ -1676,6 +1908,7 @@
 	adj_dizzy = -5
 	adj_drowsy = -3
 	adj_temp = -5
+	cup_prefix = "fizzy"
 
 	glass_name = "soda water"
 	glass_desc = "Soda water. Why not make a scotch and soda?"
@@ -1688,6 +1921,7 @@
 	taste_description = "grape soda"
 	color = "#421C52"
 	adj_drowsy = -3
+	cup_prefix = "grape soda"
 
 	glass_name = "grape soda"
 	glass_desc = "Looks like a delicious drink!"
@@ -1700,6 +1934,7 @@
 	description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
 	taste_description = "tart and fresh"
 	color = "#619494"
+	cup_prefix = "tonic"
 
 	adj_dizzy = -5
 	adj_drowsy = -3
@@ -1716,6 +1951,7 @@
 	taste_description = "lemonade"
 	color = "#FFFF00"
 	adj_temp = -5
+	cup_prefix = "lemonade"
 
 	glass_name = "lemonade"
 	glass_desc = "Oh the nostalgia..."
@@ -1729,6 +1965,7 @@
 	taste_description = "watermelon"
 	color = "#FFB3BB"
 	adj_temp = -5
+	cup_prefix = "melonade"
 
 	glass_name = "melonade"
 	glass_desc = "Oh the.. nostalgia?"
@@ -1742,6 +1979,7 @@
 	taste_description = "apples"
 	color = "#FFD1B3"
 	adj_temp = -5
+	cup_prefix = "appleade"
 
 	glass_name = "appleade"
 	glass_desc = "Applejuice, improved."
@@ -1755,6 +1993,7 @@
 	taste_description = "sweet`n`sour pineapples"
 	color = "#FFFF00"
 	adj_temp = -5
+	cup_prefix = "pineappleade"
 
 	glass_name = "pineappleade"
 	glass_desc = "Pineapple, juiced up."
@@ -2537,6 +2776,192 @@
 	glass_special = list(DRINK_FIZZ)
 	allergen_type = ALLERGEN_FRUIT //made with several fruit juices
 
+/datum/reagent/drink/syrup
+	name = "syrup"
+	id = "syrup"
+	description = "A generic, sugary syrup."
+	taste_description = "sweetness"
+	color = "#fffbe8"
+	cup_prefix = "extra sweet"
+
+	glass_name = "syrup"
+	glass_desc = "That is just way too much syrup to drink on its own."
+	allergen_type = ALLERGEN_SUGARS
+
+	overdose = 45
+
+/datum/reagent/drink/syrup/overdose(var/mob/living/carbon/M, var/alien)
+	if(alien == IS_DIONA)
+		return
+	M.make_dizzy(1)
+
+/datum/reagent/drink/syrup/pumpkin
+	name = "pumpkin spice syrup"
+	id = "syrup_pumpkin"
+	description = "A sugary syrup that tastes of pumpkin spice."
+	taste_description = "pumpkin spice"
+	color = "#e0b439"
+	cup_prefix = "pumpkin spice"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
+
+/datum/reagent/drink/syrup/caramel
+	name = "caramel syrup"
+	id = "syrup_caramel"
+	description = "A sugary syrup that tastes of caramel."
+	taste_description = "caramel"
+	color = "#b47921"
+	cup_prefix = "caramel"
+
+/datum/reagent/drink/syrup/scaramel
+	name = "salted caramel syrup"
+	id = "syrup_salted_caramel"
+	description = "A sugary syrup that tastes of salted caramel."
+	taste_description = "salty caramel"
+	color = "#9f6714"
+	cup_prefix = "salted caramel"
+
+/datum/reagent/drink/syrup/irish
+	name = "irish cream syrup"
+	id = "syrup_irish"
+	description = "A sugary syrup that tastes of a light, sweet cream."
+	taste_description = "creaminess"
+	color = "#ead3b0"
+	cup_prefix = "irish"
+
+/datum/reagent/drink/syrup/almond
+	name = "almond syrup"
+	id = "syrup_almond"
+	description = "A sugary syrup that tastes of almonds."
+	taste_description = "almonds"
+	color = "#ffb64a"
+	cup_prefix = "almond"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_SEEDS
+
+/datum/reagent/drink/syrup/cinnamon
+	name = "cinnamon syrup"
+	id = "syrup_cinnamon"
+	description = "A sugary syrup that tastes of cinnamon."
+	taste_description = "cinnamon"
+	color = "#ec612a"
+	cup_prefix = "cinnamon"
+
+/datum/reagent/drink/syrup/pistachio
+	name = "pistachio syrup"
+	id = "syrup_pistachio"
+	description = "A sugary syrup that tastes of pistachio."
+	taste_description = "pistachio"
+	color = "#c9eb59"
+	cup_prefix = "pistachio"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_SEEDS
+
+/datum/reagent/drink/syrup/vanilla
+	name = "vanilla syrup"
+	id = "syrup_vanilla"
+	description = "A sugary syrup that tastes of vanilla."
+	taste_description = "vanilla"
+	color = "#eaebd1"
+	cup_prefix = "vanilla"
+
+/datum/reagent/drink/syrup/toffee
+	name = "toffee syrup"
+	id = "syrup_toffee"
+	description = "A sugary syrup that tastes of toffee."
+	taste_description = "toffee"
+	color = "#aa7143"
+	cup_prefix = "toffee"
+
+/datum/reagent/drink/syrup/cherry
+	name = "cherry syrup"
+	id = "syrup_cherry"
+	description = "A sugary syrup that tastes of cherries."
+	taste_description = "cherries"
+	color = "#ff0000"
+	cup_prefix = "cherry"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
+
+/datum/reagent/drink/syrup/butterscotch
+	name = "butterscotch syrup"
+	id = "syrup_butterscotch"
+	description = "A sugary syrup that tastes of butterscotch."
+	taste_description = "butterscotch"
+	color = "#e6924e"
+	cup_prefix = "butterscotch"
+
+/datum/reagent/drink/syrup/chocolate
+	name = "chocolate syrup"
+	id = "syrup_chocolate"
+	description = "A sugary syrup that tastes of chocolate."
+	taste_description = "chocolate"
+	color = "#873600"
+	cup_prefix = "chocolate"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE
+
+/datum/reagent/drink/syrup/wchocolate
+	name = "white chocolate syrup"
+	id = "syrup_white_chocolate"
+	description = "A sugary syrup that tastes of white chocolate."
+	taste_description = "white chocolate"
+	color = "#c4c6a5"
+	cup_prefix = "white chocolate"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE
+
+/datum/reagent/drink/syrup/strawberry
+	name = "strawberry syrup"
+	id = "syrup_strawberry"
+	description = "A sugary syrup that tastes of strawberries."
+	taste_description = "strawberries"
+	color = "#ff2244"
+	cup_prefix = "strawberry"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
+
+/datum/reagent/drink/syrup/coconut
+	name = "coconut syrup"
+	id = "syrup_coconut"
+	description = "A sugary syrup that tastes of coconut."
+	taste_description = "coconut"
+	color = "#ffffff"
+	cup_prefix = "coconut"
+
+	allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT
+
+/datum/reagent/drink/syrup/ginger
+	name = "ginger syrup"
+	id = "syrup_ginger"
+	description = "A sugary syrup that tastes of ginger."
+	taste_description = "ginger"
+	color = "#d09740"
+	cup_prefix = "ginger"
+
+/datum/reagent/drink/syrup/gingerbread
+	name = "gingerbread syrup"
+	id = "syrup_gingerbread"
+	description = "A sugary syrup that tastes of gingerbread."
+	taste_description = "gingerbread"
+	color = "#b6790f"
+	cup_prefix = "gingerbread"
+
+/datum/reagent/drink/syrup/peppermint
+	name = "peppermint syrup"
+	id = "syrup_peppermint"
+	description = "A sugary syrup that tastes of peppermint."
+	taste_description = "peppermint"
+	color = "#9ce06e"
+	cup_prefix = "peppermint"
+
+/datum/reagent/drink/syrup/birthday_cake
+	name = "birthday cake syrup"
+	id = "syrup_birthday"
+	description = "A sugary syrup that tastes of an overload of sweetness."
+	taste_description = "far too much sugar"
+	color = "#ff00e6"
+	cup_prefix = "birthday cake"
 
 /* Alcohol */