Skip to content

Commit

Permalink
Fix Santa Hats breaking due to map camouflage (#5268)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->
Simple as it can be - the map camouflage was applied on santa helmets
when they don't have camouflage variants

# Explain why it's good for the game
Spirit of holidays and all that

# Testing Photographs and Procedure
Spawn on a camo-enabled map


# Changelog
:cl:
fix: Fix Xmas helmets getting overriden by map camouflage.
/:cl:

---------

Co-authored-by: Drathek <[email protected]>
  • Loading branch information
fira and Drulikar authored Dec 21, 2023
1 parent 53a0827 commit 53b20cf
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions code/modules/decorators/christmas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
helmet.icon_override = 'icons/mob/humans/onmob/head_0.dmi'
helmet.flags_inv_hide = HIDEEARS|HIDEALLHAIR
helmet.flags_marine_helmet = NO_FLAGS
helmet.flags_atom |= NO_SNOW_TYPE|NO_NAME_OVERRIDE
if(prob(50))
helmet.icon_state = "santa_hat_red"
else
Expand Down

0 comments on commit 53b20cf

Please sign in to comment.