Dynasty Spessmen 8: Extreme Dressup (#2601)

Adds red, blue, green, and purple cheongsam dresses as contained sprites.
Adds red, blue, green, and purple dress flats for these dresses, as well as white and black versions for other clothes. These are also contained sprites.
Adds cheongsams and dress flats to the custom loadout. Cheongsams are added to 'dress selection' and flats have their own 'flats selection.'
Replaces loadout reference to "mai_yang" icon for the white cheongsam with a contained sprite in cheongsams.dmi for consistency. The white cheongsam sprites are unchanged.

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

@@ -43,3 +43,19 @@
 /datum/gear/shoes/leather
 	display_name = "shoes, leather"
 	path = /obj/item/clothing/shoes/leather
+
+/datum/gear/shoes/flats
+	display_name = "flats selection"
+	description = "Low-heeled dress flats, in a selection of colors."
+	path = /obj/item/clothing/shoes/flats
+
+/datum/gear/shoes/flats/New()
+	..()
+	var/shoes = list()
+	shoes["dress flats, black"] = /obj/item/clothing/shoes/flats
+	shoes["dress flats, white"] = /obj/item/clothing/shoes/flats/white
+	shoes["dress flats, red"] = /obj/item/clothing/shoes/flats/red
+	shoes["dress flats, blue"] = /obj/item/clothing/shoes/flats/blue
+	shoes["dress flats, green"] = /obj/item/clothing/shoes/flats/green
+	shoes["dress flats, purple"] = /obj/item/clothing/shoes/flats/purple
+	gear_tweaks += new/datum/gear_tweak/path(shoes)

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

@@ -108,6 +108,10 @@
 	dress["dress, pink"] = /obj/item/clothing/under/dress/dress_pink
 	dress["dress, yellow"] = /obj/item/clothing/under/dress/dress_yellow
 	dress["cheongsam, white"] = /obj/item/clothing/under/cheongsam
+	dress["cheongsam, red"] = /obj/item/clothing/under/cheongsam/red
+	dress["cheongsam, blue"] = /obj/item/clothing/under/cheongsam/blue
+	dress["cheongsam, green"] = /obj/item/clothing/under/cheongsam/green
+	dress["cheongsam, purple"] = /obj/item/clothing/under/cheongsam/purple
 	gear_tweaks += new/datum/gear_tweak/path(dress)
 
 /datum/gear/uniform/uniform_captain

code/modules/clothing/shoes/colour.dm

@@ -57,6 +57,46 @@
 	name = "orange shoes"
 	icon_state = "orange"
 	var/obj/item/weapon/handcuffs/chained = null
+	
+/obj/item/clothing/shoes/flats
+	desc = "A pair of black, low-heeled women's flats."
+	name = "black dress flats"
+	icon = 'icons/obj/clothing/cheongsams.dmi'
+	icon_state = "dressflatsblack"
+	item_state = "dressflatsblack"
+	species_restricted = null
+	contained_sprite = 1
+
+/obj/item/clothing/shoes/flats/red
+	desc = "A pair of red, low-heeled women's flats."
+	name = "red dress flats"
+	icon = 'icons/obj/clothing/cheongsams.dmi'
+	icon_state = "dressflatsred"
+	item_state = "dressflatsred"
+
+/obj/item/clothing/shoes/flats/blue
+	desc = "A pair of blue, low-heeled women's flats."
+	name = "blue dress flats"
+	icon_state = "dressflatsblue"
+	item_state = "dressflatsblue"
+
+/obj/item/clothing/shoes/flats/green
+	desc = "A pair of green, low-heeled women's flats."
+	name = "green dress flats"
+	icon_state = "dressflatsgreen"
+	item_state = "dressflatsgreen"
+
+/obj/item/clothing/shoes/flats/purple
+	desc = "A pair of purple, low-heeled women's flats."
+	name = "purple dress flats"
+	icon_state = "dressflatspurple"
+	item_state = "dressflatspurple"
+
+/obj/item/clothing/shoes/flats/white
+	desc = "A pair of white, low-heeled women's flats."
+	name = "white dress flats"
+	icon_state = "dressflatswhite"
+	item_state = "dressflatswhite"
 
 /obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/weapon/handcuffs/cuffs, mob/user as mob)
 	if (src.chained) return

code/modules/clothing/under/miscellaneous.dm

@@ -524,12 +524,41 @@
 
 /obj/item/clothing/under/cheongsam
 	name = "white cheongsam"
-	desc = "It is a white cheongsam dress."
-	icon_state = "mai_yang"
-	item_state = "mai_yang"
-	worn_state = "mai_yang"
+	desc = "A Chinese dress that hugs the body. This one is white, embroidered with a bright golden dragon."
+	icon = 'icons/obj/clothing/cheongsams.dmi'
+	icon_state = "cheongsamwhite"
+	item_state = "cheongsamwhite"
+	worn_state = "cheongsamwhite"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+	contained_sprite = 1
 
+/obj/item/clothing/under/cheongsam/red
+	name = "red cheongsam"
+	desc = "A Chinese dress that hugs the body. This one is red, with a golden dragon design that climbs the entire garment."
+	icon_state = "cheongsamred"
+	item_state = "cheongsamred"
+	worn_state = "cheongsamred"
+
+/obj/item/clothing/under/cheongsam/blue
+	name = "blue cheongsam"
+	desc = "A Chinese dress that hugs the body. This one is blue, the fabric styled with flowering tree branches."
+	icon_state = "cheongsamblue"
+	item_state = "cheongsamblue"
+	worn_state = "cheongsamblue"
+
+/obj/item/clothing/under/cheongsam/green
+	name = "green cheongsam"
+	desc = "A Chinese dress that hugs the body. This one is green, patterned with overlapping jade fans."
+	icon_state = "cheongsamgreen"
+	item_state = "cheongsamgreen"
+	worn_state = "cheongsamgreen"
+
+/obj/item/clothing/under/cheongsam/purple
+	name = "purple cheongsam"
+	desc = "A Chinese dress that hugs the body. This one is purple, embroidered with plum blossoms."
+	icon_state = "cheongsampurple"
+	item_state = "cheongsampurple"
+	
 /obj/item/clothing/under/blazer
 	name = "blue blazer"
 	desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie."
@@ -537,6 +566,8 @@
 	item_state = "blue_blazer"
 	worn_state = "blue_blazer"
 
+
+
 //stripper
 /obj/item/clothing/under/stripper
 	body_parts_covered = 0

html/changelogs/Synnono-Cheongsams.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Synnono
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "In an effort to keep up with Colonial Chinese fashion trends, four new cheongsam dresses have been added to the custom loadout's dress selection."
+  - rscadd: "Women's dress flats in six colors have been added to the custom loadout, in the Shoes and Footwear section."