mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 11:05:03 +01:00
Adds a Santa hat and Santa suit item, and improves admin-only Santa's hat and Santa's suit. (#31172)
* adds a crew santa hat and suit, improves the Santa's hat and Santa's suit * fix santa hat flags * address a PR comment AND the new span stuff at the same time, wowie zowie
This commit is contained in:
+6
-2
@@ -778,7 +778,9 @@
|
||||
/obj/item/clothing/under/costume/kasaya = 1,
|
||||
/obj/item/clothing/under/costume/modestgreen = 1,
|
||||
/obj/item/clothing/under/costume/thobe = 1,
|
||||
/obj/item/clothing/neck/cloak/tallit = 1)
|
||||
/obj/item/clothing/neck/cloak/tallit = 1,
|
||||
/obj/item/clothing/head/santahat = 3,
|
||||
/obj/item/clothing/suit/santa = 1)
|
||||
|
||||
contraband = list(/obj/item/clothing/suit/judgerobe = 1,
|
||||
/obj/item/clothing/head/powdered_wig = 1,
|
||||
@@ -914,7 +916,9 @@
|
||||
/obj/item/clothing/under/costume/kasaya = 100,
|
||||
/obj/item/clothing/under/costume/modestgreen = 100,
|
||||
/obj/item/clothing/under/costume/thobe = 100,
|
||||
/obj/item/clothing/neck/cloak/tallit = 75)
|
||||
/obj/item/clothing/neck/cloak/tallit = 75,
|
||||
/obj/item/clothing/head/santahat = 50,
|
||||
/obj/item/clothing/suit/santa = 200)
|
||||
|
||||
refill_canister = /obj/item/vending_refill/autodrobe
|
||||
|
||||
|
||||
@@ -121,6 +121,16 @@
|
||||
icon_monitor = 'icons/mob/clothing/species/machine/monitor/hat.dmi'
|
||||
sprite_sheets = list("Grey" = 'icons/mob/clothing/species/grey/head.dmi')
|
||||
|
||||
/obj/item/clothing/head/santahat
|
||||
name = "\improper Santa hat"
|
||||
desc = "A festive red hat."
|
||||
icon_state = "santahat"
|
||||
dog_fashion = /datum/dog_fashion/head/santa
|
||||
sprite_sheets = list(
|
||||
"Grey" = 'icons/mob/clothing/species/Grey/head.dmi',
|
||||
"Drask" = 'icons/mob/clothing/species/Drask/helmet.dmi'
|
||||
)
|
||||
|
||||
/obj/item/clothing/head/greenbandana
|
||||
name = "green bandana"
|
||||
desc = "It's a green bandana with some fine nanotech lining."
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
//Space santa outfit suit
|
||||
/obj/item/clothing/head/helmet/space/santahat
|
||||
name = "Santa's hat"
|
||||
desc = "Ho ho ho. Merrry X-mas!"
|
||||
desc = "Ho ho ho. Merrry X-mas! This one is spaceworthy."
|
||||
icon_state = "santahat"
|
||||
inhand_icon_state = null
|
||||
sprite_sheets = list(
|
||||
@@ -113,8 +113,13 @@
|
||||
)
|
||||
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
|
||||
flags_cover = HEADCOVERSEYES
|
||||
flags_inv = HIDEEARS
|
||||
dog_fashion = /datum/dog_fashion/head/santa
|
||||
|
||||
/obj/item/clothing/head/helmet/space/santahat/examine(mob/user)
|
||||
. = ..()
|
||||
. += SPAN_NOTICE("Use in hand to toggle the hat's beard.")
|
||||
|
||||
/obj/item/clothing/head/helmet/space/santahat/attack_self__legacy__attackchain(mob/user)
|
||||
if(icon_state == "santahat")
|
||||
icon_state = "santahat_beard"
|
||||
@@ -125,7 +130,7 @@
|
||||
|
||||
/obj/item/clothing/suit/space/santa
|
||||
name = "Santa's suit"
|
||||
desc = "Festive!"
|
||||
desc = "Festive! This one is spaceworthy."
|
||||
icon_state = "santa"
|
||||
inhand_icon_state = null
|
||||
slowdown = 0
|
||||
|
||||
@@ -212,6 +212,12 @@
|
||||
flags_inv = HIDEJUMPSUIT
|
||||
insert_max = 0
|
||||
|
||||
/obj/item/clothing/suit/santa
|
||||
name = "\improper Santa suit"
|
||||
desc = "A festive red suit. Ho ho ho!"
|
||||
icon_state = "santa"
|
||||
insert_max = 0
|
||||
|
||||
/obj/item/clothing/suit/poncho
|
||||
name = "poncho"
|
||||
desc = "Your classic, non-racist poncho."
|
||||
|
||||
Reference in New Issue
Block a user