Merge pull request #9313 from Greenjoe12345/charming_winter

charming winter clothes
This commit is contained in:
Spookerton
2024-01-13 21:12:37 +00:00
committed by GitHub
22 changed files with 97 additions and 0 deletions
@@ -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)
@@ -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
@@ -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
@@ -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
+10
View File
@@ -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
@@ -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
+11
View File
@@ -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"
@@ -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"