Skip to content

Commit

Permalink
Fixes santa hat inhands + makes it hide only top hair (#7913)
Browse files Browse the repository at this point in the history
# About the pull request


Title


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![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)


</details>


# 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>
  • Loading branch information
Blundir and realforest2001 authored Dec 28, 2024
1 parent 50a297a commit 3661cf6
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions code/modules/decorators/christmas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3661cf6

Please sign in to comment.