diff --git a/maplestation.dme b/maplestation.dme
index bbfd99311284..142c097604df 100644
--- a/maplestation.dme
+++ b/maplestation.dme
@@ -5708,6 +5708,7 @@
 #include "maplestation_modules\code\modules\vehicles\mecha\equipment\weapons\missile.dm"
 #include "maplestation_modules\code\modules\vehicles\mecha\equipment\weapons\ppc.dm"
 #include "maplestation_modules\code\modules\vending\_vending.dm"
+#include "maplestation_modules\code\modules\vending\clothesmate.dm"
 #include "maplestation_modules\code\modules\vending\wardrobes.dm"
 #include "maplestation_modules\story_content\albert_equipment\code\albertclothing.dm"
 #include "maplestation_modules\story_content\albert_equipment\code\albertitem.dm"
diff --git a/maplestation_modules/code/modules/cargo/packs.dm b/maplestation_modules/code/modules/cargo/packs.dm
index 547bc603a373..7a7ac169dbd9 100644
--- a/maplestation_modules/code/modules/cargo/packs.dm
+++ b/maplestation_modules/code/modules/cargo/packs.dm
@@ -221,3 +221,14 @@
 	access = ACCESS_SURGERY
 	contains = list(/obj/item/autosurgeon/only_on_damaged_organs/lungs)
 	crate_name = "autosurgeon crate"
+
+/datum/supply_pack/costumes_toys/ornithid_mask
+	name = "Ornithid Mask Crate"
+	desc = "A cheap bundle containing all kinds of Ornithid masks."
+	cost = PAYCHECK_COMMAND * 3 //300 cr, selling the crate back actually makes 284 cr
+	contains = list(
+		/obj/item/clothing/mask/breath/ornithid/cardinal,
+		/obj/item/clothing/mask/breath/ornithid/secretary,
+		/obj/item/clothing/mask/breath/ornithid/toucan,
+		/obj/item/clothing/mask/breath/ornithid/bluejay,
+	)
diff --git a/maplestation_modules/code/modules/vending/clothesmate.dm b/maplestation_modules/code/modules/vending/clothesmate.dm
new file mode 100644
index 000000000000..7fb9e771468c
--- /dev/null
+++ b/maplestation_modules/code/modules/vending/clothesmate.dm
@@ -0,0 +1,40 @@
+/obj/machinery/vending/clothing
+	added_categories = list(
+		list(
+			"name" = "Head",
+			"products" = list(
+				/obj/item/clothing/head/beret/greyscale_badge = 2,
+			),
+		),
+
+		list(
+			"name" = "Under",
+			"products" = list(
+				/obj/item/clothing/under/color/greyscale = 5,
+				/obj/item/clothing/under/color/jumpskirt/greyscale = 5,
+				/obj/item/clothing/under/spacer_turtleneck = 3,
+				/obj/item/clothing/under/spacer_turtleneck/plain = 3,
+				/obj/item/clothing/under/spacer_turtleneck/skirt = 3,
+				/obj/item/clothing/under/spacer_turtleneck/skirt/plain = 3,
+				/obj/item/clothing/under/arbitersuit = 2,
+				/obj/item/clothing/under/chesedsuit = 2,
+			),
+		),
+
+		list(
+			"name" = "Suits & Skirts",
+			"products" = list(
+				/obj/item/clothing/suit/toggle/flannel = 3,
+			),
+		),
+
+		list(
+			"name" = "Shoes",
+			"products" = list(
+				/obj/item/clothing/shoes/heels = 3,
+			),
+		),
+	)
+	added_premium = list(
+		/obj/item/clothing/shoes/heels/fancy = 2,
+	)