diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm
index ab1df0b2abb7..d8e14b04cec4 100644
--- a/code/game/machinery/vending/vendor_types/medical.dm
+++ b/code/game/machinery/vending/vendor_types/medical.dm
@@ -653,6 +653,7 @@
 		list("Beaker (60 Units)", floor(scale * 3), /obj/item/reagent_container/glass/beaker, VENDOR_ITEM_REGULAR),
 		list("Beaker, Large (120 Units)", floor(scale * 3), /obj/item/reagent_container/glass/beaker/large, VENDOR_ITEM_REGULAR),
 		list("Box of Pill Bottles", floor(scale * 2), /obj/item/storage/box/pillbottles, VENDOR_ITEM_REGULAR),
+		list("Box of Pill Packets", floor(scale * 2), /obj/item/storage/box/pillbottles/pillpackets, VENDOR_ITEM_REGULAR),
 		list("Dropper", floor(scale * 3), /obj/item/reagent_container/dropper, VENDOR_ITEM_REGULAR),
 		list("Syringe", floor(scale * 7), /obj/item/reagent_container/syringe, VENDOR_ITEM_REGULAR)
 	)
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index a33d51bf618c..a245fb1d59ad 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -467,6 +467,19 @@
 	new /obj/item/storage/pill_bottle( src )
 	new /obj/item/storage/pill_bottle( src )
 
+/obj/item/storage/box/pillbottles/pillpackets
+	name = "box of pill packets"
+	desc = "it has pictures of pill packets on its front."
+	icon_state = "pillpacket_box"
+
+/obj/item/storage/box/pillbottles/pillpackets/fill_preset_inventory()
+	new /obj/item/storage/pill_bottle/packet( src )
+	new /obj/item/storage/pill_bottle/packet( src )
+	new /obj/item/storage/pill_bottle/packet( src )
+	new /obj/item/storage/pill_bottle/packet( src )
+	new /obj/item/storage/pill_bottle/packet( src )
+	new /obj/item/storage/pill_bottle/packet( src )
+	new /obj/item/storage/pill_bottle/packet( src )
 
 /obj/item/storage/box/snappops
 	name = "snap pop box"
diff --git a/code/modules/reagents/chemistry_machinery/chem_master.dm b/code/modules/reagents/chemistry_machinery/chem_master.dm
index 9ab8d81066e0..02be0bf44ba9 100644
--- a/code/modules/reagents/chemistry_machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry_machinery/chem_master.dm
@@ -14,6 +14,7 @@
 	var/vial_maker = FALSE
 	var/obj/item/reagent_container/beaker = null
 	var/obj/item/storage/pill_bottle/loaded_pill_bottle = null
+	var/is_packet = FALSE
 	var/mode = 0
 	var/condi = 0
 	var/useramount = 30 // Last used amount
@@ -86,7 +87,14 @@
 
 		loaded_pill_bottle = B
 		user.drop_inv_item_to_loc(B, src)
-		to_chat(user, SPAN_NOTICE("You add the pill bottle into the dispenser slot!"))
+		if(istype(B, /obj/item/storage/pill_bottle/packet))
+			is_packet = TRUE
+			pillamount = 4
+			to_chat(user, SPAN_NOTICE("You add the pill packet into the dispenser slot!"))
+
+		else
+			is_packet = FALSE
+			to_chat(user, SPAN_NOTICE("You add the pill bottle into the dispenser slot!"))
 		updateUsrDialog()
 	return
 
@@ -124,6 +132,7 @@
 			loaded_pill_bottle.forceMove(loc)
 
 		loaded_pill_bottle = null
+		pillamount = 16
 
 	// Adding a name to the currently stored pill bottle
 	if(href_list["addlabelp"])
@@ -149,6 +158,11 @@
 		if(!Adjacent(usr))
 			return
 
+		if(is_packet)
+			to_chat(user, SPAN_WARNING("You cannot change the color of pill packets."))
+			updateUsrDialog()
+			return
+
 		loaded_pill_bottle.choose_color()
 
 	else if(href_list["close"])
diff --git a/icons/obj/items/storage.dmi b/icons/obj/items/storage.dmi
index ff702586e16b..2b2adfa88d6c 100644
Binary files a/icons/obj/items/storage.dmi and b/icons/obj/items/storage.dmi differ