diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a2081851e1..a4b8c920d3 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -945,4 +945,59 @@ icon_state = "christmasfemaleg" item_state = "christmasfemaleg" body_parts_covered = CHEST|GROIN - can_adjust = FALSE \ No newline at end of file + 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 \ No newline at end of file diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 0b1d8e1072..af720f6d4e 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -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, diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 04e2e3cc75..b0ea63611d 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 89f9a6fd93..901adb905d 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 46692ea7a9..b6b72669c2 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -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 \ No newline at end of file