diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index b5258eaeb27..5f3bf0c7a76 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -266,6 +266,13 @@
 	item_state = "cigpacket"
 	default_reagents = list("nicotine" = 15, "omnizine" = 15)
 
+/obj/item/weapon/storage/fancy/cigarettes/cigpack_med
+	name = "Medical Marijuana Packet"
+	desc = "A prescription packet containing six marijuana cigarettes."
+	icon_state = "medpacket"
+	item_state = "cigpacket"
+	default_reagents = list("space_drugs" = 15)
+
 /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift
 	name = "\improper Uplift Smooth packet"
 	desc = "Your favorite brand, now menthol flavored."
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 49e17ebe5ed..1afc9897b11 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -136,6 +136,9 @@
 	new /obj/item/clothing/suit/straight_jacket(src)
 	new /obj/item/weapon/reagent_containers/syringe(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/ether(src)
+	new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
+	new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
+	new /obj/item/weapon/storage/fancy/cigarettes/cigpack_med(src)
 	new /obj/item/weapon/storage/pill_bottle/psychiatrist(src)
 	new /obj/random/plushie(src)
 	for(var/i in 0 to 3)
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index 28c03c8b574..a0133e5b383 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ