diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 69273755247..48ad740fd29 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -126,6 +126,14 @@ path = /obj/item/clothing/under/dress/dress_cap allowed_roles = list("Captain") +/datum/gear/uniform/customdress + display_name = "Evening gown" + path = /obj/item/clothing/under/dress/dress_evening + +/datum/gear/uniform/customdress/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/uniform/corpsecsuit display_name = "uniform, corporate (Security)" path = /obj/item/clothing/under/rank/security/corp diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 763eacdfb7d..62ba6df8ebb 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -332,6 +332,13 @@ item_state = "p_suit" worn_state = "dress_saloon" + +/obj/item/clothing/under/dress/dress_evening + name = "Evening Gown" + desc = "A silky gown, leaves much to the imagination" + icon_state = "red_evening_gown_s" + item_state = "red_evening_gown" + /obj/item/clothing/under/dress/dress_cap name = "captain's dress uniform" desc = "Feminine fashion for the style concious captain." diff --git a/html/changelogs/dragodress.yml b/html/changelogs/dragodress.yml new file mode 100644 index 00000000000..5c05155c46b --- /dev/null +++ b/html/changelogs/dragodress.yml @@ -0,0 +1,38 @@ +################################ +# 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 +################################# + +# Your name. +author: Drago + +# 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: "Ported Polaris Station evening gown, converted to greyscale." + - rscdel: "Adds gown to loadout, color customization added." diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 679bafcdd72..9d7a7dcac17 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 60d839a54d1..eae308715f8 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ