diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
index 17d60feab4b..680c32c7e01 100644
--- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
@@ -10,6 +10,22 @@
 	light_color = LIGHT_COLOR_LIGHTBLUE
 	resistance_flags = FLAMMABLE
 
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace
+	name = "bluespace shot glass"
+	desc = "For when you need to make the Bartender's life extra hell."
+	amount_per_transfer_from_this = 50
+	volume = 50
+	icon_state = "bluespaceshotglass"
+
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace/update_name()
+	. = ..()
+	if(reagents.total_volume)
+		name = "bluespace 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.
+		if(resistance_flags & ON_FIRE)
+			name = "flaming [name]"
+	else
+		name = "bluespace shot glass"
+
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
 	if(!isShotFlammable() && (resistance_flags & ON_FIRE))
 		extinguish()
diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm
index 504991597b9..8c94a2492ea 100644
--- a/code/modules/research/designs/bluespace_designs.dm
+++ b/code/modules/research/designs/bluespace_designs.dm
@@ -90,3 +90,13 @@
 	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500, MAT_SILVER = 3000)
 	build_path = /obj/item/rpd/bluespace
 	category = list("Bluespace")
+
+/datum/design/bluespaceshotglass
+	name = "Bluespace Shot Glass"
+	desc = "For when you need to make the Bartender's life extra hell."
+	req_tech = list("bluespace" = 5, "materials" = 3, "plasmatech" = 4)
+	id = "bluespaceshotglass"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1000, MAT_BLUESPACE = 500)
+	build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace
+	category = list("Bluespace")
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 768024f9193..83954bf057c 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ