diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3d63596c3b..d435303f1e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2702,6 +2702,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) save_preferences() if(href_list["select_category"]) category = text2num(href_list["select_category"]) + subcategory = 1 message_admins(category) if(href_list["select_subcategory"]) subcategory = text2num(href_list["select_subcategory"]) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 72d0f68c18..124ece8fdc 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -469,3 +469,16 @@ icon_state = "maid" item_state = "maid" dynamic_hair_suffix = "" + +/obj/item/clothing/head/widered + name = "Wide red hat" + desc = "It is both wide, and red. Stylish!" + icon_state = "widehat_red" + item_state = "widehat_red" + +/obj/item/clothing/head/kabuto + name = "Kabuto helmet" + desc = "A traditional kabuto helmet." + icon_state = "kabuto" + item_state = "kabuto" + flags_inv = HIDEHAIR|HIDEEARS diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 0b1121b22b..607a8ecb55 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1057,3 +1057,9 @@ desc = "Reminds you of someone, but you just can't put your finger on it..." icon_state = "waldo_shirt" item_state = "waldo_shirt" + +/obj/item/clothing/suit/samurai + name = "Samurai outfit" + desc = "An outfit used by traditional japanese warriors." + icon_state = "samurai" + item_state = "samurai" \ No newline at end of file diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 3e7bc755cb..18cd104ff8 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -329,3 +329,29 @@ desc = "cloud" icon_state = "cloud" can_adjust = FALSE + +/obj/item/clothing/under/costume/kimono + name = "Kimono" + desc = "A traditional piece of clothing from japan" + icon_state = "kimono" + item_state = "kimono" + +/obj/item/clothing/under/costume/kimono/black + name = "Black Kimono" + icon_state = "kimono_a" + item_state = "kimono_a" + +/obj/item/clothing/under/costume/kimono/kamishimo + name = "Kamishimo" + icon_state = "kamishimo" + item_state = "kamishimo" + +/obj/item/clothing/under/costume/kimono/fancy + name = "Fancy Kimono" + icon_state = "fancy_kimono" + item_state = "fancy_kimono" + +/obj/item/clothing/under/costume/kimono/sakura + name = "Sakura Kimono'" + icon_state = "sakura_kimono" + item_state = "sakura_kimono" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 997f10a379..3d47b2c33b 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -308,3 +308,21 @@ icon_state = "polyfemtankpantsu" poly_states = 2 poly_colors = list("#808080", "#FF3535") + +/obj/item/clothing/under/misc/black_dress + name = "little black dress" + desc = "A small black dress" + icon_state = "littleblackdress_s" + item_state = "littleblackdress_s" + +/obj/item/clothing/under/misc/pinktutu + name = "pink tutu" + desc = "A pink tutu" + icon_state = "pinktutu_s" + item_state = "pinktutu_s" + +/obj/item/clothing/under/misc/bathrobe + name = "bathrobe" + desc = "A blue bathrobe." + icon_state = "bathrobe" + item_state = "bathrobe" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index a6e75123bb..0ad9452994 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 7a690bb29f..c94e8a46d3 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi index 2616c0b893..dd00713770 100644 Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index fa376635f9..3d24a9addd 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index af72ac0e7b..bcb894033e 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 90f1fba315..60304999fa 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 258eb0dc35..e8a360bc87 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 57424c7b99..76f5722c8b 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index ef2d7a2680..a1495aa7bd 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -172,3 +172,11 @@ /datum/gear/head/wkepi name = "white kepi" path = /obj/item/clothing/head/kepi + +/datum/gear/head/widered + name = "Wide red hat" + path = /obj/item/clothing/head/widered + +/datum/gear/head/kabuto + name = "Kabuto helmet" + path = /obj/item/clothing/head/kabuto diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index a461a86784..539187af8b 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -244,3 +244,7 @@ name = "Red and Green Christmas Coat" path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg subcategory = SUBCATEGORY_SUIT_COATS + +/datum/gear/suit/samurai + name = "Samurai outfit" + path = /obj/item/clothing/suit/samurai diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index ca4462321f..e693f9d2f7 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -508,3 +508,35 @@ path = /obj/item/clothing/under/costume/cheongsam/red subcategory = SUBCATEGORY_UNIFORM_DRESSES cost = 3 + +/datum/gear/uniform/dress/black + name = "Black dress" + path = /obj/item/clothing/under/misc/black_dress + +/datum/gear/uniform/skirt/pinktutu + name = "Pink tutu" + path = /obj/item/clothing/under/misc/pinktutu + +/datum/gear/uniform/bathrobe + name = "Bathrobe" + path = /obj/item/clothing/under/misc/bathrobe + +/datum/gear/uniform/kimono + name = "Kimono" + path = /obj/item/clothing/under/costume/kimono + +/datum/gear/uniform/kimono/black + name = "Black kimono" + path = /obj/item/clothing/under/costume/kimono/black + +/datum/gear/uniform/kimono/kamishimo + name = "Kamishimo" + path = /obj/item/clothing/under/costume/kimono/kamishimo + +/datum/gear/uniform/kimono/fancy + name = "Fancy kimono" + path = /obj/item/clothing/under/costume/kimono/fancy + +/datum/gear/uniform/kimono/sakura + name = "Sakura kimono" + path = /obj/item/clothing/under/costume/kimono/sakura \ No newline at end of file