Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions _maps/map_files/vanderlin/vanderlin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
7 changes: 7 additions & 0 deletions code/modules/clothing/head/god_hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
7 changes: 6 additions & 1 deletion code/modules/clothing/shirts/robe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down
15 changes: 15 additions & 0 deletions code/modules/crafting/quality_of_crafting/weaving.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions code/modules/jobs/job_types/church/monk.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/roguetown/clothing/armor.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/head.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/armor.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/head.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi
Binary file not shown.
Loading