diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index e29b7d0a22..14f78b6e91 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -383,3 +383,7 @@ /datum/gear/head/rose_crown display_name = "rose crown" path = /obj/item/clothing/head/rose_crown + +/datum/gear/head/blackngoldheaddress + display_name = "black and gold headdress" + path = /obj/item/clothing/head/blackngoldheaddress \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 71c6f96140..e61ff84d6a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -588,4 +588,29 @@ /datum/gear/uniform/cyberpunkharness display_name = "cyberpunk strapped harness" - path = /obj/item/clothing/under/cyberpunkharness \ No newline at end of file + path = /obj/item/clothing/under/cyberpunkharness + +/datum/gear/uniform/whitegown + display_name = "white gown" + path = /obj/item/clothing/under/wedding/whitegown + +/datum/gear/uniform/floofdress + display_name = "floofy dress" + path = /obj/item/clothing/under/wedding/floofdress + +/datum/gear/uniform/floofdress/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/uniform/blackngold + display_name = "black and gold gown" + path = /obj/item/clothing/under/blackngold + +/datum/gear/uniform/sheerblue + display_name = "sheer blue dress" + path = /obj/item/clothing/under/sheerblue + +/datum/gear/uniform/disheveled + display_name = "disheveled suit" + path = /obj/item/clothing/under/disheveled + diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index dff571c50f..dab5e97075 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -445,3 +445,10 @@ desc = "A gold-lined white cowl. It gives off uncomfortable cult vibes, but fancy." icon_state = "whitecowl" body_parts_covered = 0 + +/obj/item/clothing/head/blackngoldheaddress + name = "black and gold headdress" + desc = "An odd looking headdress that covers the eyes." + icon_state = "blackngoldheaddress" + flags_inv = HIDEEYES + body_parts_covered = HEAD|EYES diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 1d4ba551d9..092f33fd86 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -603,6 +603,19 @@ obj/item/clothing/under/dress/yellowswoop flags_inv = HIDESHOES body_parts_covered = UPPER_TORSO|LOWER_TORSO +/obj/item/clothing/under/wedding/floofdress + name = "floofy dress" + desc = "A lovely floofed out dress for formal occasions. Comes in many colors!" + icon_state = "floofdress" + flags_inv = HIDESHOES + index = 1 + +/obj/item/clothing/under/wedding/whitegown + name = "white gown" + desc = "A elegant white gown with accents of sheer mesh." + icon_state = "whitegown" + index = 1 + /* Uniforms and such */ @@ -816,6 +829,24 @@ Uniforms and such icon_state = "cyberhell" index = 1 +/obj/item/clothing/under/blackngold + name = "black and gold gown" + desc = "A black and gold gown. You get the impression this is typically worn for religious purposes." + icon_state = "blackngold" + index = 1 + +/obj/item/clothing/under/sheerblue + name = "sheer blue dress" + desc = "An entirely sheer blue dress. Best worn with something underneath!" + icon_state = "sheerblue" + index = 1 + +/obj/item/clothing/under/disheveled + name = "disheveled suit" + desc = "What might pass as well maintained formal attire. If you're blind." + icon_state = "disheveled" + index = 1 + /* * swimsuit */ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d2be45594c..69842406d4 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/uniform_1.dmi b/icons/mob/uniform_1.dmi index 20749c8afc..839aa8f388 100644 Binary files a/icons/mob/uniform_1.dmi and b/icons/mob/uniform_1.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 6f8f14c6a2..8be6774832 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi index 32a55ec9c2..9478ef888d 100644 Binary files a/icons/obj/clothing/uniforms_1.dmi and b/icons/obj/clothing/uniforms_1.dmi differ