diff --git a/modular_pentest/master_files/code/modules/cargo/packs/costumes_toys.dm b/modular_pentest/master_files/code/modules/cargo/packs/costumes_toys.dm
index f5c2e4398e5..111d2f7682a 100644
--- a/modular_pentest/master_files/code/modules/cargo/packs/costumes_toys.dm
+++ b/modular_pentest/master_files/code/modules/cargo/packs/costumes_toys.dm
@@ -23,3 +23,18 @@
 					/obj/item/clothing/head/wizard/fake)
 	crate_name = "wizard costume crate"
 	crate_type = /obj/structure/closet/crate/wooden
+
+/datum/supply_pack/costumes_toys/wedding
+	name = "Wedding Outfit Crate"
+	desc = "Want to get married, like right now? This crate contains all the clothing you need to look presentable at the altar!"
+	cost = 750
+	contains = list(/obj/item/clothing/under/suit/tuxedo_pants,
+					/obj/item/clothing/suit/toggle/lawyer/tuxedo,
+					/obj/item/clothing/accessory/cummerbund,
+					/obj/item/clothing/shoes/laceup,
+					/obj/item/clothing/neck/bowtie,
+					/obj/item/clothing/suit/wedding_dress,
+					/obj/item/clothing/head/wedding_veil,
+					/obj/item/clothing/shoes/high_heels/white,
+					/obj/item/clothing/under/shorts/dolphin)
+	crate_name = "wedding outfit crate"
diff --git a/modular_pentest/master_files/code/modules/cargo/packs/machinery.dm b/modular_pentest/master_files/code/modules/cargo/packs/machinery.dm
index 442d61fcba6..969187473b0 100644
--- a/modular_pentest/master_files/code/modules/cargo/packs/machinery.dm
+++ b/modular_pentest/master_files/code/modules/cargo/packs/machinery.dm
@@ -20,6 +20,14 @@
 	crate_name = "wideband intercom crate"
 	crate_type = /obj/structure/closet/crate/engineering
 
+/datum/supply_pack/machinery/pendrobe
+	name = "PenDrobe Vending Machine Crate"
+	desc = "Need more clothes? Purchase this crate filled with supplies to have your own PenDrobe! (Iron, glass, and wires not included.)"
+	cost = 1000
+	contains = list(/obj/item/vending_refill/wardrobe/pentest,
+					/obj/item/circuitboard/machine/vending/wardrobe/pentest)
+	crate_name = "\improper PenDrobe vending machine crate"
+
 /*
 		RND Core machines
 */
diff --git a/modular_pentest/master_files/code/modules/cargo/packs/vendor_refill.dm b/modular_pentest/master_files/code/modules/cargo/packs/vendor_refill.dm
index cd94254f765..ae3c567ebcf 100644
--- a/modular_pentest/master_files/code/modules/cargo/packs/vendor_refill.dm
+++ b/modular_pentest/master_files/code/modules/cargo/packs/vendor_refill.dm
@@ -46,3 +46,10 @@
 	contains = list(/obj/item/vending_refill/wardrobe/sec_wardrobe,
 					/obj/item/vending_refill/wardrobe/det_wardrobe)
 	crate_name = "departmental supply crate"
+
+/datum/supply_pack/vendor_refill/pendrobe
+	name = "PenDrobe Supply Crate"
+	desc = "Need even MORE clothes? Get this PenDrobe refill now!"
+	cost = 500
+	contains = list(/obj/item/vending_refill/wardrobe/pentest)
+	crate_name = "\improper PenDrobe supply crate"
diff --git a/modular_pentest/modules/clothes/code/accessories.dm b/modular_pentest/modules/clothes/code/accessories.dm
new file mode 100644
index 00000000000..ca4fe77ab54
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/accessories.dm
@@ -0,0 +1,96 @@
+
+//colorables
+
+/obj/item/clothing/accessory/cummerbund
+	name = "cummerbund"
+	desc = "A neosilk cummerbund. Special material allows it to be reskinned, but only once."
+	icon = 'modular_pentest/modules/clothes/icons/obj/color_accessories.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/color_accessories.dmi'
+	icon_state = "cummerbund_black"
+	unique_reskin = list("black cummerbund" = "cummerbund_black",
+						"grey cummerbund" = "cummerbund_grey",
+						"blue cummerbund" = "cummerbund_blue",
+						"green cummerbund" = "cummerbund_green",
+						"orange cummerbund" = "cummerbund_orange",
+						"pink cummerbund" = "cummerbund_pink",
+						"red cummerbund" = "cummerbund_red",
+						"white cummerbund" = "cummerbund_white",
+						"yellow cummerbund" = "cummerbund_yellow",
+						"dark blue cummerbund" = "cummerbund_darkblue",
+						"teal cummerbund" = "cummerbund_teal",
+						"purple cummerbund" = "cummerbund_purple",
+						"dark green cummerbund" = "cummerbund_darkgreen",
+						"light brown cummerbund" = "cummerbund_lightbrown",
+						"brown cummerbund" = "cummerbund_brown",
+						"maroon cummerbund" = "cummerbund_maroon"
+						)
+	unique_reskin_changes_base_icon_state = TRUE
+	unique_reskin_changes_name = TRUE
+
+/obj/item/clothing/accessory/cummerbund/black
+	name = "black cummerbund"
+	icon_state = "cummerbund_black"
+
+/obj/item/clothing/accessory/cummerbund/grey
+	name = "grey cummerbund"
+	icon_state = "cummerbund_grey"
+
+/obj/item/clothing/accessory/cummerbund/blue
+	name = "blue cummerbund"
+	icon_state = "cummerbund_blue"
+
+/obj/item/clothing/accessory/cummerbund/green
+	name = "green cummerbund"
+	icon_state = "cummerbund_green"
+
+/obj/item/clothing/accessory/cummerbund/orange
+	name = "orange cummerbund"
+	icon_state = "cummerbund_orange"
+
+/obj/item/clothing/accessory/cummerbund/pink
+	name = "pink cummerbund"
+	icon_state = "cummerbund_pink"
+
+/obj/item/clothing/accessory/cummerbund/red
+	name = "red cummerbund"
+	icon_state = "cummerbund_red"
+
+/obj/item/clothing/accessory/cummerbund/white
+	name = "white cummerbund"
+	icon_state = "cummerbund_white"
+
+/obj/item/clothing/accessory/cummerbund/yellow
+	name = "yellow cummerbund"
+	icon_state = "cummerbund_yellow"
+
+/obj/item/clothing/accessory/cummerbund/darkblue
+	name = "dark blue cummerbund"
+	icon_state = "cummerbund_darkblue"
+
+/obj/item/clothing/accessory/cummerbund/teal
+	name = "teal cummerbund"
+	icon_state = "cummerbund_teal"
+
+/obj/item/clothing/accessory/cummerbund/red
+	name = "red cummerbund"
+	icon_state = "cummerbund_red"
+
+/obj/item/clothing/accessory/cummerbund/purple
+	name = "purple cummerbund"
+	icon_state = "cummerbund_purple"
+
+/obj/item/clothing/accessory/cummerbund/darkgreen
+	name = "dark green cummerbund"
+	icon_state = "cummerbund_darkgreen"
+
+/obj/item/clothing/accessory/cummerbund/lightbrown
+	name = "light brown cummerbund"
+	icon_state = "cummerbund_lightbrown"
+
+/obj/item/clothing/accessory/cummerbund/brown
+	name = "brown cummerbund"
+	icon_state = "cummerbund_brown"
+
+/obj/item/clothing/accessory/cummerbund/maroon
+	name = "maroon cummerbund"
+	icon_state = "cummerbund_maroon"
diff --git a/modular_pentest/modules/clothes/code/feet.dm b/modular_pentest/modules/clothes/code/feet.dm
new file mode 100644
index 00000000000..d0b1fee6f3e
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/feet.dm
@@ -0,0 +1,123 @@
+//custom shoes
+
+/obj/item/clothing/shoes/laceup/brown
+	name = "brown laceup shoes"
+	desc = "The height of fashion, and they're pre-polished! Now available in brown."
+	icon = 'modular_pentest/modules/clothes/icons/obj/feet.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/feet.dmi'
+	icon_state = "laceups_brown"
+
+/obj/item/clothing/shoes/laceup/white
+	name = "white laceup shoes"
+	desc = "The height of fashion, and they're pre-polished! Now available in white."
+	icon = 'modular_pentest/modules/clothes/icons/obj/feet.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/feet.dmi'
+	icon_state = "laceups_white"
+
+//colorables
+
+/obj/item/clothing/shoes/high_heels
+	name = "high heels"
+	icon_state = "highheels_black"
+	desc = "A pair of fashionable high heels."
+	icon = 'modular_pentest/modules/clothes/icons/obj/color_feet.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/color_feet.dmi'
+	unique_reskin = list("white high heels" = "highheels_white",
+						"grey high heels" = "highheels_grey",
+						"black high heels" = "highheels_black",
+						"red high heels" = "highheels_red",
+						"maroon high heels" = "highheels_maroon",
+						"orange high heels" = "highheels_orange",
+						"yellow high heels" = "highheels_yellow",
+						"green high heels" = "highheels_green",
+						"dark high heels" = "highheels_darkgreen",
+						"teal high heels" = "highheels_teal",
+						"blue high heels" = "highheels_blue",
+						"dark blue high heels" = "highheels_darkblue",
+						"purple high heels" = "highheels_purple",
+						"pink high heels" = "highheels_pink",
+						"brown high heels" = "highheels_brown",
+						"light brown high heels" = "highheels_lightbrown"
+						)
+	unique_reskin_changes_base_icon_state = TRUE
+	unique_reskin_changes_name = TRUE
+
+/obj/item/clothing/shoes/high_heels/white
+	name = "white high heels"
+	icon_state = "highheels_white"
+	current_skin = "white high heels"
+
+/obj/item/clothing/shoes/high_heels/grey
+	name = "grey high heels"
+	icon_state = "highheels_grey"
+	current_skin = "grey high heels"
+
+/obj/item/clothing/shoes/high_heels/black
+	name = "black high heels"
+	icon_state = "highheels_black"
+	current_skin = "black high heels"
+
+/obj/item/clothing/shoes/high_heels/red
+	name = "red high heels"
+	icon_state = "highheels_red"
+	current_skin = "red high heels"
+
+/obj/item/clothing/shoes/high_heels/maroon
+	name = "maroon high heels"
+	icon_state = "highheels_maroon"
+	current_skin = "maroon high heels"
+
+/obj/item/clothing/shoes/high_heels/orange
+	name = "orange high heels"
+	icon_state = "highheels_orange"
+	current_skin = "orange high heels"
+
+/obj/item/clothing/shoes/high_heels/yellow
+	name = "yellow high heels"
+	icon_state = "highheels_yellow"
+	current_skin = "yellow high heels"
+
+/obj/item/clothing/shoes/high_heels/green
+	name = "green high heels"
+	icon_state = "highheels_green"
+	current_skin = "green high heels"
+
+/obj/item/clothing/shoes/high_heels/darkgreen
+	name = "dark green high heels"
+	icon_state = "highheels_darkgreen"
+	current_skin = "dark green high heels"
+
+/obj/item/clothing/shoes/high_heels/teal
+	name = "teal high heels"
+	icon_state = "highheels_teal"
+	current_skin = "teal high heels"
+
+/obj/item/clothing/shoes/high_heels/blue
+	name = "blue high heels"
+	icon_state = "highheels_blue"
+	current_skin = "blue high heels"
+
+/obj/item/clothing/shoes/high_heels/darkblue
+	name = "dark blue high heels"
+	icon_state = "highheels_darkblue"
+	current_skin = "dark blue high heels"
+
+/obj/item/clothing/shoes/high_heels/purple
+	name = "purple high heels"
+	icon_state = "highheels_purple"
+	current_skin = "purple high heels"
+
+/obj/item/clothing/shoes/high_heels/pink
+	name = "pink high heels"
+	icon_state = "highheels_pink"
+	current_skin = "pink high heels"
+
+/obj/item/clothing/shoes/high_heels/brown
+	name = "brown high heels"
+	icon_state = "highheels_brown"
+	current_skin = "brown high heels"
+
+/obj/item/clothing/shoes/high_heels/lightbrown
+	name = "light brown high heels"
+	icon_state = "highheels_lightbrown"
+	current_skin = "light brown high heels"
diff --git a/modular_pentest/modules/clothes/code/hands.dm b/modular_pentest/modules/clothes/code/hands.dm
new file mode 100644
index 00000000000..0461049409f
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/hands.dm
@@ -0,0 +1,8 @@
+//custom gloves
+
+/obj/item/clothing/gloves/bunnycuffs
+	name = "detached cuffs"
+	desc = "A pair of cuffs without a shirt to belong to. A bit depressing, honestly."
+	icon = 'modular_pentest/modules/clothes/icons/obj/hands.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/hands.dmi'
+	icon_state = "bunnycuffs"
diff --git a/modular_pentest/modules/clothes/code/head.dm b/modular_pentest/modules/clothes/code/head.dm
new file mode 100644
index 00000000000..12f585748bf
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/head.dm
@@ -0,0 +1,119 @@
+//custom hats
+
+/obj/item/clothing/head/wedding_veil
+	name = "wedding veil"
+	desc = "A veil typically worn during marriage. Although, I guess you could wear it whenever, there's nothing stopping you."
+	icon = 'modular_pentest/modules/clothes/icons/obj/head.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/head.dmi'
+	icon_state = "wedding_veil"
+
+/obj/item/clothing/head/headband
+	name = "headband"
+	desc = "A headband. This one won't give you infinite ammo, though. It's not even the same type of headband, idiot."
+	icon = 'modular_pentest/modules/clothes/icons/obj/head.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/head.dmi'
+	icon_state = "headband"
+
+/obj/item/clothing/head/barrette
+	name = "barrette"
+	desc = "A small little hair clip. Theoretically, you could wear this if you're bald, but it would be super painful if you did."
+	icon = 'modular_pentest/modules/clothes/icons/obj/head.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/head.dmi'
+	icon_state = "barette"
+	w_class = WEIGHT_CLASS_TINY
+
+//colorables
+
+/obj/item/clothing/head/bunnyheadband
+	name = "bunny headband"
+	desc = "A headband styled to look like bunny ears. Might be offensive to those genetically modified with lagomorphic features."
+	icon = 'modular_pentest/modules/clothes/icons/obj/color_head.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/color_head.dmi'
+	icon_state = "bunnyheadband_black"
+	unique_reskin = list("black bunny headband" = "bunnyheadband_black",
+						"grey bunny headband" = "bunnyheadband_grey",
+						"blue bunny headband" = "bunnyheadband_blue",
+						"green bunny headband" = "bunnyheadband_green",
+						"orange bunny headband" = "bunnyheadband_orange",
+						"pink bunny headband" = "bunnyheadband_pink",
+						"red bunny headband" = "bunnyheadband_red",
+						"white bunny headband" = "bunnyheadband_white",
+						"yellow bunny headband" = "bunnyheadband_yellow",
+						"dark blue bunny headband" = "bunnyheadband_darkblue",
+						"teal bunny headband" = "bunnyheadband_teal",
+						"purple bunny headband" = "bunnyheadband_purple",
+						"dark green bunny headband" = "bunnyheadband_darkgreen",
+						"light brown bunny headband" = "bunnyheadband_lightbrown",
+						"brown bunny headband" = "bunnyheadband_brown",
+						"maroon bunny headband" = "bunnyheadband_maroon"
+						)
+	unique_reskin_changes_base_icon_state = TRUE
+	unique_reskin_changes_name = TRUE
+
+/obj/item/clothing/head/bunnyheadband/black
+	name = "black bunny headband"
+	icon_state = "bunnyheadband_black"
+
+/obj/item/clothing/head/bunnyheadband/grey
+	name = "grey bunny headband"
+	icon_state = "bunnyheadband_grey"
+
+/obj/item/clothing/head/bunnyheadband/blue
+	name = "blue bunny headband"
+	icon_state = "bunnyheadband_blue"
+
+/obj/item/clothing/head/bunnyheadband/green
+	name = "green bunny headband"
+	icon_state = "bunnyheadband_green"
+
+/obj/item/clothing/head/bunnyheadband/orange
+	name = "orange bunny headband"
+	icon_state = "bunnyheadband_orange"
+
+/obj/item/clothing/head/bunnyheadband/pink
+	name = "pink bunny headband"
+	icon_state = "bunnyheadband_pink"
+
+/obj/item/clothing/head/bunnyheadband/red
+	name = "red bunny headband"
+	icon_state = "bunnyheadband_red"
+
+/obj/item/clothing/head/bunnyheadband/white
+	name = "white bunny headband"
+	icon_state = "bunnyheadband_white"
+
+/obj/item/clothing/head/bunnyheadband/yellow
+	name = "yellow bunny headband"
+	icon_state = "bunnyheadband_yellow"
+
+/obj/item/clothing/head/bunnyheadband/darkblue
+	name = "dark blue bunny headband"
+	icon_state = "bunnyheadband_darkblue"
+
+/obj/item/clothing/head/bunnyheadband/teal
+	name = "teal bunny headband"
+	icon_state = "bunnyheadband_teal"
+
+/obj/item/clothing/head/bunnyheadband/red
+	name = "red bunny headband"
+	icon_state = "bunnyheadband_red"
+
+/obj/item/clothing/head/bunnyheadband/purple
+	name = "purple bunny headband"
+	icon_state = "bunnyheadband_purple"
+
+/obj/item/clothing/head/bunnyheadband/darkgreen
+	name = "dark green bunny headband"
+	icon_state = "bunnyheadband_darkgreen"
+
+/obj/item/clothing/head/bunnyheadband/lightbrown
+	name = "light brown bunny headband"
+	icon_state = "bunnyheadband_lightbrown"
+
+/obj/item/clothing/head/bunnyheadband/brown
+	name = "brown bunny headband"
+	icon_state = "bunnyheadband_brown"
+
+/obj/item/clothing/head/bunnyheadband/maroon
+	name = "maroon bunny headband"
+	icon_state = "bunnyheadband_maroon"
diff --git a/modular_pentest/modules/clothes/code/loadout.dm b/modular_pentest/modules/clothes/code/loadout.dm
new file mode 100644
index 00000000000..2f85112f38b
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/loadout.dm
@@ -0,0 +1,116 @@
+
+//neckwear
+
+/datum/gear/accessory/bowtie/recolorable
+	display_name = "bowtie, recolorable"
+	path = /obj/item/clothing/neck/bowtie
+
+//gloves
+
+/datum/gear/accessory/gloves/detachedcuffs
+	display_name = "detached cuffs"
+	path = /obj/item/clothing/gloves/bunnycuffs
+
+//masks
+
+/datum/gear/accessory/mask/ritualmask
+	display_name = "ritual mask"
+	path = /obj/item/clothing/mask/gas/ritual
+
+/datum/gear/accessory/mask/holeymask
+	display_name = "holey mask"
+	path = /obj/item/clothing/mask/gas/karukosa
+
+/datum/gear/accessory/mask/demonmask
+	display_name = "demon mask"
+	path = /obj/item/clothing/mask/gas/demonic
+
+/datum/gear/accessory/mask/kitonchumask
+	display_name = "kitonchu mask"
+	path = /obj/item/clothing/mask/gas/kitonchu
+
+/datum/gear/accessory/mask/drunkenridermask
+	display_name = "drunken rider mask"
+	path = /obj/item/clothing/mask/gas/drunken
+
+//actual accessories
+
+/datum/gear/accessory/cummerbund
+	display_name = "cummerbund"
+	path = /obj/item/clothing/accessory/cummerbund
+	slot = null
+
+//footwear
+
+/datum/gear/footwear/laceup/brown
+	display_name = "laceup shoes, brown"
+	path = /obj/item/clothing/shoes/laceup/brown
+
+/datum/gear/footwear/laceup/white
+	display_name = "laceup shoes, white"
+	path = /obj/item/clothing/shoes/laceup/white
+
+/datum/gear/footwear/highheels
+	display_name = "high heels, recolorable"
+	path = /obj/item/clothing/shoes/high_heels
+
+//hats
+
+/datum/gear/hat/headband
+	display_name = "headband"
+	path = /obj/item/clothing/head/headband
+
+/datum/gear/hat/barrette
+	display_name = "barrette"
+	path = /obj/item/clothing/head/barrette
+
+/datum/gear/hat/bunnyheadband
+	display_name = "bunny headband, recolorable"
+	path = /obj/item/clothing/head/bunnyheadband
+
+//suits
+
+/datum/gear/suit/jacket/tuxedo
+	display_name = "suit jacket, tuxedo"
+	path = /obj/item/clothing/suit/toggle/lawyer/tuxedo
+
+//uniform
+
+/datum/gear/uniform/suit/tuxedo
+	display_name = "suit, tuxedo"
+	path = /obj/item/clothing/under/suit/tuxedo
+
+/datum/gear/uniform/suit/tuxedo/pants
+	display_name = "suit, tuxedo pants"
+	path = /obj/item/clothing/under/suit/tuxedo_pants
+
+/datum/gear/uniform/suit/yamainu
+	display_name = "suit, designer burgundy"
+	path = /obj/item/clothing/under/suit/yamainu
+
+/datum/gear/uniform/fishypattern
+	display_name = "fishy patterned shirt"
+	path = /obj/item/clothing/under/fishypatternclothes
+
+/datum/gear/uniform/pants/jeans/big
+	display_name = "jeans, big"
+	path = /obj/item/clothing/under/bigjeans
+
+/datum/gear/uniform/chaps
+	subtype_path = /datum/gear/uniform/chaps
+
+/datum/gear/uniform/chaps/brown
+	display_name = "chaps, brown"
+	path = /obj/item/clothing/under/chaps/brown
+
+/datum/gear/uniform/chaps/black
+	display_name = "chaps, black"
+	path = /obj/item/clothing/under/chaps/black
+
+/datum/gear/uniform/chaps/pink
+	display_name = "chaps, pink"
+	path = /obj/item/clothing/under/chaps/pink
+
+/datum/gear/uniform/bunnysuit
+	display_name = "bunny suit, recolorable"
+	path = /obj/item/clothing/under/bunnysuit
diff --git a/modular_pentest/modules/clothes/code/mask.dm b/modular_pentest/modules/clothes/code/mask.dm
new file mode 100644
index 00000000000..e66c2245fc3
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/mask.dm
@@ -0,0 +1,36 @@
+//custom masks
+
+/obj/item/clothing/mask/gas/ritual
+	name = "ritual mask"
+	desc = "A spooky mask often used for occult rituals."
+	icon = 'modular_pentest/modules/clothes/icons/obj/mask.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/mask.dmi'
+	icon_state = "ritual"
+
+/obj/item/clothing/mask/gas/karukosa
+	name = "holey mask"
+	desc = "A mask that is said to bring out one's spiritual power... But does it really?"
+	icon = 'modular_pentest/modules/clothes/icons/obj/mask.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/mask.dmi'
+	icon_state = "karukosa"
+
+/obj/item/clothing/mask/gas/demonic
+	name = "demonic mask"
+	desc = "A mask that depicts a grinning red demon. It should probably see a dentist; teeth aren't supposed to be that yellow."
+	icon = 'modular_pentest/modules/clothes/icons/obj/mask.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/mask.dmi'
+	icon_state = "demon"
+
+/obj/item/clothing/mask/gas/kitonchu
+	name = "\improper Kitonchu mask"
+	desc = "A mask depicting Kitonchu from hit videogame franchise Legend of Pocketmons."
+	icon = 'modular_pentest/modules/clothes/icons/obj/mask.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/mask.dmi'
+	icon_state = "kitonchu"
+
+/obj/item/clothing/mask/gas/drunken
+	name = "\improper Drunken Rider mask"
+	desc = "A mask depicting Drunken Rider, the eponymous hero of a popular Martian tokusatsu show."
+	icon = 'modular_pentest/modules/clothes/icons/obj/mask.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/mask.dmi'
+	icon_state = "drunken"
diff --git a/modular_pentest/modules/clothes/code/neck.dm b/modular_pentest/modules/clothes/code/neck.dm
new file mode 100644
index 00000000000..8d3ef7eb1a4
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/neck.dm
@@ -0,0 +1,96 @@
+
+//colorables
+
+/obj/item/clothing/neck/bowtie
+	name = "bowtie"
+	desc = "A neosilk bowtie. Special material allows it to be reskinned, but only once."
+	icon = 'modular_pentest/modules/clothes/icons/obj/color_neck.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/color_neck.dmi'
+	icon_state = "bowtie_black"
+	unique_reskin = list("black bowtie" = "bowtie_black",
+						"grey bowtie" = "bowtie_grey",
+						"blue bowtie" = "bowtie_blue",
+						"green bowtie" = "bowtie_green",
+						"orange bowtie" = "bowtie_orange",
+						"pink bowtie" = "bowtie_pink",
+						"red bowtie" = "bowtie_red",
+						"white bowtie" = "bowtie_white",
+						"yellow bowtie" = "bowtie_yellow",
+						"dark blue bowtie" = "bowtie_darkblue",
+						"teal bowtie" = "bowtie_teal",
+						"purple bowtie" = "bowtie_purple",
+						"dark green bowtie" = "bowtie_darkgreen",
+						"light brown bowtie" = "bowtie_lightbrown",
+						"brown bowtie" = "bowtie_brown",
+						"maroon bowtie" = "bowtie_maroon"
+						)
+	unique_reskin_changes_base_icon_state = TRUE
+	unique_reskin_changes_name = TRUE
+
+/obj/item/clothing/neck/bowtie/black
+	name = "black bowtie"
+	icon_state = "bowtie_black"
+
+/obj/item/clothing/neck/bowtie/grey
+	name = "grey bowtie"
+	icon_state = "bowtie_grey"
+
+/obj/item/clothing/neck/bowtie/blue
+	name = "blue bowtie"
+	icon_state = "bowtie_blue"
+
+/obj/item/clothing/neck/bowtie/green
+	name = "green bowtie"
+	icon_state = "bowtie_green"
+
+/obj/item/clothing/neck/bowtie/orange
+	name = "orange bowtie"
+	icon_state = "bowtie_orange"
+
+/obj/item/clothing/neck/bowtie/pink
+	name = "pink bowtie"
+	icon_state = "bowtie_pink"
+
+/obj/item/clothing/neck/bowtie/red
+	name = "red bowtie"
+	icon_state = "bowtie_red"
+
+/obj/item/clothing/neck/bowtie/white
+	name = "white bowtie"
+	icon_state = "bowtie_white"
+
+/obj/item/clothing/neck/bowtie/yellow
+	name = "yellow bowtie"
+	icon_state = "bowtie_yellow"
+
+/obj/item/clothing/neck/bowtie/darkblue
+	name = "dark blue bowtie"
+	icon_state = "bowtie_darkblue"
+
+/obj/item/clothing/neck/bowtie/teal
+	name = "teal bowtie"
+	icon_state = "bowtie_teal"
+
+/obj/item/clothing/neck/bowtie/red
+	name = "red bowtie"
+	icon_state = "bowtie_red"
+
+/obj/item/clothing/neck/bowtie/purple
+	name = "purple bowtie"
+	icon_state = "bowtie_purple"
+
+/obj/item/clothing/neck/bowtie/darkgreen
+	name = "dark green bowtie"
+	icon_state = "bowtie_darkgreen"
+
+/obj/item/clothing/neck/bowtie/lightbrown
+	name = "light brown bowtie"
+	icon_state = "bowtie_lightbrown"
+
+/obj/item/clothing/neck/bowtie/brown
+	name = "brown bowtie"
+	icon_state = "bowtie_brown"
+
+/obj/item/clothing/neck/bowtie/maroon
+	name = "maroon bowtie"
+	icon_state = "bowtie_maroon"
diff --git a/modular_pentest/modules/clothes/code/suits.dm b/modular_pentest/modules/clothes/code/suits.dm
new file mode 100644
index 00000000000..92c3811a4b2
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/suits.dm
@@ -0,0 +1,15 @@
+//custom suits
+
+/obj/item/clothing/suit/toggle/lawyer/tuxedo
+	name = "tuxedo jacket"
+	desc = "Don't wear this with a regular suit, or the fashion police will be after you. This thing belongs ONLY to a tuxedo."
+	icon = 'modular_pentest/modules/clothes/icons/obj/suit.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/suit.dmi'
+	icon_state = "tuxedosuit"
+
+/obj/item/clothing/suit/wedding_dress
+	name = "wedding dress"
+	desc = "A nice dress to get married in. Or die in a horrific explosion in. It's 50/50 at this point."
+	icon = 'modular_pentest/modules/clothes/icons/obj/suit.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/suit.dmi'
+	icon_state = "wedding_dress"
diff --git a/modular_pentest/modules/clothes/code/under.dm b/modular_pentest/modules/clothes/code/under.dm
new file mode 100644
index 00000000000..7fa524bec36
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/under.dm
@@ -0,0 +1,179 @@
+//custom jumpsuits
+
+/obj/item/clothing/under/suit/tuxedo
+	name = "tuxedo"
+	desc = "A full-piece tuxedo suit for formal occasions."
+	icon = 'modular_pentest/modules/clothes/icons/obj/under.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/under.dmi'
+	icon_state = "tuxedo"
+
+/obj/item/clothing/under/suit/tuxedo_pants
+	name = "tuxedo pants"
+	desc = "The name's pants. Tuxedo pants."
+	icon = 'modular_pentest/modules/clothes/icons/obj/under.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/under.dmi'
+	icon_state = "tuxedopants"
+
+/obj/item/clothing/under/suit/yamainu
+	name = "designer burgundy suit"
+	desc = "A Waffle Corp brand designer suit. It fills you with an aura of discipline and hard work."
+	icon = 'modular_pentest/modules/clothes/icons/obj/under.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/under.dmi'
+	icon_state = "yamainu"
+
+/obj/item/clothing/under/fishypatternclothes
+	name = "fish patterned shirt"
+	desc = "A comfortable looking outfit with a fish patterned shirt over it."
+	icon = 'modular_pentest/modules/clothes/icons/obj/under.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/under.dmi'
+	icon_state = "fishy"
+
+/obj/item/clothing/under/bigjeans
+	name = "big jeans"
+	desc = "Holy fucking shit, these jeans are massive. You could probably use them as a tent, they're that big."
+	icon = 'modular_pentest/modules/clothes/icons/obj/under.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/under.dmi'
+	clothamnt = 6 //jeans are big, what can i say
+	body_parts_covered = CHEST|GROIN|LEGS
+	icon_state = "bigjeans"
+
+/obj/item/clothing/under/chaps
+	name = "chaps"
+	desc = "Chaps fit for a space cowboy."
+	icon = 'modular_pentest/modules/clothes/icons/obj/under.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/under.dmi'
+	icon_state = "brown_cowboychaps"
+
+/obj/item/clothing/under/chaps/brown
+	name = "brown cowboy chaps"
+	icon_state = "brown_cowboychaps"
+
+/obj/item/clothing/under/chaps/black
+	name = "black cowboy chaps"
+	desc = "Chaps fit for a dastardly space cowboy."
+	icon_state = "black_cowboychaps"
+
+/obj/item/clothing/under/chaps/pink
+	name = "pink cowboy chaps"
+	desc = "Chaps fit for a fabulous space cowboy."
+	icon_state = "pink_cowboychaps"
+
+//colorables
+
+/obj/item/clothing/under/bunnysuit
+	name = "bunny suit"
+	desc = "A bunny suit straight out of the magazines you keep hidden under the bed."
+	icon = 'modular_pentest/modules/clothes/icons/obj/color_under.dmi'
+	mob_overlay_icon = 'modular_pentest/modules/clothes/icons/mob/color_under.dmi'
+	icon_state = "bunnysuit_black"
+	alt_covers_chest = TRUE
+	body_parts_covered = CHEST|GROIN
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+	unique_reskin = list("black bunny suit" = "bunnysuit_black",
+						"grey bunny suit" = "bunnysuit_grey",
+						"blue bunny suit" = "bunnysuit_blue",
+						"green bunny suit" = "bunnysuit_green",
+						"orange bunny suit" = "bunnysuit_orange",
+						"pink bunny suit" = "bunnysuit_pink",
+						"red bunny suit" = "bunnysuit_red",
+						"white bunny suit" = "bunnysuit_white",
+						"yellow bunny suit" = "bunnysuit_yellow",
+						"dark blue bunny suit" = "bunnysuit_darkblue",
+						"teal bunny suit" = "bunnysuit_teal",
+						"purple bunny suit" = "bunnysuit_purple",
+						"dark green bunny suit" = "bunnysuit_darkgreen",
+						"light brown bunny suit" = "bunnysuit_lightbrown",
+						"brown bunny suit" = "bunnysuit_brown",
+						"maroon bunny suit" = "bunnysuit_maroon"
+						)
+	unique_reskin_changes_base_icon_state = TRUE
+	unique_reskin_changes_name = TRUE
+
+/obj/item/clothing/under/bunnysuit/verb/bunnysuit_adjust() // copying all this from clothing code but just doing minor changes to the actions because i guess there wasnt a third option for generic cases that arent rolling up sleeves or going shirtless with jumpsuits
+	set name = "Detach/Attach Tail"
+	set category = null
+	set src in usr
+	toggle_tailadjust()
+
+/obj/item/clothing/under/bunnysuit/proc/toggle_tailadjust()
+	if(!can_use(usr))
+		return FALSE
+	if(toggle_jumpsuit_adjust(ALT_STYLE))
+		to_chat(usr, span_notice("You detach the tail off your bunny suit."))
+	else
+		to_chat(usr, span_notice("You reattach the tail onto your bunny suit."))
+	if(ishuman(usr))
+		var/mob/living/carbon/human/H = usr
+		H.update_inv_w_uniform()
+		H.update_body()
+		return TRUE
+	return FALSE
+
+/obj/item/clothing/under/bunnysuit/black
+	name = "black bunny suit"
+	icon_state = "bunnysuit_black"
+
+/obj/item/clothing/under/bunnysuit/grey
+	name = "grey bunny suit"
+	icon_state = "bunnysuit_grey"
+	desc = "Is tiding sexy now?"
+
+/obj/item/clothing/under/bunnysuit/blue
+	name = "blue bunny suit"
+	icon_state = "bunnysuit_blue"
+
+/obj/item/clothing/under/bunnysuit/green
+	name = "green bunny suit"
+	icon_state = "bunnysuit_green"
+
+/obj/item/clothing/under/bunnysuit/orange
+	name = "orange bunny suit"
+	icon_state = "bunnysuit_orange"
+
+/obj/item/clothing/under/bunnysuit/pink
+	name = "pink bunny suit"
+	icon_state = "bunnysuit_pink"
+
+/obj/item/clothing/under/bunnysuit/red
+	name = "red bunny suit"
+	icon_state = "bunnysuit_red"
+
+/obj/item/clothing/under/bunnysuit/white
+	name = "white bunny suit"
+	icon_state = "bunnysuit_white"
+
+/obj/item/clothing/under/bunnysuit/yellow
+	name = "yellow bunny suit"
+	icon_state = "bunnysuit_yellow"
+
+/obj/item/clothing/under/bunnysuit/darkblue
+	name = "dark blue bunny suit"
+	icon_state = "bunnysuit_darkblue"
+
+/obj/item/clothing/under/bunnysuit/teal
+	name = "teal bunny suit"
+	icon_state = "bunnysuit_teal"
+
+/obj/item/clothing/under/bunnysuit/red
+	name = "red bunny suit"
+	icon_state = "bunnysuit_red"
+
+/obj/item/clothing/under/bunnysuit/purple
+	name = "purple bunny suit"
+	icon_state = "bunnysuit_purple"
+
+/obj/item/clothing/under/bunnysuit/darkgreen
+	name = "dark green bunny suit"
+	icon_state = "bunnysuit_darkgreen"
+
+/obj/item/clothing/under/bunnysuit/lightbrown
+	name = "light brown bunny suit"
+	icon_state = "bunnysuit_lightbrown"
+
+/obj/item/clothing/under/bunnysuit/brown
+	name = "brown bunny suit"
+	icon_state = "bunnysuit_brown"
+
+/obj/item/clothing/under/bunnysuit/maroon
+	name = "maroon bunny suit"
+	icon_state = "bunnysuit_maroon"
diff --git a/modular_pentest/modules/clothes/code/vendors.dm b/modular_pentest/modules/clothes/code/vendors.dm
new file mode 100644
index 00000000000..243cd697c7f
--- /dev/null
+++ b/modular_pentest/modules/clothes/code/vendors.dm
@@ -0,0 +1,53 @@
+
+//pendrobe
+
+/obj/machinery/vending/wardrobe/pentest
+	name = "PenDrobe"
+	desc = "A vending machine for clothing exclusive to this sector."
+	icon = 'modular_pentest/modules/clothes/icons/obj/vendor.dmi'
+	icon_state = "clothes"
+	icon_deny = "clothes-deny"
+	product_ads = "Be more stylish than the rest!"
+	vend_reply = "Thank you for using the PenDrobe!"
+	products = list(
+		/obj/item/clothing/shoes/laceup/brown = 2,
+		/obj/item/clothing/shoes/laceup/white = 2,
+		/obj/item/clothing/shoes/high_heels = 4,
+		/obj/item/clothing/head/headband = 4,
+		/obj/item/clothing/head/barrette = 4,
+		/obj/item/clothing/neck/bowtie = 9,
+		/obj/item/clothing/under/fishypatternclothes = 1,
+		/obj/item/clothing/under/bigjeans = 2,
+		/obj/item/clothing/under/chaps/brown = 2,
+		/obj/item/clothing/under/chaps/black = 2,
+		/obj/item/clothing/under/chaps/pink = 2,
+		/obj/item/clothing/under/bunnysuit = 2,
+		/obj/item/clothing/head/bunnyheadband = 2,
+		/obj/item/clothing/gloves/bunnycuffs = 2,
+		/obj/item/clothing/mask/gas/ritual = 2,
+		/obj/item/clothing/mask/gas/karukosa = 2,
+		/obj/item/clothing/mask/gas/demonic = 2,
+		/obj/item/clothing/mask/gas/kitonchu = 2,
+		/obj/item/clothing/mask/gas/drunken = 2)
+	premium = list(
+		/obj/item/clothing/under/suit/tuxedo = 2,
+		/obj/item/clothing/under/suit/tuxedo_pants = 2,
+		/obj/item/clothing/suit/toggle/lawyer/tuxedo = 2,
+		/obj/item/clothing/accessory/cummerbund = 4,
+		/obj/item/clothing/under/suit/yamainu = 1,
+		/obj/item/clothing/suit/wedding_dress = 2,
+		/obj/item/clothing/head/wedding_veil = 2)
+	refill_canister = /obj/item/vending_refill/wardrobe/pentest
+	default_price = 50
+	extra_price = 200
+	light_color = LIGHT_COLOR_BLUEGREEN
+
+/obj/item/vending_refill/wardrobe/pentest
+	machine_name = "PenDrobe"
+
+/obj/item/circuitboard/machine/vending/wardrobe/pentest
+	name = "PenDrobe (Machine Board)"
+	build_path = /obj/machinery/vending/wardrobe/pentest
+	req_components = list(
+		/obj/item/stack/sheet/glass = 1,
+		/obj/item/vending_refill/wardrobe/pentest = 1)
diff --git a/modular_pentest/modules/clothes/icons/mob/color_accessories.dmi b/modular_pentest/modules/clothes/icons/mob/color_accessories.dmi
new file mode 100644
index 00000000000..1c8dbd41a46
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/color_accessories.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/color_feet.dmi b/modular_pentest/modules/clothes/icons/mob/color_feet.dmi
new file mode 100644
index 00000000000..fc6ac49b34d
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/color_feet.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/color_head.dmi b/modular_pentest/modules/clothes/icons/mob/color_head.dmi
new file mode 100644
index 00000000000..735309aca2b
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/color_head.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/color_neck.dmi b/modular_pentest/modules/clothes/icons/mob/color_neck.dmi
new file mode 100644
index 00000000000..5e2c21cc31c
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/color_neck.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/color_under.dmi b/modular_pentest/modules/clothes/icons/mob/color_under.dmi
new file mode 100644
index 00000000000..f0e65ba40f9
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/color_under.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/feet.dmi b/modular_pentest/modules/clothes/icons/mob/feet.dmi
new file mode 100644
index 00000000000..9518c2c0a69
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/feet.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/hands.dmi b/modular_pentest/modules/clothes/icons/mob/hands.dmi
new file mode 100644
index 00000000000..11ecafbbc19
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/hands.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/head.dmi b/modular_pentest/modules/clothes/icons/mob/head.dmi
new file mode 100644
index 00000000000..2eaec89cda3
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/head.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/mask.dmi b/modular_pentest/modules/clothes/icons/mob/mask.dmi
new file mode 100644
index 00000000000..f20e0855e06
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/mask.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/suit.dmi b/modular_pentest/modules/clothes/icons/mob/suit.dmi
new file mode 100644
index 00000000000..9510b43ff28
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/suit.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/mob/under.dmi b/modular_pentest/modules/clothes/icons/mob/under.dmi
new file mode 100644
index 00000000000..495c549f46d
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/mob/under.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/color_accessories.dmi b/modular_pentest/modules/clothes/icons/obj/color_accessories.dmi
new file mode 100644
index 00000000000..aaf384c9375
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/color_accessories.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/color_feet.dmi b/modular_pentest/modules/clothes/icons/obj/color_feet.dmi
new file mode 100644
index 00000000000..a5e6a954fd6
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/color_feet.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/color_head.dmi b/modular_pentest/modules/clothes/icons/obj/color_head.dmi
new file mode 100644
index 00000000000..6883dfa1f94
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/color_head.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/color_neck.dmi b/modular_pentest/modules/clothes/icons/obj/color_neck.dmi
new file mode 100644
index 00000000000..a9bd92e9cc4
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/color_neck.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/color_under.dmi b/modular_pentest/modules/clothes/icons/obj/color_under.dmi
new file mode 100644
index 00000000000..5ae3885e3db
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/color_under.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/feet.dmi b/modular_pentest/modules/clothes/icons/obj/feet.dmi
new file mode 100644
index 00000000000..0352ea6130c
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/feet.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/hands.dmi b/modular_pentest/modules/clothes/icons/obj/hands.dmi
new file mode 100644
index 00000000000..71f2da55f1f
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/hands.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/head.dmi b/modular_pentest/modules/clothes/icons/obj/head.dmi
new file mode 100644
index 00000000000..7d5cb849bdf
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/head.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/mask.dmi b/modular_pentest/modules/clothes/icons/obj/mask.dmi
new file mode 100644
index 00000000000..9f48cbf8690
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/mask.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/suit.dmi b/modular_pentest/modules/clothes/icons/obj/suit.dmi
new file mode 100644
index 00000000000..0df0a28669b
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/suit.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/under.dmi b/modular_pentest/modules/clothes/icons/obj/under.dmi
new file mode 100644
index 00000000000..45e3fccda02
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/under.dmi differ
diff --git a/modular_pentest/modules/clothes/icons/obj/vendor.dmi b/modular_pentest/modules/clothes/icons/obj/vendor.dmi
new file mode 100644
index 00000000000..8d897886997
Binary files /dev/null and b/modular_pentest/modules/clothes/icons/obj/vendor.dmi differ
diff --git a/modular_pentest/modules/clothes/readme.md b/modular_pentest/modules/clothes/readme.md
new file mode 100644
index 00000000000..f9a80cdaf65
--- /dev/null
+++ b/modular_pentest/modules/clothes/readme.md
@@ -0,0 +1,68 @@
+<!-- This should be copy-pasted into the root of your module folder as readme.md -->
+
+https://github.com/PentestSS13/Pentest/pull/673
+
+## \<Clothes> <!--Title of your addition.-->
+
+Module ID: CLOTHES <!-- Uppercase, UNDERSCORE_CONNECTED name of your module, that you use to mark files. This is so people can case-sensitive search for your edits, if any. For example: CLOWN_OPS or XENOBIOLOGY -->
+
+### Description:
+
+Adds miscellaneous clothes that don't belong to any particular faction
+<!-- Here, describe what your PR does, what features it provides and any other directly useful information. -->
+
+### Shiptest Proc/File Changes:
+
+- N/A
+<!-- If you edited any core files directly (not through modular overrides), list them here. You should specify the exact files and what was changed.
+E.g:
+- `code/modules/mob/living.dm`: Added PENTEST EDIT tag for new behavior in `Life()` proc
+- `code/datums/shuttles.dm`: Added `skip_checks` var with PENTEST EDIT tag
+-->
+
+### Modular Overrides:
+
+- N/A
+<!-- If you added modular overrides in master_files, list them here. Code files should specify what procs/vars they override.
+E.g:
+- `modular_pentest/master_files/code/modules/mob/living/living.dm`: `proc/set_stat()`, added soft crit behavior
+- `modular_pentest/master_files/code/game/pentest_proc.dm`: `proc/get_proxy_attacker_for()`
+-->
+
+### Defines:
+
+- N/A
+<!-- If you needed to add defines, mention the files you added them to along with the names of the defines.
+Typically defines go in code/~PENTEST/, but in rare cases of load order issues they may need to go in code/__DEFINES/z_*.dm
+E.g:
+- `code/~PENTEST/clown_defines.dm`: `#define CLOWN_DAMAGE_MULT`, `#define HONK_COOLDOWN`
+- `code/__DEFINES/z_pentest_traits.dm`: `TRAIT_DEPRESSION`, `TRAIT_NIGHT_VISION` (only if load order requires it)
+-->
+
+### Map additions:
+
+- N/A
+<!-- If you have any map changes, they should go into the _maps folder with appropriate naming. List the map files here.
+E.g:
+- `_maps/shuttles/pentest/pentest_clownops.dmm`
+-->
+
+### Included files that are not contained in this module:
+
+- `modular_pentest/master_files/code/modules/cargo/packs/costumes_toys` - wedding outfit crate
+- `modular_pentest/master_files/code/modules/cargo/packs/machinery` - pendrobe vending machine crate
+- `modular_pentest/master_files/code/modules/cargo/packs/vendor_refill` - pendrobe supply crate
+<!-- List any files outside your module folder that are part of this change. This includes:
+- Assets (icons/sounds) shared with other modules
+- Files in other modular locations
+- Any TGUI interfaces
+E.g:
+- `tgui/packages/tgui/interfaces/ClownOpsConsole.js` - New TGUI interface
+- `modular_pentest/master_files/icons/mob/clown_mobs.dmi` - Shared icon file
+-->
+
+### Credits:
+
+secc
+zarathustra - revising stuff
+<!-- Credits to you, the coder, and in case of collaborative work or ports, credits to the original source of the code. -->
diff --git a/modular_pentest/~pentest.dme b/modular_pentest/~pentest.dme
index 36a8cbfe797..0c78a35fc00 100644
--- a/modular_pentest/~pentest.dme
+++ b/modular_pentest/~pentest.dme
@@ -274,6 +274,16 @@
 #include "modules\cult\code\narsie.dm"
 #include "modules\cult\code\shade.dm"
 #include "modules\cult\code\soulstone.dm"
+#include "modules\clothes\code\accessories.dm" //temporarily here for testmerge
+#include "modules\clothes\code\feet.dm"
+#include "modules\clothes\code\hands.dm"
+#include "modules\clothes\code\head.dm"
+#include "modules\clothes\code\loadout.dm"
+#include "modules\clothes\code\mask.dm"
+#include "modules\clothes\code\neck.dm"
+#include "modules\clothes\code\suits.dm"
+#include "modules\clothes\code\under.dm"
+#include "modules\clothes\code\vendors.dm" //temporarily here for testmerge
 #include "modules\custom_pets\code\custom_pets_init.dm"
 #include "modules\custom_pets\code\custom_pets_registry.dm"
 #include "modules\custom_pets\code\custom_pets_testing.dm"