diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index ef9ec65e2e..7a9727442e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -435,3 +435,19 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/accessory/charm + display_name = "charm selection" + description = "Choose from a selection of charm necklaces" + path = /obj/item/clothing/accessory/charm + cost = 1 + +/datum/gear/accessory/charm/New() + ..() + var/list/charmtype = list( + "wooden charm" = /obj/item/clothing/accessory/charm, + "sifwood charm" = /obj/item/clothing/accessory/charm/sifwood, + "stone charm" = /obj/item/clothing/accessory/charm/stone, + "metal charm" = /obj/item/clothing/accessory/charm/metal, + "bone charm" = /obj/item/clothing/accessory/charm/bone + ) + gear_tweaks += new/datum/gear_tweak/path(charmtype) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_ears.dm b/code/modules/client/preference_setup/loadout/loadout_ears.dm index 54b8481c5c..b69ca843e1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_ears.dm +++ b/code/modules/client/preference_setup/loadout/loadout_ears.dm @@ -56,3 +56,11 @@ "white hearing aid" = /obj/item/clothing/ears/hearingaid/white ) gear_tweaks += new/datum/gear_tweak/path(hearingaids) + +/datum/gear/ears/earwarmers + display_name = "ear warmers (colorable)" + path = /obj/item/clothing/ears/earmuffs/earwarmers + +/datum/gear/ears/earwarmers/New() + ..() + gear_tweaks += gear_tweak_free_color_choice \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves.dm b/code/modules/client/preference_setup/loadout/loadout_gloves.dm index 3421729fa3..4bf65e4a72 100644 --- a/code/modules/client/preference_setup/loadout/loadout_gloves.dm +++ b/code/modules/client/preference_setup/loadout/loadout_gloves.dm @@ -102,3 +102,11 @@ display_name = "gloves, botanic leather" path = /obj/item/clothing/gloves/botanic_leather cost = 2 + +/datum/gear/gloves/mittens + display_name = "mittens (colorable)" + path = /obj/item/clothing/gloves/mittens + +/datum/gear/gloves/mittens/New() + ..() + gear_tweaks += gear_tweak_free_color_choice \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 5205d9f367..7f40f1d34d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -423,3 +423,15 @@ var/obj/item/clothing/head/collectable/costume_type = costume costumes[initial(costume_type.name)] = costume_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes)) + +/datum/gear/head/wooly + display_name = "wooly hat (colorable)" + path = /obj/item/clothing/head/wooly + +/datum/gear/head/wooly/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/head/woolynt + display_name = "wooly hat, nanotrasen" + path = /obj/item/clothing/head/wooly/nt \ No newline at end of file diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm index fc6e5ad8dc..a357343e42 100644 --- a/code/modules/clothing/ears/ears.dm +++ b/code/modules/clothing/ears/ears.dm @@ -175,3 +175,13 @@ /obj/item/clothing/ears/hearingaid/white name = "white hearing aid" icon_state = "hearing_aid_white" + +/obj/item/clothing/ears/earmuffs/earwarmers + name = "ear warmers" + desc ="A pair of fuzzy ear warmers." + icon = 'icons/obj/clothing/ears.dmi' + icon_state = "ear_warmers" + gender = PLURAL + slot_flags = SLOT_EARS// | SLOT_TWOEARS twoears breaks the recolorability on it. + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + volume_multiplier = 0.7 //not designed to block sound like earmuffs but still covers over the ears, so blocks sound a bit diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 1f4e2ff521..2d66faa84f 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -173,3 +173,9 @@ /obj/item/clothing/gloves/ranger/yellow glovecolor = "yellow" + +/obj/item/clothing/gloves/mittens + name = "mittens" + desc = "A pair of cozy woolen mittens." + icon_state = "mittens" + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8775e2f6a2..350c98fda5 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -385,3 +385,14 @@ desc = "You... you're not actually going to wear that, right?" icon_state = "fishskull" flags_inv = HIDEEARS|BLOCKHEADHAIR + +/obj/item/clothing/head/wooly + name = "wooly hat" + desc = "A cozy hat made of real wool. It even has a bobble!" + icon_state = "woolhat" + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + +/obj/item/clothing/head/wooly/nt + name = "\improper NanoTrasen wooly hat" + desc = "A cozy hat made of real wool. It even has a bobble! This one is in NanoTrasen colors." + icon_state = "woolhat_nt" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 82f6699b31..a027668f36 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -617,3 +617,29 @@ desc = "An oversized bow that sits on the small of your back. Seems like something a magical girl would wear." icon_state = "backbow" slot = ACCESSORY_SLOT_DECOR + +/obj/item/clothing/accessory/charm + name = "wooden charm" + desc = "A simple carved wooden charm attached to a length of string." + icon_state = "wooden_charm" + w_class = ITEMSIZE_SMALL + slot_flags = SLOT_MASK | SLOT_TIE + +/obj/item/clothing/accessory/charm/sifwood + name = "sivian wood charm" + icon_state = "sifwood_charm" + +/obj/item/clothing/accessory/charm/stone + name = "stone charm" + desc = "A small carved stone attached to a length of string." + icon_state = "stone_charm" + +/obj/item/clothing/accessory/charm/metal + name = "metal charm" + desc = "A small disc of metal attached to a length of string." + icon_state = "metal_charm" + +/obj/item/clothing/accessory/charm/bone + name = "bone charm" + desc = "A carved bone charm attached to a length of string." + icon_state = "bone_charm" \ No newline at end of file diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index 9e7c5c877c..ac2f75212d 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 3c37594c07..1f1df0f00f 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index f458bd0902..60d6498b76 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index a509c02274..6d277fc25f 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/species/teshari/ears.dmi b/icons/mob/species/teshari/ears.dmi index 5cb0bd4d3d..3ff9c17bed 100644 Binary files a/icons/mob/species/teshari/ears.dmi and b/icons/mob/species/teshari/ears.dmi differ diff --git a/icons/mob/species/teshari/gloves.dmi b/icons/mob/species/teshari/gloves.dmi index a7a6191305..d025f9e2ca 100644 Binary files a/icons/mob/species/teshari/gloves.dmi and b/icons/mob/species/teshari/gloves.dmi differ diff --git a/icons/mob/species/teshari/head.dmi b/icons/mob/species/teshari/head.dmi index 3ff1d7c4ab..99826afccf 100644 Binary files a/icons/mob/species/teshari/head.dmi and b/icons/mob/species/teshari/head.dmi differ diff --git a/icons/mob/species/teshari/masks.dmi b/icons/mob/species/teshari/masks.dmi index c426a0bc00..068592e27b 100644 Binary files a/icons/mob/species/teshari/masks.dmi and b/icons/mob/species/teshari/masks.dmi differ diff --git a/icons/mob/species/teshari/ties.dmi b/icons/mob/species/teshari/ties.dmi index cfaba777ed..129d20014c 100644 Binary files a/icons/mob/species/teshari/ties.dmi and b/icons/mob/species/teshari/ties.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index cf55b25774..0b2bb572f6 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index c17bdec8e6..46426fad56 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index bbade60a33..2eb207ff84 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 7dcd7e4926..79f58709dd 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index a2274dd075..ad0ee3e694 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ