diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 437610c7265..8c575fa9d49 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -8,6 +8,18 @@ /datum/gear/uniform/kilt display_name = "kilt" path = /obj/item/clothing/under/kilt + +/datum/gear/uniform/formalblouse + display_name = "formal blouse" + path = /obj/item/clothing/under/formalblouse + +/datum/gear/uniform/croptop + display_name = "crop top" + path = /obj/item/clothing/under/croptop + +/datum/gear/uniform/cropdress + display_name = "crop dress" + path = /obj/item/clothing/under/cropdress /datum/gear/uniform/iacjumpsuit display_name = "IAC Jumpsuit" @@ -128,6 +140,8 @@ dress["cheongsam, blue"] = /obj/item/clothing/under/cheongsam/blue dress["cheongsam, green"] = /obj/item/clothing/under/cheongsam/green dress["cheongsam, purple"] = /obj/item/clothing/under/cheongsam/purple + dress["dress, blue"] = /obj/item/clothing/under/dress/bluedress + dress["dress, dark red"] = /obj/item/clothing/under/dress/darkreddress gear_tweaks += new/datum/gear_tweak/path(dress) /datum/gear/uniform/uniform_captain diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index fa7328f772a..3192a92e115 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -775,4 +775,44 @@ icon_state = "lance_dress_m" item_state = "lance_dress_m" worn_state = "lance_dress_m" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS \ No newline at end of file + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + + +/obj/item/clothing/under/dress/bluedress + name = "blue dress" + desc = "A plain blue dress with a white belt." + icon_state = "bluedress" + item_state = "bluedress_s" + worn_state = "bluedress" + + +/obj/item/clothing/under/dress/darkreddress + name = "dark red dress" + desc = "A short, red dress with a black belt. Fancy." + icon_state = "darkreddress" + item_state = "darkreddress_s" + worn_state = "darkreddress" + + +/obj/item/clothing/under/cropdress + name = "crop dress" + desc = "A red skirt and longsleeved button-up crop top." + icon_state = "cropdress" + item_state = "cropdress_s" + worn_state = "cropdress" + + +/obj/item/clothing/under/formalblouse + name = "formal blouse" + desc = "A formal, office-style blouse, with a black skirt in addition." + icon_state = "formalblouse" + item_state = "formalblouse_s" + worn_state = "formalblouse" + + +/obj/item/clothing/under/croptop + name = "crop top" + desc = "Light shirt which shows the midsection of the wearer." + icon_state = "croptop" + item_state = "croptop_s" + worn_state = "croptop" diff --git a/html/changelogs/BoryaTheSlayer-dresspolaris.yml b/html/changelogs/BoryaTheSlayer-dresspolaris.yml new file mode 100644 index 00000000000..647feeef5d3 --- /dev/null +++ b/html/changelogs/BoryaTheSlayer-dresspolaris.yml @@ -0,0 +1,6 @@ +author: BoryaTheSlayer +delete-after: True + +changes: + - rscadd: "Added four pieces of clothing, ported from Polaris: blue dress, dark red dress, crop top, crop dress." + diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 10ecd3a8bc0..6f666230bf0 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 e415c5d751e..9790e7a2236 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ