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

[MIRROR] Nock masks, cowls & robes

code/modules/clothing/head/misc.dm

@@ -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

code/modules/clothing/masks/miscellaneous.dm

@@ -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()
     ..()

code/modules/clothing/under/miscellaneous.dm

@@ -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"

html/changelogs/kartagrafi-nockrobes.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: kartagrafi
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Adds several clothing items to loadout such as: Nock masks, cowls and robes."