diff --git a/code/modules/clothing/head/god_hats.dm b/code/modules/clothing/head/god_hats.dm index 3419739ceb5..386cc4ee593 100644 --- a/code/modules/clothing/head/god_hats.dm +++ b/code/modules/clothing/head/god_hats.dm @@ -20,6 +20,37 @@ salvage_amount = 1 salvage_result = /obj/item/natural/silk +/obj/item/clothing/head/roguehood/malumcowl + name = "toiler's cowl" + desc = "A simple cowl worn by those who toil in worship of Malum." + icon_state = "malumcowl" + flags_inv = HIDEEARS|HIDEHAIR + default_hidden = HIDEEARS|HIDEHAIR + item_weight = 250 GRAMS + +/obj/item/clothing/head/roguehood/malumcowl/AdjustClothes(mob/user) + if(loc == user) + playsound(user, "rustle", 70, TRUE, -5) + if(adjustable == CAN_CADJUST) + adjustable = CADJUSTED + if(toggle_icon_state) + icon_state = "[initial(icon_state)]_t" + flags_inv = HIDEEARS|HIDEHAIR + body_parts_covered = NECK|HAIR|EARS|HEAD + dynamic_hair_suffix = "+generic" + if(ishuman(user)) + var/mob/living/carbon/H = user + H.update_inv_head() + else if(adjustable == CADJUSTED) + ResetAdjust(user) + flags_inv = default_hidden + if(user) + if(ishuman(user)) + var/mob/living/carbon/H = user + H.update_inv_head() + user.update_fov_angles() + user.regenerate_clothes() + /obj/item/clothing/head/padded/deathface name = "death shroud" desc = "A Veil for those in service to the Veiled Lady. When inducted into the cult of Necra, the supplicant must make a talisman to hold the memory of a loved one since passed." diff --git a/code/modules/clothing/shirts/robe.dm b/code/modules/clothing/shirts/robe.dm index 8c0bd07a30d..542f6575a79 100644 --- a/code/modules/clothing/shirts/robe.dm +++ b/code/modules/clothing/shirts/robe.dm @@ -100,6 +100,15 @@ desc = "Black robes which cover the body not unlike those in depictions of the Carriageman himself." icon_state = "necrarobe" +/obj/item/clothing/shirt/robe/malum + name = "toiler's vest" + desc = "A red vest worn by those who toil in the name of Malum." + icon_state = "malumrobe" + slot_flags = ITEM_SLOT_ARMOR + body_parts_covered = CHEST|GROIN|ARMS|VITALS + r_sleeve_status = SLEEVE_NOMOD + l_sleeve_status = SLEEVE_NOMOD + /obj/item/clothing/shirt/robe/priest name = "solar vestments" desc = "Holy vestments sanctified by divine hands. Caution is advised if not a faithful." diff --git a/code/modules/crafting/quality_of_crafting/weaving.dm b/code/modules/crafting/quality_of_crafting/weaving.dm index e0749592f15..fdf7ce3ba87 100644 --- a/code/modules/crafting/quality_of_crafting/weaving.dm +++ b/code/modules/crafting/quality_of_crafting/weaving.dm @@ -151,6 +151,14 @@ craftdiff = 3 category = "Hat" +/datum/repeatable_crafting_recipe/sewing/weaving/malumcoif + name = "hood (Malum)" + output = /obj/item/clothing/head/roguehood/malumcowl + requirements = list(/obj/item/natural/cloth = 2, + /obj/item/natural/silk = 1) + craftdiff = 3 + category = "Hat" + /datum/repeatable_crafting_recipe/sewing/weaving/eorahood name = "hood (eora)" output = /obj/item/clothing/head/roguehood/eora @@ -297,6 +305,13 @@ /obj/item/natural/silk = 1) craftdiff = 4 +/datum/repeatable_crafting_recipe/sewing/weaving/malumrobe + name = "robes (Malum)" + output = /obj/item/clothing/shirt/robe/malum + requirements = list(/obj/item/natural/cloth = 3, + /obj/item/natural/silk = 1) + craftdiff = 4 + /datum/repeatable_crafting_recipe/sewing/weaving/necrarobe name = "robes (Necra)" output = /obj/item/clothing/shirt/robe/necra diff --git a/code/modules/jobs/job_types/church/monk.dm b/code/modules/jobs/job_types/church/monk.dm index e8b8840a243..9f4a4f352fe 100644 --- a/code/modules/jobs/job_types/church/monk.dm +++ b/code/modules/jobs/job_types/church/monk.dm @@ -260,10 +260,12 @@ shoes = /obj/item/clothing/shoes/boots armor = /obj/item/clothing/shirt/robe/colored/purple if(/datum/patron/divine/malum) - head = /obj/item/clothing/head/headband/colored/red + head = /obj/item/clothing/head/roguehood/malumcowl neck = /obj/item/clothing/neck/psycross/silver/divine/malum shoes = /obj/item/clothing/shoes/boots - armor = /obj/item/clothing/shirt/robe/colored/red + pants = /obj/item/clothing/pants/tights/colored/black + shirt = /obj/item/clothing/shirt/shortshirt/colored/uncolored + armor = /obj/item/clothing/shirt/robe/malum backl = /obj/item/weapon/polearm/woodstaff/quarterstaff backpack_contents += /obj/item/weapon/hammer/iron else diff --git a/icons/roguetown/clothing/armor.dmi b/icons/roguetown/clothing/armor.dmi index b1752cb1fe4..b67b3650578 100644 Binary files a/icons/roguetown/clothing/armor.dmi and b/icons/roguetown/clothing/armor.dmi differ diff --git a/icons/roguetown/clothing/head.dmi b/icons/roguetown/clothing/head.dmi index e53477696f0..6338520be16 100644 Binary files a/icons/roguetown/clothing/head.dmi and b/icons/roguetown/clothing/head.dmi differ diff --git a/icons/roguetown/clothing/onmob/armor.dmi b/icons/roguetown/clothing/onmob/armor.dmi index fbe0e533252..904fb6672fb 100644 Binary files a/icons/roguetown/clothing/onmob/armor.dmi and b/icons/roguetown/clothing/onmob/armor.dmi differ diff --git a/icons/roguetown/clothing/onmob/head.dmi b/icons/roguetown/clothing/onmob/head.dmi index 250be71170b..fae6500fd68 100644 Binary files a/icons/roguetown/clothing/onmob/head.dmi and b/icons/roguetown/clothing/onmob/head.dmi differ diff --git a/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi b/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi index b0a08ac3c09..0ea90e827f4 100644 Binary files a/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi and b/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi differ