shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10674 from Xantholne/lunar01

Browse Source 
Culturally Appropriate Lunar Clothes
This commit is contained in:
kevinz000
2020-01-24 16:14:32 -07:00
committed by GitHub
parent 0817639139 c512ce0c7e
commit ea9513864d
5 changed files with 98 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
code/modules/clothing/under/miscellaneous.dm
View File

@@ -945,4 +945,59 @@
icon_state = "christmasfemaleg"
item_state = "christmasfemaleg"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
can_adjust = FALSE
// Lunar Clothes
/obj/item/clothing/under/lunar/qipao
name = "Black Qipao"
desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is black."
icon_state = "qipao"
item_state = "qipao"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/lunar/qipao/white
name = "White Qipao"
desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is white."
icon_state = "qipao_white"
item_state = "qipao_white"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/lunar/qipao/red
name = "Red Qipao"
desc = "A Qipao, traditionally worn in ancient Earth China by women during social events and lunar new years. This one is red."
icon_state = "qipao_red"
item_state = "qipao_red"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/lunar/cheongsam
name = "Black Cheongsam"
desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is black."
icon_state = "cheong"
item_state = "cheong"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/lunar/cheongsam/white
name = "White Cheongsam"
desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is white."
icon_state = "cheongw"
item_state = "cheongw"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE
/obj/item/clothing/under/lunar/cheongsam/red
name = "Red Cheongsam"
desc = "A Cheongsam, traditionally worn in ancient Earth China by men during social events and lunar new years. This one is red.."
icon_state = "cheongr"
item_state = "cheongr"
body_parts_covered = CHEST|GROIN
can_adjust = FALSE
mutantrace_variation = NONE

8
code/modules/vending/clothesmate.dm
View File

@@ -144,7 +144,13 @@
/obj/item/clothing/head/cowboyhat/white = 3,
/obj/item/clothing/head/cowboyhat/pink = 3,
/obj/item/clothing/shoes/cowboyboots = 3,
/obj/item/clothing/shoes/cowboyboots/black = 3)
/obj/item/clothing/shoes/cowboyboots/black = 3,
/obj/item/clothing/under/lunar/qipao = 3,
/obj/item/clothing/under/lunar/qipao/white = 3,
/obj/item/clothing/under/lunar/qipao/red = 3,
/obj/item/clothing/under/lunar/cheongsam = 3,
/obj/item/clothing/under/lunar/cheongsam/white = 3,
/obj/item/clothing/under/lunar/cheongsam/red = 3)
contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,

BIN
icons/mob/uniform.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 368 KiB

BIN
icons/obj/clothing/uniforms.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 102 KiB

35
modular_citadel/code/modules/client/loadout/uniform.dm
View File

@@ -424,3 +424,38 @@
path = /obj/item/clothing/under/stripper_green
cost = 3
/datum/gear/qipao
name = "Qipao, Black"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/lunar/qipao
cost = 3
/datum/gear/qipao/white
name = "Qipao, White"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/lunar/qipao/white
cost = 3
/datum/gear/qipao/red
name = "Qipao, Red"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/lunar/qipao/red
cost = 3
/datum/gear/cheongsam
name = "Cheongsam, Black"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/lunar/cheongsam
cost = 3
/datum/gear/cheongsam/white
name = "Cheongsam, White"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/lunar/cheongsam/white
cost = 3
/datum/gear/cheongsam/red
name = "Cheongsam, Red"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/lunar/cheongsam/red
cost = 3