Merge pull request #8797 from Cerebulon/holloweeb

Halloween Costumes

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -65,7 +65,6 @@
 	captype["soft cap, solgov"] = /obj/item/clothing/head/soft/solgov
 	captype["soft cap, white"] = /obj/item/clothing/head/soft/mime
 	captype["soft cap, yellow"] = /obj/item/clothing/head/soft/yellow
-	captype["station cap, blue"] = /obj/item/clothing/head/mailman
 	gear_tweaks += new/datum/gear_tweak/path(captype)
 
 /datum/gear/head/sec_cap
@@ -169,7 +168,7 @@
 
 /datum/gear/head/wig/philosopher
 	display_name = "wig, natural philosopher"
-	path = /obj/item/clothing/head/philosopher_wig
+	path = /obj/item/clothing/head/collectable/philosopher_wig
 
 /datum/gear/head/wig
 	display_name = "wig, powdered"
@@ -365,10 +364,6 @@
 	display_name = "black and gold headdress"
 	path = /obj/item/clothing/head/blackngoldheaddress
 
-/datum/gear/head/plaguedoctor2
-	display_name = "hat, golden plague doctor"
-	path = /obj/item/clothing/head/plaguedoctorhat/gold
-
 /datum/gear/head/nonla
 	display_name = "non la"
 	path = /obj/item/clothing/head/nonla
@@ -397,3 +392,17 @@
 		var/obj/item/clothing/head/helmet/tank/cap_type = tankercap
 		tankercaps[initial(cap_type.name)] = cap_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tankercaps))
+
+/datum/gear/head/costumes
+	display_name = "costume hat selection"
+	description = "A selection of fancy-dress hats."
+	path = /obj/item/clothing/head/collectable
+	cost = 2
+
+/datum/gear/head/costumes/New()
+	..()
+	var/list/costumes = list()
+	for(var/costume in typesof(/obj/item/clothing/head/collectable))
+		var/obj/item/clothing/head/collectable/costume_type = costume
+		costumes[initial(costume_type.name)] = costume_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))

code/modules/client/preference_setup/loadout/loadout_mask.dm

@@ -31,8 +31,6 @@
 	var/masks = list()
 	masks["gas mask"] = /obj/item/clothing/mask/gas
 	masks["clear gas mask"] = /obj/item/clothing/mask/gas/clear
-	masks["plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor
-	masks["gold plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor/gold
 	gear_tweaks += new/datum/gear_tweak/path(masks)
 
 /datum/gear/mask/cloth
@@ -48,3 +46,16 @@
 	display_name = "mask, dust"
 	path = /obj/item/clothing/mask/surgical/dust
 	cost = 2
+
+/datum/gear/mask/costumes
+	display_name = "mask, costume selection"
+	description = "A selection of fancy-dress masks."
+	path = /obj/item/clothing/mask/costume
+
+/datum/gear/mask/costumes/New()
+	..()
+	var/list/costumes = list()
+	for(var/costume in typesof(/obj/item/clothing/mask/costume, /obj/item/clothing/mask/gas/costume))
+		var/obj/item/clothing/mask/costume/costume_type = costume
+		costumes[initial(costume_type.name)] = costume_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -387,3 +387,16 @@
 /datum/gear/suit/cardigan/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/suit/costumes
+	display_name = "costume overclothing selection"
+	description = "A selection of fancy-dress costumes worn on the suit slot."
+	path = /obj/item/clothing/suit/costume
+
+/datum/gear/suit/costumes/New()
+	..()
+	var/list/costumes = list()
+	for(var/costume in typesof(/obj/item/clothing/suit/costume))
+		var/obj/item/clothing/suit/costume/costume_type = costume
+		costumes[initial(costume_type.name)] = costume_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -39,10 +39,6 @@
 	display_name = "cropped sweater"
 	path = /obj/item/clothing/under/wednesday
 
-/datum/gear/uniform/kilt
-	display_name = "kilt"
-	path = /obj/item/clothing/under/kilt
-
 /datum/gear/uniform/cuttop
 	display_name = "cut top selection"
 	description = "Loose, low-cut shirts with matching shorts."
@@ -643,3 +639,16 @@
 	display_name = "jumpsuit, chaplain striped"
 	path = /obj/item/clothing/under/rank/chaplain/alt
 	allowed_roles = list("Chaplain")
+
+/datum/gear/uniform/costumes
+	display_name = "costume clothing selection"
+	description = "A selection of fancy-dress costumes worn on the clothing slot."
+	path = /obj/item/clothing/under/costume
+
+/datum/gear/uniform/costumes/New()
+	..()
+	var/list/costumes = list()
+	for(var/costume in typesof(/obj/item/clothing/under/costume))
+		var/obj/item/clothing/under/costume/costume_type = costume
+		costumes[initial(costume_type.name)] = costume_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))