Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553

[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!

code/__DEFINES/construction.dm

@@ -101,6 +101,7 @@
 #define CAT_ROBOT	"Robots"
 #define CAT_MISC	"Misc"
 #define CAT_PRIMAL  "Tribal"
+#define CAT_CLOTHING	"Clothing"
 #define CAT_FOOD	"Foods"
 #define CAT_BREAD	"Breads"
 #define CAT_BURGER	"Burgers"

code/game/objects/items/holy_weapons.dm

@@ -405,3 +405,14 @@
 	attack_verb = list("poked", "impaled", "pierced", "jabbed")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP
+
+/obj/item/nullrod/egyptian
+	name = "egyptian staff"
+	desc = "A tutorial in mummification is carved into the staff. You could probably follow the steps yourself if you had some bandages."
+	icon = 'icons/obj/guns/magic.dmi'
+	icon_state = "pharoah_sceptre"
+	item_state = "pharoah_sceptre"
+	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+	w_class = WEIGHT_CLASS_NORMAL
+	attack_verb = list("bashes", "smacks", "whacks")

code/modules/clothing/head/misc.dm

@@ -302,3 +302,9 @@
 	desc = "A hat with bells, to add some merriness to the suit."
 	icon_state = "jester_hat2"
 	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/nemes
+	name = "headress of Nemes"
+	desc = "Lavish space tomb not included."
+	icon_state = "nemes_headdress"
+	icon_state = "nemes_headdress"

code/modules/clothing/suits/miscellaneous.dm

@@ -423,6 +423,14 @@
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	allowed = list(/obj/item/clothing/mask/facehugger/toy)
 
+/obj/item/clothing/suit/nemes
+	name = "pharoah tunic"
+	desc = "Lavish space tomb not included."
+	icon_state = "pharoah"
+	icon_state = "pharoah"
+	body_parts_covered = CHEST|GROIN
+
+
 
 // WINTER COATS
 

code/modules/clothing/under/miscellaneous.dm

@@ -702,4 +702,4 @@
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
-	resistance_flags = NONE
+	resistance_flags = NONE

code/modules/crafting/craft.dm

@@ -7,7 +7,8 @@
 				CAT_ROBOT,
 				CAT_MISC,
 				CAT_PRIMAL,
-				CAT_FOOD)
+				CAT_FOOD,
+				CAT_CLOTHING)
 	var/list/subcategories = list(
 						list(	//Weapon subcategories
 							CAT_WEAPON,

code/modules/crafting/recipes.dm

@@ -569,3 +569,17 @@
 	tools = list(/obj/item/weldingtool, /obj/item/screwdriver, /obj/item/wrench)
 	reqs = list(/obj/item/stack/sheet/metal = 15)
 	category = CAT_MISC
+
+/datum/crafting_recipe/mummy/
+	name = "Mummification Bandages (Mask)"
+	result = /obj/item/clothing/mask/mummy
+	time = 10
+	tools = list(/obj/item/nullrod/egyptian)
+	reqs = list(/obj/item/stack/sheet/cloth = 2)
+	category = CAT_CLOTHING
+
+
+/datum/crafting_recipe/mummy/body
+	name = "Mummification Bandages (Body)"
+	result = /obj/item/clothing/under/mummy
+	reqs = list(/obj/item/stack/sheet/cloth = 5)