diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 9330c8cdf5..574e1131aa 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -30,6 +30,10 @@
 	var/glass_name = null
 	var/glass_desc = null
 	var/glass_center_of_mass = null
+	var/cup_icon_state = null
+	var/cup_name = null
+	var/cup_desc = null
+	var/cup_center_of_mass = null
 	var/color = "#000000"
 	var/color_weight = 1
 
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 6c899d831a..80dc08fa78 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -503,6 +503,10 @@
 	glass_name = "glass of milk"
 	glass_desc = "White and nutritious goodness!"
 
+	cup_icon_state = "cup_cream"
+	cup_name = "cup of milk"
+	cup_desc = "White and nutritious goodness!"
+
 /datum/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
 	if(alien == IS_DIONA)
@@ -520,6 +524,10 @@
 	glass_name = "glass of cream"
 	glass_desc = "Ewwww..."
 
+	cup_icon_state = "cup_cream"
+	cup_name = "cup of cream"
+	cup_desc = "Ewwww..."
+
 /datum/reagent/drink/milk/soymilk
 	name = "Soy Milk"
 	id = "soymilk"
@@ -530,6 +538,10 @@
 	glass_name = "glass of soy milk"
 	glass_desc = "White and nutritious soy goodness!"
 
+	cup_icon_state = "cup_cream"
+	cup_name = "cup of milk"
+	cup_desc = "White and nutritious goodness!"
+
 /datum/reagent/drink/tea
 	name = "Tea"
 	id = "tea"
@@ -574,8 +586,12 @@
 	overdose = 45
 
 	glass_icon_state = "hot_coffee"
-	glass_name = "cup of coffee"
-	glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
+	glass_name = "mug of coffee"
+	glass_desc = "Don't drop it, or you'll send scalding liquid and porcelain shards everywhere."
+
+	cup_icon_state = "cup_coffee"
+	cup_name = "cup of coffee"
+	cup_desc = "Don't drop it, or you'll send scalding liquid and porcelain shards everywhere."
 
 /datum/reagent/drink/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	if(alien == IS_DIONA)
@@ -622,9 +638,13 @@
 
 	glass_icon_state = "soy_latte"
 	glass_name = "glass of soy latte"
-	glass_desc = "A nice and refrshing beverage while you are reading."
+	glass_desc = "A nice and refreshing beverage while you are reading."
 	glass_center_of_mass = list("x"=15, "y"=9)
 
+	cup_icon_state = "cup_latte"
+	cup_name = "cup of soy latte"
+	cup_desc = "A nice and refreshing beverage while you are reading."
+
 /datum/reagent/drink/coffee/soy_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
 	M.heal_organ_damage(0.5 * removed, 0)
@@ -641,6 +661,10 @@
 	glass_desc = "A nice, strong and refreshing beverage while you are reading."
 	glass_center_of_mass = list("x"=15, "y"=9)
 
+	cup_icon_state = "cup_latte"
+	cup_name = "cup of cafe latte"
+	cup_desc = "A nice and refreshing beverage while you are reading."
+
 /datum/reagent/drink/coffee/cafe_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
 	M.heal_organ_damage(0.5 * removed, 0)
@@ -658,6 +682,10 @@
 	glass_name = "glass of hot chocolate"
 	glass_desc = "Made with love! And cocoa beans."
 
+	cup_icon_state = "cup_coco"
+	cup_name = "cup of hot chocolate"
+	cup_desc = "Made with love! And cocoa beans."
+
 /datum/reagent/drink/sodawater
 	name = "Soda Water"
 	id = "sodawater"
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index c7f0f0a9fe..072a21f777 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -46,6 +46,45 @@
 			center_of_mass = list("x"=16, "y"=10)
 			return
 
+/obj/item/weapon/reagent_containers/food/drinks/cup
+	name = "coffee cup"
+	desc = "The container of oriental luxuries."
+	icon_state = "cup_empty"
+	amount_per_transfer_from_this = 5
+	volume = 30
+	center_of_mass = list("x"=16, "y"=16)
+
+	on_reagent_change()
+		if (reagents.reagent_list.len > 0)
+			var/datum/reagent/R = reagents.get_master_reagent()
+
+			if(R.cup_icon_state)
+				icon_state = R.cup_icon_state
+			else
+				icon_state = "cup_brown"
+
+			if(R.cup_name)
+				name = R.cup_name
+			else
+				name = "Cup of.. 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)
+
+		else
+			icon_state = "cup_empty"
+			name = "coffee cup"
+			desc = "The container of oriental luxuries."
+			center_of_mass = list("x"=16, "y"=16)
+			return
+
 // for /obj/machinery/vending/sovietsoda
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/soda
 	New()
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 5018b40300..a85c640d99 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ