diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 8588d268454..c0ba5235e8e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -369,3 +369,8 @@ display_name = "gadpathurian fatigues" path = /obj/item/clothing/under/uniform/gadpathur flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/uniform/miscellaneous/qipao + display_name = "qipao" + path = /obj/item/clothing/under/qipao + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 331843039ba..57885c73475 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -567,3 +567,10 @@ item_state = "lance_dress_m" worn_state = "lance_dress_m" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + +/obj/item/clothing/under/qipao + name = "qipao" + desc = "A traditional Solarian women's garment, typically made of (synthetic) silk." + icon_state = "qipao" + item_state = "qipao" + body_parts_covered = UPPER_TORSO|LOWER_TORSO diff --git a/html/changelogs/dansemacabre-qing.yml b/html/changelogs/dansemacabre-qing.yml new file mode 100644 index 00000000000..f1c94d07079 --- /dev/null +++ b/html/changelogs/dansemacabre-qing.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DanseMacabre + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a qipao to the loadout, for the sinophiles in all of us. Sprite by Мяу!#979." diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index f3041b40fa6..f17f9ff5d5f 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 fe16b5589f1..530c4ad619c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ