diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 9cb48dc66a..8fcb944430 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -54,6 +54,22 @@ jumpclothes[initial(jumps.name)] = jumps gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes)) +/datum/gear/uniform/qipao_colorable + display_name = "qipao, colorable" + path = /obj/item/clothing/under/qipao_colorable + +/datum/gear/uniform/qipao_colorable/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/uniform/qipao2_colorable + display_name = "qipao, colorable, slim" + path = /obj/item/clothing/under/qipao2_colorable + +/datum/gear/uniform/qipao2_colorable/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/uniform/skirt display_name = "skirt selection" path = /obj/item/clothing/under/skirt diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 18e9f2b83a..8fea6638cd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -196,17 +196,17 @@ Swimsuits /* Qipao */ -/datum/gear/uniform/qipao +/datum/gear/uniform/qipao_black display_name = "qipao, black" - path = /obj/item/clothing/under/dress/qipao + path = /obj/item/clothing/under/qipao /datum/gear/uniform/qipao_red display_name = "qipao, red" - path = /obj/item/clothing/under/dress/qipao/red + path = /obj/item/clothing/under/qipao/red /datum/gear/uniform/qipao_white display_name = "qipao, white" - path = /obj/item/clothing/under/dress/qipao/white + path = /obj/item/clothing/under/qipao/white /* Bluespace jumpsuit diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 4eacdb13ea..37fd676a4c 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -802,6 +802,18 @@ Uniforms and such desc = "It is a dark blue cheongsam dress." icon_state = "cheongsam-darkblue" +/obj/item/clothing/under/qipao_colorable + name = "qipao" + desc = "A traditional Chinese women's garment, typically made from silk." + icon_state = "qipao" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/qipao2_colorable + name = "slim qipao" + desc = "A traditional Chinese women's garment, typically made from silk. This one is fairly slim." + icon_state = "qipao2" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + /obj/item/clothing/under/blazer name = "blue blazer" desc = "A bold but yet conservative outfit, red corduroys, navy blazer and a tie." diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index d8d55aed12..b0879f0222 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -119,20 +119,21 @@ /obj/item/clothing/under/ert armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0) -/obj/item/clothing/under/dress/qipao - name = "qipao" +/obj/item/clothing/under/qipao + name = "black qipao" desc = "A type of feminine body-hugging dress with distinctive Chinese features of Manchu origin." icon = 'icons/inventory/uniform/item_vr.dmi' icon_override = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "qipao" item_state = "qipao" + body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/under/dress/qipao/white +/obj/item/clothing/under/qipao/white name = "white qipao" icon_state = "qipao_white" item_state = "qipao_white" -/obj/item/clothing/under/dress/qipao/red +/obj/item/clothing/under/qipao/red name = "red qipao" icon_state = "qipao_red" item_state = "qipao_red" diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 16019d8e11..a1c630829c 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -765,9 +765,9 @@ /obj/item/clothing/under/dress/sailordress = 5, /obj/item/clothing/under/dress/sari = 5, /obj/item/clothing/under/dress/sari/green = 5, - /obj/item/clothing/under/dress/qipao = 5, - /obj/item/clothing/under/dress/qipao/red = 5, - /obj/item/clothing/under/dress/qipao/white = 5, + /obj/item/clothing/under/qipao = 5, + /obj/item/clothing/under/qipao/red = 5, + /obj/item/clothing/under/qipao/white = 5, /obj/item/clothing/under/shorts/red = 5, /obj/item/clothing/under/shorts/green = 5, /obj/item/clothing/under/shorts/blue = 5, @@ -936,9 +936,9 @@ /obj/item/clothing/under/dress/sailordress = 50, /obj/item/clothing/under/dress/sari = 50, /obj/item/clothing/under/dress/sari/green = 50, - /obj/item/clothing/under/dress/qipao = 50, - /obj/item/clothing/under/dress/qipao/red = 50, - /obj/item/clothing/under/dress/qipao/white = 50, + /obj/item/clothing/under/qipao = 50, + /obj/item/clothing/under/qipao/red = 50, + /obj/item/clothing/under/qipao/white = 50, /obj/item/clothing/under/shorts/red = 50, /obj/item/clothing/under/shorts/green = 50, /obj/item/clothing/under/shorts/blue = 50, @@ -2036,9 +2036,9 @@ /obj/item/clothing/under/dress/sailordress = 5, /obj/item/clothing/under/dress/sari = 5, /obj/item/clothing/under/dress/sari/green = 5, - /obj/item/clothing/under/dress/qipao = 5, - /obj/item/clothing/under/dress/qipao/red = 5, - /obj/item/clothing/under/dress/qipao/white = 5, + /obj/item/clothing/under/qipao = 5, + /obj/item/clothing/under/qipao/red = 5, + /obj/item/clothing/under/qipao/white = 5, /obj/item/clothing/under/shorts/red = 5, /obj/item/clothing/under/shorts/green = 5, /obj/item/clothing/under/shorts/blue = 5, @@ -2207,9 +2207,9 @@ /obj/item/clothing/under/dress/sailordress = 50, /obj/item/clothing/under/dress/sari = 50, /obj/item/clothing/under/dress/sari/green = 50, - /obj/item/clothing/under/dress/qipao = 50, - /obj/item/clothing/under/dress/qipao/red = 50, - /obj/item/clothing/under/dress/qipao/white = 50, + /obj/item/clothing/under/qipao = 50, + /obj/item/clothing/under/qipao/red = 50, + /obj/item/clothing/under/qipao/white = 50, /obj/item/clothing/under/shorts/red = 50, /obj/item/clothing/under/shorts/green = 50, /obj/item/clothing/under/shorts/blue = 50, @@ -3059,9 +3059,9 @@ /obj/item/clothing/under/dress/sailordress = 5, /obj/item/clothing/under/dress/sari = 5, /obj/item/clothing/under/dress/sari/green = 5, - /obj/item/clothing/under/dress/qipao = 5, - /obj/item/clothing/under/dress/qipao/red = 5, - /obj/item/clothing/under/dress/qipao/white = 5, + /obj/item/clothing/under/qipao = 5, + /obj/item/clothing/under/qipao/red = 5, + /obj/item/clothing/under/qipao/white = 5, /obj/item/clothing/under/shorts/red = 5, /obj/item/clothing/under/shorts/green = 5, /obj/item/clothing/under/shorts/blue = 5, diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi new file mode 100644 index 0000000000..6bf14c70ec Binary files /dev/null and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi new file mode 100644 index 0000000000..0ad63f5424 Binary files /dev/null and b/icons/obj/clothing/uniforms.dmi differ