diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index c9a9401aea..c26c23ea7a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -614,3 +614,34 @@ display_name = "disheveled suit" path = /obj/item/clothing/under/disheveled +/datum/gear/uniform/orangedress + display_name = "orange dress" + path = /obj/item/clothing/under/dress/dress_orange + +/datum/gear/uniform/sundress_pink + display_name = "pink sundress" + path = /obj/item/clothing/under/dress/sundress_pink + +/datum/gear/uniform/sundress_white + display_name = "white sundress" + path = /obj/item/clothing/under/dress/sundress_white + +/datum/gear/uniform/sundress_pinkbow + display_name = "bowed pink sundress" + path = /obj/item/clothing/under/dress/sundress_pinkbow + +/datum/gear/uniform/sundress_blue + display_name = "long blue sundress" + path = /obj/item/clothing/under/dress/sundress_blue + +/datum/gear/uniform/sundress_pinkshort + display_name = "short pink sundress" + path = /obj/item/clothing/under/dress/sundress_pinkshort + +/datum/gear/uniform/twopiece + display_name = "two-piece dress" + path = /obj/item/clothing/under/dress/twopiece + +/datum/gear/uniform/gothic2 + display_name = "lacey gothic dress" + path = /obj/item/clothing/under/dress/gothic2 \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 44fae55c92..744c2a55c2 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -159,6 +159,12 @@ icon_state = "scrubsnavyblue" item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") +/obj/item/clothing/under/rank/medical/scrubs/white + name = "scrubs" + desc = "It's made of a special fiber that provides minor protection against biohazards" + icon_state = "scrubs" + item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") + /obj/item/clothing/under/rank/psych desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." name = "psychiatrist's jumpsuit" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 092f33fd86..fdc73151b0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -621,7 +621,7 @@ Uniforms and such */ /obj/item/clothing/under/sundress - name = "sundress" + name = "flowery white sundress" desc = "Makes you want to frolic in a field of daisies." icon_state = "sundress" body_parts_covered = UPPER_TORSO|LOWER_TORSO @@ -632,6 +632,47 @@ Uniforms and such icon_state = "sundress_white" body_parts_covered = UPPER_TORSO|LOWER_TORSO +/obj/item/clothing/under/dress/sundress_pink + name = "pink stripied sundress" + desc = "A cute pink sundress." + icon_state = "pinksun" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/dress/sundress_white + name = "white sundress" + desc = "A white sundress, it's short." + icon_state = "whitesun" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/dress/sundress_pinkbow + name = "bowed pink sundress" + desc = "A cute pink sundress with a bow." + icon_state = "bowsun" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/dress/sundress_blue + name = "long blue sundress" + desc = "A long blue sun dress with white frills towards the bottom." + icon_state = "bluesun" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + +/obj/item/clothing/under/dress/sundress_pinkshort + name = "short pink sundress" + desc = "A very short pink sundress, it's more like a chemise." + icon_state = "shortpink" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/dress/twopiece + name = "two-piece dress" + desc = "A fancy two-piece dress, the pieces are sewn together." + icon_state = "twopiece" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + +/obj/item/clothing/under/dress/gothic2 + name = "lacey gothic dress" + desc = "An elegant gothic dress with lace decorations." + icon_state = "gothic2" + /obj/item/clothing/under/captainformal name = "site manager's formal uniform" desc = "A Site Manager's formal-wear, for special occasions." diff --git a/icons/mob/species/seromi/head.dmi b/icons/mob/species/seromi/head.dmi index 0055a2ca5d..51eff217bb 100644 Binary files a/icons/mob/species/seromi/head.dmi and b/icons/mob/species/seromi/head.dmi differ diff --git a/icons/mob/species/seromi/uniform.dmi b/icons/mob/species/seromi/uniform.dmi index 88408e1f58..aab4dcfe06 100644 Binary files a/icons/mob/species/seromi/uniform.dmi and b/icons/mob/species/seromi/uniform.dmi differ diff --git a/icons/mob/uniform_1.dmi b/icons/mob/uniform_1.dmi index 839aa8f388..27a67cb2ca 100644 Binary files a/icons/mob/uniform_1.dmi and b/icons/mob/uniform_1.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 7b397d3ead..473b6614e6 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi index 9478ef888d..eba7fa299f 100644 Binary files a/icons/obj/clothing/uniforms_1.dmi and b/icons/obj/clothing/uniforms_1.dmi differ