Merge pull request #9259 from Nyarlthotep/lexi's-branch

Adds magical girl costumes

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

@@ -418,3 +418,20 @@
 /datum/gear/accessory/ceremonial_loins
 	display_name = "ceremonial loincloth"
 	path = /obj/item/clothing/accessory/ceremonial_loins
+
+/datum/gear/accessory/frontbow
+	display_name = "ribbon bow, front (colorable)"
+	path = /obj/item/clothing/accessory/frontbow
+
+/datum/gear/accessory/frontbow/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/accessory/backbow
+	display_name = "ribbon bow, back (colorable)"
+	path = /obj/item/clothing/accessory/backbow
+
+/datum/gear/accessory/backbow/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+

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

@@ -158,3 +158,11 @@
 /datum/gear/eyes/circuitry
 	display_name = "goggles, circuitry (empty)"
 	path = /obj/item/clothing/glasses/circuitry
+
+/datum/gear/eyes/masquerade
+	display_name = "masquerade mask (colorable)"
+	path = /obj/item/clothing/glasses/masquerade
+
+/datum/gear/eyes/masquerade/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice

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

@@ -287,6 +287,14 @@
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
+/datum/gear/head/bow/large
+	display_name = "hair bow, large (colorable)"
+	path = /obj/item/clothing/head/pin/bow/big
+
+/datum/gear/head/bow/large/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/head/welding/
 	display_name = "welding helmet selection (engineering/robotics)"
 	path = /obj/item/clothing/head/welding

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

@@ -18,6 +18,14 @@
 	display_name = "greatcoat"
 	path = /obj/item/clothing/suit/greatcoat
 
+/datum/gear/suit/greatcoat_white
+	display_name = "greatcoat, colorable"
+	path = /obj/item/clothing/suit/greatcoat/white
+
+/datum/gear/suit/greatcoat_white/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
 /datum/gear/suit/leather_coat
 	display_name = "leather coat"
 	path = /obj/item/clothing/suit/leathercoat

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

@@ -710,3 +710,19 @@
 	"jumper dress" = /obj/item/clothing/under/skirt/colorable/jumperdress
 	)
 	gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)
+
+
+//Magical Girl Outfits
+/datum/gear/uniform/magicalgirl
+	display_name = "outfit, magical girl selection"
+	description = "A selection of magical girl costumes worn on the clothing slot."
+	path = /obj/item/clothing/under/magicalgirl
+
+/datum/gear/uniform/magicalgirl/New()
+	..()
+	var/list/costumes = list()
+	for(var/costume in typesof(/obj/item/clothing/under/magicalgirl))
+		var/obj/item/clothing/under/magicalgirl/costume_type = costume
+		costumes[initial(costume_type.name)] = costume_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes))
+

code/modules/clothing/glasses/glasses.dm

@@ -595,3 +595,8 @@ BLIND     // can't see anything
 			to_chat(usr, "You push \the [src] up from in front of your eyes.")
 		update_clothing_icon()
 		usr.update_action_buttons()
+
+/obj/item/clothing/glasses/masquerade
+	name = "masquerade mask"
+	desc = "A fancy party mask that only covers your eyes. No one will have any idea who you are!"
+	icon_state = "masquerade"

code/modules/clothing/suits/miscellaneous.dm

@@ -286,6 +286,10 @@
 	item_state_slots = list(slot_r_hand_str = "greatcoat", slot_l_hand_str = "greatcoat")
 	flags_inv = HIDEHOLSTER
 
+/obj/item/clothing/suit/greatcoat/white
+	icon_state = "greatcoat_white"
+	item_state_slots = list(slot_r_hand_str = "duster", slot_l_hand_str = "duster")
+
 /obj/item/clothing/suit/straight_jacket //A misspelling from time immemorial...
 	name = "straitjacket"
 	desc = "A suit that completely restrains the wearer."

code/modules/clothing/under/accessories/accessory.dm

@@ -603,3 +603,17 @@
 	desc = "A Gilthari ZeitMeister classic, a finely tuned wristwatch with a fancy leather strap."
 	description_fluff = "Made from real synth leather."
 	icon_state = "watch_leather"
+
+//magical girl ribbon bows
+
+/obj/item/clothing/accessory/frontbow
+	name = "ribbon bow"
+	desc = "An oversized bow that sits just below the collar. Seems like something a magical girl would wear."
+	icon_state = "frontbow"
+	slot = ACCESSORY_SLOT_TIE
+
+/obj/item/clothing/accessory/backbow
+	name = "waist bow"
+	desc = "An oversized bow that sits on the small of your back. Seems like something a magical girl would wear."
+	icon_state = "backbow"
+	slot = ACCESSORY_SLOT_DECOR

code/modules/clothing/under/costume.dm

@@ -158,3 +158,65 @@
 	unicolor = "yellow"
 
 //End of old costumes
+
+//magical girl outfits
+/obj/item/clothing/under/magicalgirl
+	name = "magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume's particularly popular among Lunar cosplayers."
+	icon_state = "magicalgirl_classic"
+	item_state_slots = list(slot_r_hand_str = "lightblue", slot_l_hand_str = "lightblue")
+
+/obj/item/clothing/under/magicalgirl/blue
+	name = "blue magical girl costume"
+	desc = "It's just like one of your Japanese animes! Despite not being inherently transhumanist, this costume's particularly among Mercurials."
+	icon_state = "magicalgirl_blue"
+	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
+
+/obj/item/clothing/under/magicalgirl/red
+	name = "red magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume's particularly popular among Martian cosplayers."
+	icon_state = "magicalgirl_red"
+	item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red")
+
+/obj/item/clothing/under/magicalgirl/green
+	name = "green magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume's particular popular among cosplayers from Callisto."
+	icon_state = "magicalgirl_green"
+	item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green")
+
+/obj/item/clothing/under/magicalgirl/orange
+	name = "orange magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume's particularly popular among Venusian cosplayers."
+	icon_state = "magicalgirl_orange"
+	item_state_slots = list(slot_r_hand_str = "orange", slot_l_hand_str = "orange")
+
+/obj/item/clothing/under/magicalgirl/pink
+	name = "pink magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume's particularly popular among Lunar cosplayers."
+	icon_state = "magicalgirl_pink"
+	item_state_slots = list(slot_r_hand_str = "pink", slot_l_hand_str = "pink")
+
+/obj/item/clothing/under/magicalgirl/purple
+	name = "purple magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume's particularly popular among Titanian cosplayers."
+	icon_state = "magicalgirl_purple"
+	item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple")
+
+/obj/item/clothing/under/magicalgirl/navy
+	name = "navy magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume would probably be a hit on Uranus."
+	icon_state = "magicalgirl_navy"
+	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
+
+/obj/item/clothing/under/magicalgirl/turquoise
+	name = "turquoise magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume would probably be a hit on Neptune."
+	icon_state = "magicalgirl_turquoise"
+	item_state_slots = list(slot_r_hand_str = "lightblue", slot_l_hand_str = "lightblue")
+
+/obj/item/clothing/under/magicalgirl/black
+	name = "black magical girl costume"
+	desc = "It's just like one of your Japanese animes! This costume's particularly popular among Plutonian cosplayers."
+	icon_state = "magicalgirl_black"
+	item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
+