diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 7de598fc83..85a7d22111 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -517,3 +517,43 @@ /datum/gear/uniform/lilacdress display_name = "lilac dress" path = /obj/item/clothing/under/dress/lilacdress + +/datum/gear/uniform/polka + display_name = "polka dot dress" + path = /obj/item/clothing/under/dress/polka + +/datum/gear/uniform/twistfront + display_name = "twistfront crop dress" + path = /obj/item/clothing/under/dress/twistfront + +/datum/gear/uniform/cropdress + display_name = "crop dress" + path = /obj/item/clothing/under/dress/cropdress + +/datum/gear/uniform/vneckdress + display_name = "v-neck dress" + path = /obj/item/clothing/under/dress/vneck + +/datum/gear/uniform/bluedress + display_name = "blue dress" + path = /obj/item/clothing/under/dress/bluedress + +/datum/gear/uniform/wench + display_name = "wench's dress" + path = /obj/item/clothing/under/dress/wench + +/datum/gear/uniform/littleblackdress + display_name = "little black dress" + path = /obj/item/clothing/under/dress/littleblackdress + +/datum/gear/uniform/pinktutu + display_name = "pink tutu" + path = /obj/item/clothing/under/dress/pinktutu + +/datum/gear/uniform/festivedress + display_name = "festive dress" + path = /obj/item/clothing/under/dress/festivedress + +/datum/gear/uniform/haltertop + display_name = "halter top" + path = /obj/item/clothing/under/haltertop \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index c7ccb6a31a..fc7c458bf3 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -458,6 +458,82 @@ desc = "A simple black dress adorned in fake purple lilacs." icon_state = "lilacdress" +/obj/item/clothing/under/dress/white + name = "white wedding dress" + desc = "A fancy white dress with a blue underdress." + icon_state = "whitedress1" + flags_inv = HIDESHOES + +/obj/item/clothing/under/dress/white2 + name = "long dress" + desc = "A long dress." + icon_state = "whitedress2" + addblends = "whitedress2_a" + flags_inv = HIDESHOES + +/obj/item/clothing/under/dress/white3 + name = "short dress" + desc = "A short, plain dress." + icon_state = "whitedress3" + addblends = "whitedress3_a" + +/obj/item/clothing/under/dress/white4 + name = "long flared dress" + desc = "A long white dress that flares out at the bottom." + icon_state = "whitedress4" + addblends = "whitedress4_a" + flags_inv = HIDESHOES + +/obj/item/clothing/under/dress/darkred + name = "fancy dark red dress" + desc = "A short, red dress with a black belt. Fancy." + icon_state = "darkreddress" + +/obj/item/clothing/under/dress/polka + name = "polka dot dress" + desc = "A sleeveless, cream colored dress with red polka dots." + icon_state = "polka" + +/obj/item/clothing/under/dress/twistfront + name = "twistfront crop dress" + desc = "A black skirt and red twistfront croptop. Fancy!" + icon_state = "twistfront" + +/obj/item/clothing/under/dress/cropdress + name = "crop dress" + desc = "A red skirt and longsleeved button-up crop top." + icon_state = "cropdress" + +/obj/item/clothing/under/dress/vneck + name = "v-neck dress" + desc = "A black v-neck dress with an exaggerated neckline covered in a sheer mesh." + icon_state = "vneckdress" + +/obj/item/clothing/under/dress/bluedress + name = "blue dress" + desc = "A plain blue dress with a white belt." + icon_state = "bluedress" + +/obj/item/clothing/under/dress/wench + name = "wench's dress" + desc = "A white dress styled like a Ye Old Barmaid. Saucy!" + icon_state = "wench" + +/obj/item/clothing/under/dress/littleblackdress + name = "little black dress" + desc = "A little strapless black dress with a red ribbon and flower accessory." + icon_state = "littleblackdress" + +/obj/item/clothing/under/dress/pinktutu + name = "pink tutu" + desc = "A black leotard with a pink mesh tutu. Perfect for ballet practice." + icon_state = "pinktutu" + +/obj/item/clothing/under/dress/festivedress + name = "festive dress" + desc = "A red and white dress themed after some winter holidays. Tastefully festive!" + icon_state = "festivedress" + /* * wedding stuff */ @@ -495,6 +571,10 @@ flags_inv = HIDESHOES body_parts_covered = UPPER_TORSO|LOWER_TORSO +/* +Uniforms and such +*/ + /obj/item/clothing/under/sundress name = "sundress" desc = "Makes you want to frolic in a field of daisies." @@ -681,36 +761,10 @@ icon_state = "gear_harness" body_parts_covered = 0 -/obj/item/clothing/under/dress/white - name = "white wedding dress" - desc = "A fancy white dress with a blue underdress." - icon_state = "whitedress1" - flags_inv = HIDESHOES - -/obj/item/clothing/under/dress/white2 - name = "long dress" - desc = "A long dress." - icon_state = "whitedress2" - addblends = "whitedress2_a" - flags_inv = HIDESHOES - -/obj/item/clothing/under/dress/white3 - name = "short dress" - desc = "A short, plain dress." - icon_state = "whitedress3" - addblends = "whitedress3_a" - -/obj/item/clothing/under/dress/white4 - name = "long flared dress" - desc = "A long white dress that flares out at the bottom." - icon_state = "whitedress4" - addblends = "whitedress4_a" - flags_inv = HIDESHOES - -/obj/item/clothing/under/dress/darkred - name = "fancy dark red dress" - desc = "A short, red dress with a black belt. Fancy." - icon_state = "darkreddress" +/obj/item/clothing/under/haltertop + name = "halter top" + desc = "Jean shorts and a black halter top. Perfect for casual Fridays!" + icon_state = "haltertop" /* * swimsuit @@ -909,7 +963,7 @@ desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure." icon_state = "cohesionsuit_hazard" -//Uniforms +//Ranger uniforms //On-mob sprites go in icons\mob\uniform.dmi with the format "white_ranger_uniform_s" - with 'white' replaced with green, cyan, etc... of course! Note the _s - this is not optional. //Item sprites go in icons\obj\clothing\ranger.dmi with the format "white_ranger_uniform" /obj/item/clothing/under/color/ranger diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index c478e4a67f..d7172c72d3 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_face_m.dmi b/icons/mob/human_face_m.dmi index 4ad6ab2dd9..d817c2df4e 100644 Binary files a/icons/mob/human_face_m.dmi and b/icons/mob/human_face_m.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 997ad78f1b..b65057ef8b 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index fa1989ec5f..aad4cac13a 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 de5b30506c..d6a0376a9e 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ