cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 16:46:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11502 from VOREStation/upstream-merge-8234

Browse Source 
[MIRROR] Adds Qipaos
This commit is contained in:
Aronai Sieyes
2021-08-26 16:42:07 -04:00
committed by GitHub
parent 9be4838c23 ff21e088d8
commit cdd149e2f3
7 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+16
View File
@@ -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
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+4 -4
View File
@@ -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
code/modules/clothing/under/miscellaneous.dm
+12
View File
@@ -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."
code/modules/clothing/under/miscellaneous_vr.dm
+5 -4
View File
@@ -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"
code/modules/economy/vending_machines_vr.dm
+15 -15
View File
@@ -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,
icons/mob/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 345 KiB

icons/obj/clothing/uniforms.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 99 KiB