Adds a bunch of halloween costumes, costumes in loadout, costume file…

… sorting

code/datums/outfits/costumes/halloween.dm

@@ -26,7 +26,7 @@
 	for(var/obj/item/briefcase_item in new_briefcase)
 		qdel(briefcase_item)
 	new_briefcase.contents += new /obj/item/gun/projectile/pistol/toy
-	new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat
+	new_briefcase.contents += new /obj/item/clothing/mask/gas/costume
 	H.equip_to_slot_or_del(new_briefcase, slot_l_hand)
 
 /decl/hierarchy/outfit/costume/horrorcop
@@ -84,7 +84,7 @@
 
 /decl/hierarchy/outfit/costume/highlander
 	name = OUTFIT_COSTUME("Highlander")
-	uniform = /obj/item/clothing/under/kilt
+	uniform = /obj/item/clothing/under/costume/kilt
 	shoes = /obj/item/clothing/shoes/boots/jackboots
 	head = /obj/item/clothing/head/beret
 	r_hand = /obj/item/material/sword/foam
@@ -107,10 +107,10 @@
 
 /decl/hierarchy/outfit/costume/pirate
 	name = OUTFIT_COSTUME("Pirate")
-	uniform = /obj/item/clothing/under/pirate
+	uniform = /obj/item/clothing/under/costume/pirate
 	shoes = /obj/item/clothing/shoes/brown
-	head = /obj/item/clothing/head/pirate
-	suit = /obj/item/clothing/suit/pirate
+	head = /obj/item/clothing/head/collectable/pirate
+	suit = /obj/item/clothing/suit/costume
 	glasses = /obj/item/clothing/glasses/eyepatch
 
 /decl/hierarchy/outfit/costume/whiteout
@@ -125,6 +125,6 @@
 	name = OUTFIT_COSTUME("Ruin Marine")
 	uniform = /obj/item/clothing/under/color/grey
 	shoes = /obj/item/clothing/shoes/brown
-	head = /obj/item/clothing/head/marine
-	suit = /obj/item/clothing/suit/marine
+	head = /obj/item/clothing/head/collectable/marine
+	suit = /obj/item/clothing/suit/costume/marine
 	r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff

code/datums/outfits/horror_killers.dm

@@ -3,7 +3,7 @@
 	uniform = /obj/item/clothing/under/rank/clown
 	shoes = /obj/item/clothing/shoes/clown_shoes
 	gloves = /obj/item/clothing/gloves/black
-	mask = /obj/item/clothing/mask/gas/clown_hat
+	mask = /obj/item/clothing/mask/gas/costume
 	head = /obj/item/clothing/head/chaplain_hood
 	l_ear = /obj/item/radio/headset
 	glasses = /obj/item/clothing/glasses/thermal/plain/monocle
@@ -42,7 +42,7 @@
 	l_ear = /obj/item/radio/headset
 	glasses = /obj/item/clothing/glasses/sunglasses
 	l_pocket = /obj/item/melee/energy/sword
-	mask = /obj/item/clothing/mask/gas/clown_hat
+	mask = /obj/item/clothing/mask/gas/costume
 
 	id_slot = slot_wear_id
 	id_type = /obj/item/card/id/syndicate/station_access

code/datums/outfits/jobs/misc.dm

@@ -1,5 +1,5 @@
 /decl/hierarchy/outfit/job/silicon
-	head = /obj/item/clothing/head/cardborg
+	head = /obj/item/clothing/head/collectable/cardborg
 	hierarchy_type = /decl/hierarchy/outfit/job/silicon
 
 /decl/hierarchy/outfit/job/silicon/ai
@@ -8,4 +8,4 @@
 
 /decl/hierarchy/outfit/job/silicon/cyborg
 	name = OUTFIT_JOB_NAME("Cyborg")
-	suit = /obj/item/clothing/suit/cardborg
+	suit = /obj/item/clothing/suit/costume/cardborg

code/datums/outfits/misc.dm

@@ -19,7 +19,7 @@
 
 /decl/hierarchy/outfit/soviet_soldier
 	name = "Soviet soldier"
-	uniform = /obj/item/clothing/under/soviet
+	uniform = /obj/item/clothing/under/costume/soviet
 	shoes = /obj/item/clothing/shoes/boots/combat
 	head = /obj/item/clothing/head/ushanka
 	gloves = /obj/item/clothing/gloves/combat
@@ -28,10 +28,10 @@
 
 /decl/hierarchy/outfit/soviet_soldier/admiral
 	name = "Soviet admiral"
-	head = /obj/item/clothing/head/hgpiratecap
+	head = /obj/item/clothing/head/collectable/hgpiratecap
 	l_ear = /obj/item/radio/headset/heads/captain
 	glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch
-	suit = /obj/item/clothing/suit/hgpirate
+	suit = /obj/item/clothing/suit/costume/hgpirate
 
 	id_slot = slot_wear_id
 	id_type = /obj/item/card/id/centcom	//station

code/datums/outfits/pirates.dm

@@ -1,7 +1,7 @@
 /decl/hierarchy/outfit/pirate
 	hierarchy_type = /decl/hierarchy/outfit/pirate
 	name = "Pirate"
-	uniform = /obj/item/clothing/under/pirate
+	uniform = /obj/item/clothing/under/costume/pirate
 	shoes = /obj/item/clothing/shoes/brown
 	head = /obj/item/clothing/head/bandana
 	glasses = /obj/item/clothing/glasses/eyepatch
@@ -12,6 +12,6 @@
 /decl/hierarchy/outfit/pirate/space
 	name = "Pirate - Space"
 	head = /obj/item/clothing/head/helmet/space
-	suit = /obj/item/clothing/suit/pirate
+	suit = /obj/item/clothing/suit/costume
 	back = /obj/item/tank/jetpack/oxygen
 	flags = OUTFIT_HAS_JETPACK

code/datums/supplypacks/costumes.dm

@@ -25,7 +25,7 @@
 /datum/supply_pack/randomised/costumes/hats
 	num_contained = 4
 	contains = list(
-			/obj/item/clothing/head/collectable/chef,
+			/obj/item/clothing/head/collectable,
 			/obj/item/clothing/head/collectable/paper,
 			/obj/item/clothing/head/collectable/tophat,
 			/obj/item/clothing/head/collectable/captain,
@@ -54,13 +54,12 @@
 /datum/supply_pack/randomised/costumes/costume
 	num_contained = 3
 	contains = list(
-			/obj/item/clothing/suit/pirate,
-			/obj/item/clothing/suit/judgerobe,
+			/obj/item/clothing/suit/costume,
+			/obj/item/clothing/suit/costume/judgerobe,
 			/obj/item/clothing/accessory/wcoat,
-			/obj/item/clothing/suit/hastur,
-			/obj/item/clothing/suit/holidaypriest,
+			/obj/item/clothing/suit/costume/hastur,
+			/obj/item/clothing/suit/costume/holidaypriest,
 			/obj/item/clothing/suit/nun,
-			/obj/item/clothing/suit/imperium_monk,
 			/obj/item/clothing/suit/ianshirt,
 			/obj/item/clothing/under/gimmick/rank/captain/suit,
 			/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,
@@ -70,16 +69,16 @@
 			/obj/item/clothing/suit/suspenders,
 			/obj/item/clothing/suit/storage/toggle/labcoat/mad,
 			/obj/item/clothing/suit/bio_suit/plaguedoctorsuit,
-			/obj/item/clothing/under/schoolgirl,
-			/obj/item/clothing/under/owl,
+			/obj/item/clothing/under/costume/schoolgirl,
+			/obj/item/clothing/under/costume/owl,
 			/obj/item/clothing/under/waiter,
-			/obj/item/clothing/under/gladiator,
-			/obj/item/clothing/under/soviet,
+			/obj/item/clothing/under/costume/gladiator,
+			/obj/item/clothing/under/costume/soviet,
 			/obj/item/clothing/under/wedding/bride_white,
 			/obj/item/clothing/suit/chef,
 			/obj/item/clothing/suit/storage/apron/overalls,
-			/obj/item/clothing/under/redcoat,
-			/obj/item/clothing/under/kilt
+			/obj/item/clothing/under/costume/redcoat,
+			/obj/item/clothing/under/costume/kilt
 			)
 	name = "Costumes crate"
 	cost = 10
@@ -128,20 +127,20 @@
 	num_contained = 3
 	contains = list(
 			/obj/item/clothing/head/redcoat,
-			/obj/item/clothing/head/mailman,
-			/obj/item/clothing/head/plaguedoctorhat,
-			/obj/item/clothing/head/pirate,
-			/obj/item/clothing/head/hasturhood,
+			/obj/item/clothing/head/collectable/mailman,
+			/obj/item/clothing/head/collectable/plaguedoctorhat,
+			/obj/item/clothing/head/collectable/pirate,
+			/obj/item/clothing/head/collectable/hasturhood,
 			/obj/item/clothing/head/powdered_wig,
 			/obj/item/clothing/head/pin/flower,
 			/obj/item/clothing/head/pin/flower/yellow,
 			/obj/item/clothing/head/pin/flower/blue,
 			/obj/item/clothing/head/pin/flower/pink,
 			/obj/item/clothing/head/pin/clover,
 			/obj/item/clothing/head/pin/butterfly,
-			/obj/item/clothing/mask/gas/owl_mask,
-			/obj/item/clothing/mask/gas/monkeymask,
-			/obj/item/clothing/head/helmet/gladiator,
+			/obj/item/clothing/mask/gas/costume/owl_mask,
+			/obj/item/clothing/mask/gas/costume/monkeymask,
+			/obj/item/clothing/head/helmet/collectable/gladiator,
 			/obj/item/clothing/head/ushanka
 			)
 

code/datums/supplypacks/misc.dm

@@ -97,7 +97,7 @@
 			/obj/item/clothing/head/nun_hood,
 			/obj/item/clothing/suit/storage/hooded/chaplain_hoodie,
 			/obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout,
-			/obj/item/clothing/suit/holidaypriest,
+			/obj/item/clothing/suit/costume/holidaypriest,
 			/obj/item/clothing/under/wedding/bride_white,
 			/obj/item/storage/backpack/cultpack,
 			/obj/item/storage/fancy/candle_box = 3
@@ -197,4 +197,4 @@
 		/obj/item/toy/desk/officetoy = 2,
 		/obj/item/toy/desk/dippingbird = 2)
 	cost = 15
-	containertype = /obj/structure/closet/crate/oculum
+	containertype = /obj/structure/closet/crate/oculum

code/game/jobs/job/silicon.dm

@@ -34,7 +34,7 @@
 
 /datum/job/ai/equip_preview(mob/living/carbon/human/H)
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/straight_jacket(H), slot_wear_suit)
-	H.equip_to_slot_or_del(new /obj/item/clothing/head/cardborg(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/collectable/cardborg(H), slot_head)
 	return 1
 
 //////////////////////////////////
@@ -78,6 +78,6 @@
 	return 1
 
 /datum/job/cyborg/equip_preview(mob/living/carbon/human/H)
-	H.equip_to_slot_or_del(new /obj/item/clothing/suit/cardborg(H), slot_wear_suit)
-	H.equip_to_slot_or_del(new /obj/item/clothing/head/cardborg(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/costume/cardborg(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/collectable/cardborg(H), slot_head)
 	return 1

code/game/machinery/computer/arcade.dm

@@ -10,7 +10,7 @@
 							/obj/item/toy/sword                                         = 2,
 							/obj/item/gun/projectile/revolver/capgun             = 2,
 							/obj/item/gun/projectile/revolver/toy/crossbow       = 2,
-							/obj/item/clothing/suit/syndicatefake                       = 2,
+							/obj/item/clothing/suit/costume/syndicatefake                       = 2,
 							/obj/item/storage/fancy/crayons                      = 2,
 							/obj/item/toy/spinningtoy                                   = 2,
 							/obj/random/mech_toy                                        = 1,
@@ -45,8 +45,8 @@
 		var/prizeselect = pickweight(prizes)
 		new prizeselect(src.loc)
 
-		if(istype(prizeselect, /obj/item/clothing/suit/syndicatefake)) //Helmet is part of the suit
-			new	/obj/item/clothing/head/syndicatefake(src.loc)
+		if(istype(prizeselect, /obj/item/clothing/suit/costume/syndicatefake)) //Helmet is part of the suit
+			new	/obj/item/clothing/head/collectable/syndicatefake(src.loc)
 
 /obj/machinery/computer/arcade/attack_ai(mob/user as mob)
 	return attack_hand(user)

code/game/objects/effects/landmarks.dm

@@ -129,15 +129,15 @@
 //SUBCLASSES.  Spawn a bunch of items and disappear likewise
 /obj/effect/landmark/costume/chicken/Initialize()
 	..()
-	new /obj/item/clothing/suit/chickensuit(src.loc)
-	new /obj/item/clothing/head/chicken(src.loc)
+	new /obj/item/clothing/suit/costume/chickensuit(src.loc)
+	new /obj/item/clothing/head/collectable/chicken(src.loc)
 	new /obj/item/reagent_containers/food/snacks/egg(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/costume/gladiator/Initialize()
 	..()
-	new /obj/item/clothing/under/gladiator(src.loc)
-	new /obj/item/clothing/head/helmet/gladiator(src.loc)
+	new /obj/item/clothing/under/costume/gladiator(src.loc)
+	new /obj/item/clothing/head/helmet/collectable/gladiator(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/costume/madscientist/Initialize()
@@ -158,7 +158,7 @@
 
 /obj/effect/landmark/costume/nyangirl/Initialize()
 	..()
-	new /obj/item/clothing/under/schoolgirl(src.loc)
+	new /obj/item/clothing/under/costume/schoolgirl(src.loc)
 	new /obj/item/clothing/head/kitty(src.loc)
 	return INITIALIZE_HINT_QDEL
 
@@ -179,7 +179,7 @@
 
 /obj/effect/landmark/costume/highlander/Initialize()
 	..()
-	new /obj/item/clothing/under/kilt(src.loc)
+	new /obj/item/clothing/under/costume/kilt(src.loc)
 	new /obj/item/clothing/head/beret(src.loc)
 	return INITIALIZE_HINT_QDEL
 
@@ -198,13 +198,13 @@
 /obj/effect/landmark/costume/plaguedoctor/Initialize()
 	..()
 	new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
-	new /obj/item/clothing/head/plaguedoctorhat(src.loc)
+	new /obj/item/clothing/head/collectable/plaguedoctorhat(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/costume/nightowl/Initialize()
 	..()
-	new /obj/item/clothing/under/owl(src.loc)
-	new /obj/item/clothing/mask/gas/owl_mask(src.loc)
+	new /obj/item/clothing/under/costume/owl(src.loc)
+	new /obj/item/clothing/mask/gas/costume/owl_mask(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/costume/waiter/Initialize()
@@ -217,29 +217,22 @@
 
 /obj/effect/landmark/costume/pirate/Initialize()
 	..()
-	new /obj/item/clothing/under/pirate(src.loc)
-	new /obj/item/clothing/suit/pirate(src.loc)
-	var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
+	new /obj/item/clothing/under/costume/pirate(src.loc)
+	new /obj/item/clothing/suit/costume(src.loc)
+	var/CHOICE = pick( /obj/item/clothing/head/collectable/pirate , /obj/item/clothing/head/bandana )
 	new CHOICE(src.loc)
 	new /obj/item/clothing/glasses/eyepatch(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/costume/commie/Initialize()
 	..()
-	new /obj/item/clothing/under/soviet(src.loc)
+	new /obj/item/clothing/under/costume/soviet(src.loc)
 	new /obj/item/clothing/head/ushanka(src.loc)
 	return INITIALIZE_HINT_QDEL
 
-/obj/effect/landmark/costume/imperium_monk/Initialize()
-	..()
-	new /obj/item/clothing/suit/imperium_monk(src.loc)
-	if (prob(25))
-		new /obj/item/clothing/mask/gas/cyborg(src.loc)
-	return INITIALIZE_HINT_QDEL
-
 /obj/effect/landmark/costume/holiday_priest/Initialize()
 	..()
-	new /obj/item/clothing/suit/holidaypriest(src.loc)
+	new /obj/item/clothing/suit/costume/holidaypriest(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/costume/marisawizard/fake/Initialize()
@@ -251,7 +244,7 @@
 /obj/effect/landmark/costume/cutewitch/Initialize()
 	..()
 	new /obj/item/clothing/under/sundress(src.loc)
-	new /obj/item/clothing/head/witchwig(src.loc)
+	new /obj/item/clothing/head/collectable/witchwig(src.loc)
 	new /obj/item/staff/broom(src.loc)
 	return INITIALIZE_HINT_QDEL
 
@@ -264,14 +257,14 @@
 
 /obj/effect/landmark/costume/sexyclown/Initialize()
 	..()
-	new /obj/item/clothing/mask/gas/sexyclown(src.loc)
-	new /obj/item/clothing/under/sexyclown(src.loc)
+	new /obj/item/clothing/mask/gas/costume/sexyclown(src.loc)
+	new /obj/item/clothing/under/costume/sexyclown(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/costume/sexymime/Initialize()
 	..()
-	new /obj/item/clothing/mask/gas/sexymime(src.loc)
-	new /obj/item/clothing/under/sexymime(src.loc)
+	new /obj/item/clothing/mask/gas/costume/sexymime(src.loc)
+	new /obj/item/clothing/under/costume/sexymime(src.loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/crashed_pod

code/game/objects/random/mapping.dm

@@ -423,9 +423,9 @@
 				/obj/structure/closet/crate/science
 			),
 			prob(1);list(
-				/obj/item/clothing/head/bearpelt,
-				/obj/item/clothing/under/soviet,
-				/obj/item/clothing/under/soviet,
+				/obj/item/clothing/head/collectable/bearpelt,
+				/obj/item/clothing/under/costume/soviet,
+				/obj/item/clothing/under/costume/soviet,
 				/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial,
 				/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial,
 				/obj/structure/closet/crate
@@ -465,7 +465,7 @@
 				/obj/item/clothing/under/rank/clown,
 				/obj/item/clothing/shoes/clown_shoes,
 				/obj/item/pda/clown,
-				/obj/item/clothing/mask/gas/clown_hat,
+				/obj/item/clothing/mask/gas/costume,
 				/obj/item/bikehorn,
 				/obj/item/reagent_containers/spray/waterflower,
 				/obj/item/pen/crayon/rainbow,
@@ -476,7 +476,7 @@
 				/obj/item/clothing/shoes/black,
 				/obj/item/pda/mime,
 				/obj/item/clothing/gloves/white,
-				/obj/item/clothing/mask/gas/mime,
+				/obj/item/clothing/mask/gas/costume/mime,
 				/obj/item/clothing/head/beret,
 				/obj/item/clothing/suit/suspenders,
 				/obj/item/pen/crayon/mime,