diff --git a/baystation12.int b/baystation12.int index 28f433f0ff9..b82874fded5 100644 --- a/baystation12.int +++ b/baystation12.int @@ -3,4 +3,4 @@ MAP_ICON_TYPE: 0 AUTO_FILE_DIR: OFF */ -// END_INTERNALS \ No newline at end of file +// END_INTERNALS diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 5c785078086..72d30a72011 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -318,6 +318,12 @@ var/global/list/gear_datums = list() slot = slot_w_uniform cost = 3 +/datum/gear/sundress_white + display_name = "sundress, white" + path = /obj/item/clothing/under/sundress_white + slot = slot_w_uniform + cost = 3 + /datum/gear/cheongsam display_name = "cheongsam, white" path = /obj/item/clothing/under/cheongsam diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index f28104b9be5..188790832b9 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -392,6 +392,14 @@ item_color = "sundress" body_parts_covered = UPPER_TORSO|LOWER_TORSO +/obj/item/clothing/under/sundress_white + name = "white sundress" + desc = "A white sundress decorated with purple lilies." + icon_state = "whitesundress" + item_state = "whitesundress" + item_color = "whitesundress" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + /obj/item/clothing/under/captainformal name = "captain's formal uniform" desc = "A captain's formal-wear, for special occasions." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index ff791b0f481..07398cbd86b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1010,16 +1010,6 @@ item_color = "harper_uniform" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS -//////////////////// Layla's Dress - Layla Davies-Halabi - sabirm /////////////// - -/obj/item/clothing/under/fluff/layla_davieshalabi - name = "White floral sundress" - desc = "A loose, white sundress decorated with purple lilies. It looks well looked-after." - icon = 'icons/obj/custom_items.dmi' - icon_state = "layladress" - item_state = "layladress" - item_color = "layladress" - //////////////////// Corporate Cap - Robert Mason - Masterrbc //////////////////// /obj/item/clothing/head/soft/sec/corp/fluff/robert_mason diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index de2055aeaa1..ffc7169614d 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 0d01201a642..43f9eb909bf 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ