diff --git a/code/datums/outfits/_defines.dm b/code/datums/outfits/_defines.dm
index d105fc0ebc..ae07595c50 100644
--- a/code/datums/outfits/_defines.dm
+++ b/code/datums/outfits/_defines.dm
@@ -1,3 +1,7 @@
 #define OUTFIT_HAS_JETPACK       1
 #define OUTFIT_HAS_BACKPACK      2
 #define OUTFIT_EXTENDED_SURVIVAL 4
+
+#define OUTFIT_JOB_NAME(job_name) ("Job - " + job_name)
+#define OUTFIT_MILITARY(job_name) ("Military Uniform - " + job_name)
+#define OUTFIT_COSTUME(job_name) ("Costume - " + job_name)
\ No newline at end of file
diff --git a/code/datums/outfits/costumes/costume.dm b/code/datums/outfits/costumes/costume.dm
new file mode 100644
index 0000000000..2e6167ee73
--- /dev/null
+++ b/code/datums/outfits/costumes/costume.dm
@@ -0,0 +1,2 @@
+/decl/hierarchy/outfit/costume
+	undress = 0
\ No newline at end of file
diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm
index 2b8f6d7447..36659e2141 100644
--- a/code/datums/outfits/costumes/halloween.dm
+++ b/code/datums/outfits/costumes/halloween.dm
@@ -1,5 +1,5 @@
-/decl/hierarchy/outfit/h_masked_killer
-	name = "Costume - Masked Killer"
+/decl/hierarchy/outfit/costume/masked_killer
+	name = OUTFIT_COSTUME("Masked Killer")
 	uniform = /obj/item/clothing/under/overalls
 	shoes = /obj/item/clothing/shoes/white
 	gloves = /obj/item/clothing/gloves/sterile/latex
@@ -8,20 +8,20 @@
 	suit = /obj/item/clothing/suit/storage/apron
 	r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam
 
-/decl/hierarchy/outfit/masked_killer/post_equip(var/mob/living/carbon/human/H)
+/decl/hierarchy/outfit/costume/masked_killer/post_equip(var/mob/living/carbon/human/H)
 	var/victim = get_mannequin(H.ckey)
 	for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
 		carried_item.add_blood(victim) //Oh yes, there will be blood.. just not blood from the killer because that's odd. //If I knew how to make fake blood, I would
 
-/decl/hierarchy/outfit/h_professional
-	name = "Costume - Professional"
+/decl/hierarchy/outfit/costume/professional
+	name = OUTFIT_COSTUME("Professional")
 	uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) }
 	shoes = /obj/item/clothing/shoes/black
 	gloves = /obj/item/clothing/gloves/black
 	glasses = /obj/item/clothing/glasses/fakesunglasses
 	l_pocket = /obj/item/toy/sword
 
-/decl/hierarchy/outfit/h_professional/post_equip(var/mob/living/carbon/human/H)
+/decl/hierarchy/outfit/costume/professional/post_equip(var/mob/living/carbon/human/H)
 	var/obj/item/weapon/storage/briefcase/new_briefcase = new(H)
 	for(var/obj/item/briefcase_item in new_briefcase)
 		qdel(briefcase_item)
@@ -30,9 +30,9 @@
 	new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat
 	H.equip_to_slot_or_del(new_briefcase, slot_l_hand)
 
-/decl/hierarchy/outfit/h_horrorcop
-	name = "Costume - Slasher Movie Cop"
-	uniform = /obj/item/clothing/under/pcrc{ starting_accessories=list(/obj/item/clothing/accessory/holster) }
+/decl/hierarchy/outfit/costume/horrorcop
+	name = OUTFIT_COSTUME("Slasher Movie Cop")
+	uniform = /obj/item/clothing/under/pcrc{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) }
 	shoes = /obj/item/clothing/shoes/black
 	gloves = /obj/item/clothing/gloves/black
 	glasses = /obj/item/clothing/glasses/fakesunglasses
@@ -40,7 +40,7 @@
 	head = /obj/item/clothing/head/beret
 	r_hand = /obj/item/weapon/gun/projectile/revolver/capgun
 
-/decl/hierarchy/outfit/h_horrorcop/post_equip(var/mob/living/carbon/human/H)
+/decl/hierarchy/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H)
 	var/obj/item/clothing/under/U = H.w_uniform
 	if(U.accessories.len)
 		for(var/obj/item/clothing/accessory/A in U.accessories)
@@ -48,16 +48,16 @@
 				var/obj/item/clothing/accessory/holster/O = A
 				O.holster_verb()
 
-/decl/hierarchy/outfit/h_cowboy
-	name = "Costume - Cowboy"
-	uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/holster) }
+/decl/hierarchy/outfit/costume/cowboy
+	name = OUTFIT_COSTUME("Cowboy")
+	uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/holster/hip) }
 	shoes = /obj/item/clothing/shoes/boots/cowboy
 	head = /obj/item/clothing/head/cowboy_hat
 	gloves = /obj/item/clothing/gloves/fingerless
 	suit = /obj/item/clothing/accessory/poncho
 	r_hand = /obj/item/weapon/gun/projectile/revolver/capgun
 
-/decl/hierarchy/outfit/h_cowboy/post_equip(var/mob/living/carbon/human/H)
+/decl/hierarchy/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H)
 	var/obj/item/clothing/under/U = H.w_uniform
 	if(U.accessories.len)
 		for(var/obj/item/clothing/accessory/A in U.accessories)
@@ -65,8 +65,8 @@
 				var/obj/item/clothing/accessory/holster/O = A
 				O.holster_verb()
 
-/decl/hierarchy/outfit/h_lumberjack
-	name = "Costume - Lumberjack"
+/decl/hierarchy/outfit/costume/lumberjack
+	name = OUTFIT_COSTUME("Lumberjack")
 	uniform = /obj/item/clothing/under/pants{ starting_accessories=list(/obj/item/clothing/accessory/sweater/blackneck) }
 	shoes = /obj/item/clothing/shoes/boots/workboots
 	head = /obj/item/clothing/head/beanie
@@ -74,8 +74,8 @@
 	suit = /obj/item/clothing/suit/storage/flannel/red
 	r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam
 
-/decl/hierarchy/outfit/h_firefighter
-	name = "Costume - Firefighter"
+/decl/hierarchy/outfit/costume/firefighter
+	name = OUTFIT_COSTUME("Firefighter")
 	uniform = /obj/item/clothing/under/pants
 	shoes = /obj/item/clothing/shoes/boots/workboots
 	head = /obj/item/clothing/head/hardhat/red
@@ -83,22 +83,22 @@
 	suit = /obj/item/clothing/suit/fire/firefighter
 	mask = /obj/item/clothing/mask/gas
 
-/decl/hierarchy/outfit/h_highlander
-	name = "Costume - Highlander"
+/decl/hierarchy/outfit/costume/highlander
+	name = OUTFIT_COSTUME("Highlander")
 	uniform = /obj/item/clothing/under/kilt
 	shoes = /obj/item/clothing/shoes/boots/jackboots
 	head = /obj/item/clothing/head/beret
 	r_hand = /obj/item/weapon/material/sword/foam
 
-/decl/hierarchy/outfit/h_vampire
-	name = "Costume - Vampire"
+/decl/hierarchy/outfit/costume/vampire
+	name = OUTFIT_COSTUME("Vampire")
 	uniform = /obj/item/clothing/under/suit_jacket/really_black
 	shoes = /obj/item/clothing/shoes/dress
 	gloves = /obj/item/clothing/gloves/white
 	r_hand = /obj/item/weapon/bedsheet/red
 
-/decl/hierarchy/outfit/h_vampire_hunter
-	name = "Costume - Vampire Hunter"
+/decl/hierarchy/outfit/costume/vampire_hunter
+	name = OUTFIT_COSTUME("Vampire Hunter")
 	uniform = /obj/item/clothing/under/pants/tan
 	suit = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
 	shoes = /obj/item/clothing/shoes/boots/jackboots
@@ -106,16 +106,16 @@
 	l_pocket = /obj/item/toy/crossbow
 	r_pocket = /obj/item/device/flashlight/color/red
 
-/decl/hierarchy/outfit/h_pirate
-	name = "Costume - Pirate"
+/decl/hierarchy/outfit/costume/pirate
+	name = OUTFIT_COSTUME("Pirate")
 	uniform = /obj/item/clothing/under/pirate
 	shoes = /obj/item/clothing/shoes/brown
 	head = /obj/item/clothing/head/pirate
 	suit = /obj/item/clothing/suit/pirate
 	glasses = /obj/item/clothing/glasses/eyepatch
 
-/decl/hierarchy/outfit/h_whiteout
-	name = "Costume - Snow Ghost"
+/decl/hierarchy/outfit/costume/whiteout
+	name = OUTFIT_COSTUME("Snow Ghost")
 	uniform = /obj/item/clothing/under/color/white{ starting_accessories=list(/obj/item/clothing/accessory/scarf/white) }
 	shoes = /obj/item/clothing/shoes/white
 	suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout
diff --git a/code/datums/outfits/jobs/_defines.dm b/code/datums/outfits/jobs/_defines.dm
deleted file mode 100644
index e4bdd05fbb..0000000000
--- a/code/datums/outfits/jobs/_defines.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-#define OUTFIT_JOB_NAME(job_name) ("Job - " + job_name)
-#define OUTFIT_MILITARY(job_name) ("Military Uniform - " + job_name)
\ No newline at end of file
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 93ea518df1..e69e9eb705 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -57,6 +57,8 @@ var/list/outfits_decls_by_type_
 
 	var/flags // Specific flags
 
+	var/undress = 1	//Does the outfit undress the mob upon equp?
+
 /decl/hierarchy/outfit/New()
 	..()
 
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 24f5669618..981d5c7b7b 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -408,10 +408,10 @@
 	feedback_add_details("admin_verb","SEQ")
 	dressup_human(H, outfit, 1)
 
-/proc/dressup_human(var/mob/living/carbon/human/H, var/decl/hierarchy/outfit/outfit, var/undress = 1)
+/proc/dressup_human(var/mob/living/carbon/human/H, var/decl/hierarchy/outfit/outfit)
 	if(!H || !outfit)
 		return
-	if(undress)
+	if(outfit.undress)
 		H.delete_inventory()
 	outfit.equip(H)
 	log_and_message_admins("changed the equipment of [key_name(H)] to [outfit.name].")
diff --git a/polaris.dme b/polaris.dme
index 657e0951f1..737a2910cb 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -234,8 +234,8 @@
 #include "code\datums\outfits\spec_op.dm"
 #include "code\datums\outfits\tournament.dm"
 #include "code\datums\outfits\wizardry.dm"
+#include "code\datums\outfits\costumes\costume.dm"
 #include "code\datums\outfits\costumes\halloween.dm"
-#include "code\datums\outfits\jobs\_defines.dm"
 #include "code\datums\outfits\jobs\cargo.dm"
 #include "code\datums\outfits\jobs\civilian.dm"
 #include "code\datums\outfits\jobs\command.dm"