diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 2e34835f82e..cbf7a0a0910 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -99,8 +99,22 @@ name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" + species_fit = list("Grey, Drask") + sprite_sheets = list( + "Grey" = 'icons/mob/species/Grey/head.dmi', + "Drask" = 'icons/mob/species/Drask/helmet.dmi' + ) flags = BLOCKHAIR | STOPSPRESSUREDMAGE flags_cover = HEADCOVERSEYES +/obj/item/clothing/head/helmet/space/santahat/attack_self(mob/user as mob) + if(src.icon_state == "santahat") + src.icon_state = "santahat_beard" + src.item_state = "santahat_beard" + to_chat(user, "Santa's beard expands out from the hat!") + else + src.icon_state = "santahat" + src.item_state = "santahat" + to_chat(user, "The beard slinks back into the hat...") /obj/item/clothing/suit/space/santa name = "Santa's suit" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b5444b2ff87..c0f9c7a4a83 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index b40ca75991e..fd5fe11157e 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index cd2ed068568..83d5e0b5007 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/mob/species/drask/helmet.dmi b/icons/mob/species/drask/helmet.dmi index f3c683d8fdf..4ba9ca88b2c 100644 Binary files a/icons/mob/species/drask/helmet.dmi and b/icons/mob/species/drask/helmet.dmi differ diff --git a/icons/mob/species/grey/head.dmi b/icons/mob/species/grey/head.dmi index 5f0a6d25ced..1b1dce84a9c 100644 Binary files a/icons/mob/species/grey/head.dmi and b/icons/mob/species/grey/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 5166e198e64..99abc67ac44 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ