Merge pull request #4784 from VOREStation/upstream-merge-5956

[MIRROR] Nock masks, cowls & robes
This commit is contained in:
Novacat
2019-03-28 21:07:21 -04:00
committed by GitHub
4 changed files with 98 additions and 2 deletions
+13 -1
View File
@@ -426,4 +426,16 @@
desc = "A wide, flat rain hat originally from Japan."
icon_state = "jingasa"
body_parts_covered = 0
item_state_slots = list(slot_r_hand_str = "taq", slot_l_hand_str = "taq")
item_state_slots = list(slot_r_hand_str = "taq", slot_l_hand_str = "taq")
/obj/item/clothing/head/cowl
name = "black cowl"
desc = "A gold-lined black cowl. It gives off uncomfortable cult vibes, but fancy."
icon_state = "cowl"
body_parts_covered = 0
/obj/item/clothing/head/cowl
name = "white cowl"
desc = "A gold-lined white cowl. It gives off uncomfortable cult vibes, but fancy."
icon_state = "whitecowl"
body_parts_covered = 0
@@ -169,6 +169,34 @@
body_parts_covered = HEAD|FACE|EYES
w_class = ITEMSIZE_SMALL
siemens_coefficient = 0.9
/obj/item/clothing/mask/nock_scarab
name = "nock mask (blue, scarab)"
desc = "To Nock followers, masks symbolize rebirth and a new persona. Damaging the wearer's mask is generally considered an attack on their person itself."
icon_state = "nock_scarab"
w_class = ITEMSIZE_SMALL
body_parts_covered = HEAD|FACE
/obj/item/clothing/mask/nock_demon
name = "nock mask (purple, demon)"
desc = "To Nock followers, masks symbolize rebirth and a new persona. Damaging the wearer's mask is generally considered an attack on their person itself."
icon_state = "nock_demon"
w_class = ITEMSIZE_SMALL
body_parts_covered = HEAD|FACE
/obj/item/clothing/mask/nock_life
name = "nock mask (green, life)"
desc = "To Nock followers, masks symbolize rebirth and a new persona. Damaging the wearer's mask is generally considered an attack on their person itself."
icon_state = "nock_life"
w_class = ITEMSIZE_SMALL
body_parts_covered = HEAD|FACE
/obj/item/clothing/mask/nock_ornate
name = "nock mask (red, ornate)"
desc = "To Nock followers, masks symbolize rebirth and a new persona. Damaging the wearer's mask is generally considered an attack on their person itself."
icon_state = "nock_ornate"
w_class = ITEMSIZE_SMALL
body_parts_covered = HEAD|FACE
/obj/item/clothing/mask/horsehead/New()
..()
+21 -1
View File
@@ -301,6 +301,26 @@
icon_state = "ascetic"
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
/obj/item/clothing/under/robe
name = "black robe"
desc = "A black robe. It gives off uncomfortable cult vibes."
icon_state = "robe"
/obj/item/clothing/under/whiterobe
name = "white robe"
desc = "A white robe. It gives off uncomfortable cult vibes."
icon_state = "whiterobe"
/obj/item/clothing/under/goldrobe
name = "black gold-lined robe"
desc = "A gold-lined black robe. It gives off uncomfortable cult vibes, but fancy."
icon_state = "goldrobe"
/obj/item/clothing/under/whitegoldrobe
name = "white gold-lined robe"
desc = "A gold-lined white robe. It gives off uncomfortable cult vibes, but fancy."
icon_state = "whitegoldrobe"
/*
* dress
*/
@@ -882,4 +902,4 @@
/obj/item/clothing/under/cohesion/hazard
name = "hazard cohesion suit"
desc = "An orange cohesion suit with yellow hazard stripes intended to assist Prometheans in maintaining their form and prevent direct skin exposure."
icon_state = "cohesionsuit_hazard"
icon_state = "cohesionsuit_hazard"