Skip to content

Commit

Permalink
Updates santa hats (#5069)
Browse files Browse the repository at this point in the history
# About the pull request

New sprites

# Explain why it's good for the game

Looks better

# Changelog

:cl:
imageadd: New sprite for Santa hats
/:cl:
  • Loading branch information
BeagleGaming1 committed Dec 14, 2023
1 parent 7849541 commit 16579e6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
5 changes: 4 additions & 1 deletion code/modules/clothing/spacesuits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
/obj/item/clothing/head/helmet/space/santahat
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
icon_state = "santa_hat_red"
flags_inventory = NOPRESSUREDMAGE|BLOCKSHARPOBJ
flags_inv_hide = HIDEEYES
flags_armor_protection = BODY_FLAG_HEAD

/obj/item/clothing/head/helmet/space/santahat/green
icon_state = "santa_hat_green"

/obj/item/clothing/suit/space/santa
name = "Santa's suit"
desc = "Festive!"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_marines/Donator_Items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@
/obj/item/clothing/head/helmet/marine/fluff/santahat //CKEY=tophatpenguin
name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat"
icon_state = "santa_hat_red"
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEALLHAIR

Expand Down
6 changes: 4 additions & 2 deletions code/modules/decorators/christmas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@
helmet.desc = "Ho ho ho, Merry Christmas!"
helmet.icon = 'icons/obj/items/clothing/hats.dmi'
helmet.icon_override = 'icons/mob/humans/onmob/head_0.dmi'
helmet.icon_state = "santahat"
helmet.flags_inventory = BLOCKSHARPOBJ
helmet.flags_inv_hide = HIDEEARS|HIDEALLHAIR
helmet.flags_marine_helmet = NO_FLAGS
if(prob(50))
helmet.icon_state = "santa_hat_red"
else
helmet.icon_state = "santa_hat_green"
helmet.update_icon()

// barricade definition. Also only a single definition
Expand Down
Binary file modified icons/mob/humans/onmob/head_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/hats.dmi
Binary file not shown.

0 comments on commit 16579e6

Please sign in to comment.