From 3661cf6fb2aa000c84cd010716b2a0d6608f1c67 Mon Sep 17 00:00:00 2001 From: Blundir <100090741+Blundir@users.noreply.github.com> Date: Sat, 28 Dec 2024 23:53:43 +0200 Subject: [PATCH] Fixes santa hat inhands + makes it hide only top hair (#7913) # About the pull request Title # Testing Photographs and Procedure
Screenshots & Videos ![dreamseeker_8RIMLCsn19](https://github.com/user-attachments/assets/b8452286-1708-4715-97e4-44f29b86518a) ![dreamseeker_xCcnmkbbdy](https://github.com/user-attachments/assets/c31cd6c1-9ac7-4d2f-b631-c4f648cd7dbc)
# Changelog :cl: fix: fixed santa hat missing inhands fix: santa hat hiding all hair instead of just top hair /:cl: Co-authored-by: forest2001 <41653574+realforest2001@users.noreply.github.com> --- code/modules/decorators/christmas.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/decorators/christmas.dm b/code/modules/decorators/christmas.dm index 8593f0847bfc..c2f2638a316b 100644 --- a/code/modules/decorators/christmas.dm +++ b/code/modules/decorators/christmas.dm @@ -48,14 +48,18 @@ helmet.name = "\improper USCM [helmet.specialty] santa hat" helmet.desc = "Ho ho ho, Merry Christmas!" helmet.icon = 'icons/obj/items/clothing/hats/hats.dmi' - helmet.icon_override = 'icons/mob/humans/onmob/clothing/head/hats.dmi' - helmet.flags_inv_hide = HIDEEARS|HIDEALLHAIR + helmet.item_icons[WEAR_HEAD] = 'icons/mob/humans/onmob/clothing/head/hats.dmi' + helmet.item_icons[WEAR_L_HAND] = 'icons/mob/humans/onmob/inhands/clothing/hats_lefthand.dmi' + helmet.item_icons[WEAR_R_HAND] = 'icons/mob/humans/onmob/inhands/clothing/hats_righthand.dmi' + helmet.flags_inv_hide = HIDEEARS|HIDETOPHAIR helmet.flags_marine_helmet = NO_FLAGS helmet.flags_atom |= NO_GAMEMODE_SKIN|NO_NAME_OVERRIDE if(prob(50)) helmet.icon_state = "santa_hat_red" + helmet.item_state = "santa_hat_red" else helmet.icon_state = "santa_hat_green" + helmet.item_state = "santa_hat_green" helmet.update_icon() // barricade definition. Also only a single definition