Merge pull request #15655 from TrojanCoyote/trojancoyote

Kitsune masks
This commit is contained in:
deathride58
2022-06-01 00:25:36 -04:00
committed by GitHub
5 changed files with 54 additions and 0 deletions

View File

@@ -113,6 +113,50 @@
to_chat(user, "<span class='notice'>Your Joy mask now has a [choice] Emotion!</span>")
return 1
/obj/item/clothing/mask/kitsuneblk
name = "Black Kitsune Mask"
desc = "An oriental styled porcelain mask, this one is black and gold."
icon_state = "blackkitsunemask"
item_state = "blackkitsunemask"
w_class = WEIGHT_CLASS_TINY
flags_cover = MASKCOVERSMOUTH
flags_inv = HIDEFACE|HIDEFACIALHAIR
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
visor_flags_cover = MASKCOVERSMOUTH
slot_flags = ITEM_SLOT_MASK
/obj/item/clothing/mask/kitsuneblk/attack_self(mob/user)
adjustmask(user)
/obj/item/clothing/mask/kitsuneblk/AltClick(mob/user)
. = ..()
if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
adjustmask(user)
return TRUE
/obj/item/clothing/mask/kitsunewhi
name = "White Kitsune Mask"
desc = "An oriental styled porcelain mask, this one is white and red."
icon_state = "whitekitsunemask"
item_state = "whitekitsunemask"
w_class = WEIGHT_CLASS_TINY
flags_cover = MASKCOVERSMOUTH
flags_inv = HIDEFACE|HIDEFACIALHAIR
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
visor_flags_cover = MASKCOVERSMOUTH
slot_flags = ITEM_SLOT_MASK
/obj/item/clothing/mask/kitsunewhi/attack_self(mob/user)
adjustmask(user)
/obj/item/clothing/mask/kitsunewhi/AltClick(mob/user)
. = ..()
if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
adjustmask(user)
return TRUE
/obj/item/clothing/mask/pig
name = "pig mask"
desc = "A rubber pig mask with a builtin voice modulator."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 43 KiB

View File

@@ -15,6 +15,16 @@
path = /obj/item/clothing/mask/joy
cost = 3
/datum/gear/mask/kitsune
name = "White Kitsune Mask"
path = /obj/item/clothing/mask/kitsunewhi
cost = 2
/datum/gear/mask/black_kitsune
name = "Black Kitsune Mask"
path = /obj/item/clothing/mask/kitsuneblk
cost = 2
/datum/gear/mask/gas
name = "Gas Mask"
path = /obj/item/clothing/mask/gas