diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 81799f01115..821d65d183d 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -716,6 +716,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 8,
 					/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater = 15,
 					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,
+					/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 30,
 					/obj/item/weapon/reagent_containers/food/drinks/ice = 9)
 	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10)
 	vend_delay = 15
diff --git a/code/modules/reagents/reagent_containers/food/drinks/shotglass.dm b/code/modules/reagents/reagent_containers/food/drinks/shotglass.dm
new file mode 100644
index 00000000000..46289547909
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/food/drinks/shotglass.dm
@@ -0,0 +1,23 @@
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass
+	name = "shot glass"
+	desc = "No glasses were shot in the making of this glass."
+	icon_state = "shotglass"
+	amount_per_transfer_from_this = 15
+	volume = 15
+	materials = list(MAT_GLASS=100)
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
+	overlays.Cut()
+
+	if(reagents.total_volume)
+		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]1")
+		switch(reagents.total_volume)
+			if(0 to 4)		filling.icon_state = "[icon_state]1"
+			if(5 to 11) 	filling.icon_state = "[icon_state]5"
+			if(12 to INFINITY)	filling.icon_state = "[icon_state]12"
+
+		filling.icon += mix_color_from_reagents(reagents.reagent_list)
+		overlays += filling
+		name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
+	else
+		name = "shot glass"
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index d3b1cfa9977..36ba65a32e3 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index 7f14e7f2fe6..94e2f2e7d27 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ
diff --git a/paradise.dme b/paradise.dme
index deaf7fd35f4..5493536e2b0 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1817,6 +1817,7 @@
 #include "code\modules\reagents\reagent_containers\food\drinks\bottle.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\drinkingglass.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\jar.dm"
+#include "code\modules\reagents\reagent_containers\food\drinks\shotglass.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\bottle\robot.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\candy.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\meat.dm"