cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 03:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dynasty Spessmen 8: Extreme Dressup (#2601)

Browse Source 
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.
This commit is contained in:
Synnono
2017-06-04 20:35:46 +03:00
committed by skull132
parent ed5c571e19
commit 5d5f3ca7d1
6 changed files with 132 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+16
View File
@@ -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
+4
View File
@@ -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
+40
View File
@@ -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
+35 -4
View File
@@ -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