diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm index 7be565e021f..ff40a7be293 100644 --- a/_maps/map_files/vanderlin/vanderlin.dmm +++ b/_maps/map_files/vanderlin/vanderlin.dmm @@ -1725,9 +1725,6 @@ /obj/item/clothing/neck/psycross/silver/divine/ravox, /obj/item/clothing/neck/psycross/silver/divine/ravox, /obj/item/clothing/neck/psycross/silver/divine/ravox, -/obj/item/clothing/neck/psycross/silver/divine/malum/steel, -/obj/item/clothing/neck/psycross/silver/divine/malum/steel, -/obj/item/clothing/neck/psycross/silver/divine/malum/steel, /turf/open/floor/churchmarble, /area/indoors/town/church) "aPp" = ( @@ -7249,7 +7246,16 @@ /obj/structure/fluff/walldeco/church/line{ dir = 4 }, -/obj/structure/chair/wood/alt, +/obj/structure/closet/crate/crafted_closet, +/obj/item/clothing/shirt/robe/malum, +/obj/item/clothing/shirt/robe/malum, +/obj/item/clothing/shirt/robe/malum, +/obj/item/clothing/head/padded/malumhood, +/obj/item/clothing/head/padded/malumhood, +/obj/item/clothing/head/padded/malumhood, +/obj/item/clothing/neck/psycross/silver/divine/malum/steel, +/obj/item/clothing/neck/psycross/silver/divine/malum/steel, +/obj/item/clothing/neck/psycross/silver/divine/malum/steel, /turf/open/floor/churchmarble, /area/indoors/town/church) "dvs" = ( diff --git a/code/modules/clothing/head/god_hats.dm b/code/modules/clothing/head/god_hats.dm index 3419739ceb5..b3c8e8f6be5 100644 --- a/code/modules/clothing/head/god_hats.dm +++ b/code/modules/clothing/head/god_hats.dm @@ -84,6 +84,13 @@ armor = ARMOR_MINIMAL prevent_crits = MINOR_CRITICALS +/obj/item/clothing/head/padded/malumhood + name = "sculptor's mask" + desc = "As Malum sculpts his great works, so does he sculpt his workers." + icon_state = "malumhood" + flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + item_weight = 250 GRAMS + /obj/item/clothing/head/roguehood/priest name = "solar visage" desc = "The sanctified headwear of the most devoted. The mask can be removed." diff --git a/code/modules/clothing/shirts/robe.dm b/code/modules/clothing/shirts/robe.dm index 8c0bd07a30d..ff61c969f81 100644 --- a/code/modules/clothing/shirts/robe.dm +++ b/code/modules/clothing/shirts/robe.dm @@ -34,7 +34,7 @@ /obj/item/clothing/shirt/robe/colored/black color = CLOTHING_DARK_INK -/obj/item/clothing/shirt/robe/colored/red//placeholder for malum & xylix acolyte robes +/obj/item/clothing/shirt/robe/colored/red//placeholder for xylix acolyte robes color = CLOTHING_WINESTAIN_RED /obj/item/clothing/shirt/robe/colored/purple @@ -100,6 +100,11 @@ 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 = "malumite robe" + desc = "Holy-duty work robes with an attached apron and rolled up sleeves, for those who toil endlessly." + icon_state = "malumrobe" + /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..a6fd48acd19 100644 --- a/code/modules/crafting/quality_of_crafting/weaving.dm +++ b/code/modules/crafting/quality_of_crafting/weaving.dm @@ -192,6 +192,14 @@ craftdiff = 3 category = "Hat" +/datum/repeatable_crafting_recipe/sewing/weaving/malumhood + name = "hood (Malum)" + output = /obj/item/clothing/head/padded/malumhood + requirements = list(/obj/item/natural/cloth = 2, + /obj/item/ingot/steel = 1) + craftdiff = 3 + category = "Hat" + /datum/repeatable_crafting_recipe/sewing/weaving/wizard_hat_gen name = "wizard hat" output = /obj/item/clothing/head/wizhat/gen @@ -325,6 +333,13 @@ /obj/item/natural/silk = 1) craftdiff = 4 +/datum/repeatable_crafting_recipe/sewing/weaving/malum_robe + 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/merchant_robe name = "merchant robe" output = /obj/item/clothing/shirt/robe/merchant diff --git a/code/modules/jobs/job_types/church/monk.dm b/code/modules/jobs/job_types/church/monk.dm index 2993683bf9a..8fce37af2a9 100644 --- a/code/modules/jobs/job_types/church/monk.dm +++ b/code/modules/jobs/job_types/church/monk.dm @@ -265,10 +265,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/padded/malumhood neck = /obj/item/clothing/neck/psycross/silver/divine/malum - shoes = /obj/item/clothing/shoes/boots - armor = /obj/item/clothing/shirt/robe/colored/red + gloves = /obj/item/clothing/gloves/leather + belt = /obj/item/storage/belt/leather + shoes = /obj/item/clothing/shoes/boots/leather + 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..0ee645bf5e3 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..6eddbacd17e 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..6f3cb115ae9 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..17bc07f419f 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..64e93ef6755 100644 Binary files a/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi and b/icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi differ