Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WHO IS JOHN NECRA WHY DOES HE WEAR THE MASK #1187

Closed
wants to merge 9 commits into from
Closed
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
1 change: 0 additions & 1 deletion _maps/map_files/dakkatown/dakkatown.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13474,7 +13474,6 @@
/obj/item/clothing/suit/roguetown/shirt/robe/dendor,
/obj/item/clothing/suit/roguetown/shirt/robe/astrata,
/obj/item/clothing/mask/rogue/druid,
/obj/item/clothing/head/roguetown/padded/deathshroud,
/obj/item/clothing/head/roguetown/roguehood/astrata,
/turf/open/floor/rogue/blocks,
/area/rogue/indoors/town/theatre)
Expand Down
1 change: 0 additions & 1 deletion _maps/map_files/dun_manor/dun_manor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,6 @@
/obj/structure/closet/crate/roguecloset/dark,
/obj/item/clothing/cloak/raincloak/mortus,
/obj/item/flashlight/flare/torch/lantern,
/obj/item/clothing/head/roguetown/padded/deathface,
/turf/open/floor/rogue/cobble,
/area/rogue/under/town/basement)
"aGn" = (
Expand Down
7 changes: 0 additions & 7 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4104,7 +4104,6 @@
icon_state = "longtable"
},
/obj/item/clothing/head/roguetown/menacing,
/obj/item/clothing/head/roguetown/padded/deathshroud,
/turf/open/floor/rogue/wood,
/area/rogue)
"Tz" = (
Expand Down Expand Up @@ -4545,12 +4544,6 @@
/obj/machinery/light/rogue/hearth,
/turf/open/floor/rogue/cobble,
/area/rogue/indoors/bandit_lair)
"Yt" = (
/obj/structure/bookcase,
/obj/item/book/rogue/nitebeast,
/obj/item/book/rogue/yeoldecookingmanual,
/turf/open/floor/rogue/metal/barograte,
/area/rogue/indoors/vampire_manor)
"Yv" = (
/obj/machinery/light/rogue/firebowl/stump,
/turf/open/floor/rogue/dirt/road,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/roguetown/roguetown.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@
/obj/structure/closet/crate/coffin,
/obj/structure/fluff/walldeco/maidendrape,
/obj/item/clothing/suit/roguetown/shirt/robe/necra,
/obj/item/clothing/head/roguetown/padded/deathshroud,
/obj/item/clothing/mask/roguetown/padded/deathshroud,
/turf/open/floor/rogue/naturalstone,
/area/rogue/under/town/basement)
"bFf" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@
"vG" = (
/obj/structure/closet/crate/coffin,
/obj/item/clothing/suit/roguetown/shirt/robe/necra,
/obj/item/clothing/head/roguetown/padded/deathshroud,
/turf/open/floor/rogue/blocks,
/area/rogue/outdoors/bog)
"wa" = (
Expand Down
19 changes: 0 additions & 19 deletions code/modules/clothing/rogueclothes/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -260,25 +260,6 @@
armor = ARMOR_WEAK
prevent_crits = MINOR_CRITICALS


//................ Death Face ............... //
/obj/item/clothing/head/roguetown/padded/deathface
name = "death shroud"
desc = "When inducted into the cult of Necra, the supplicant must make a talisman from the remains of a deceased loved one. Many favor a chin-guard made from a jawbone."
icon_state = "deathface"
flags_inv = HIDEEARS | HIDEHAIR | HIDEFACIALHAIR

armor = ARMOR_WEAK
prevent_crits = MINOR_CRITICALS

//................ Death Shroud ............... // - Necra headwear that conceals indentity
/obj/item/clothing/head/roguetown/padded/deathshroud
name = "death shroud"
desc = "Worn by the faithful of Necra, or less savory individuals."
icon_state = "necrahood"
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR


//................ Briar Thorns ............... // - Dendor Briar
/obj/item/clothing/head/roguetown/padded/briarthorns
name = "briar thorns"
Expand Down
31 changes: 28 additions & 3 deletions code/modules/clothing/rogueclothes/mask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
sewrepair = FALSE
anvilrepair = /datum/skill/craft/armorsmithing
clothing_flags = CANT_SLEEP_IN

armor = ARMOR_PLATE_BAD
prevent_crits = CUT_AND_MINOR_CRITS //No stab, blunt or chop crit flags. If a chopping weapon can get through 70 armor, it's probably carrying enough force to mess up your face behind a flimsy mask.
max_integrity = INTEGRITY_STANDARD //Flimsier than a proper visor/helmet.
Expand Down Expand Up @@ -120,7 +120,7 @@
name = "steel mask"
icon_state = "smask"
desc = "A knightly steel mask that both conceals and protects the face. Usually paired with a bascinet."

armor = ARMOR_PLATE_BAD //Still thin.
prevent_crits = ALL_EXCEPT_BLUNT_AND_STAB
max_integrity = INTEGRITY_STRONG //250 Integrity, added chop protection. Still worse than a proper visored helmet.
Expand Down Expand Up @@ -206,9 +206,32 @@
sewrepair = FALSE
anvilrepair = /datum/skill/craft/armorsmithing
smeltresult = /obj/item/ingot/copper

max_integrity = INTEGRITY_WORST //Really flimsy, still good for a few blows.


//................ Death Face ............... //
/obj/item/clothing/mask/roguetown/padded/deathface
name = "death shroud"
desc = "When inducted into the cult of Necra, the supplicant must make a talisman from the remains of a deceased loved one. Many favor a chin-guard made from a jawbone."
icon = 'icons/roguetown/clothing/masks.dmi'
mob_overlay_icon = 'icons/roguetown/clothing/onmob/masks.dmi'
icon_state = "deathface"
flags_inv = HIDEEARS | HIDEHAIR | HIDEFACIALHAIR

armor = ARMOR_WEAK
prevent_crits = MINOR_CRITICALS

//................ Death Shroud ............... // - Necra headwear that conceals indentity
/obj/item/clothing/mask/roguetown/padded/deathshroud
name = "death shroud"
desc = "Worn by the faithful of Necra, or less savory individuals."
icon = 'icons/roguetown/clothing/masks.dmi'
mob_overlay_icon = 'icons/roguetown/clothing/onmob/masks.dmi'
icon_state = "necrahood"
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR


//................ Druids Mask ............... //
/obj/item/clothing/mask/rogue/druid
name = "druids mask"
Expand All @@ -225,3 +248,5 @@

armor = ARMOR_WEAK
prevent_crits = CUT_AND_MINOR_CRITS


Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
cloak = /obj/item/clothing/cloak/raincloak/furcloak
beltr = /obj/item/rogueweapon/knife/stone
if("Necra")
head = /obj/item/clothing/head/roguetown/padded/deathface
mask = /obj/item/clothing/mask/roguetown/padded/deathface
wrists = /obj/item/clothing/neck/roguetown/psycross/silver/necra
cloak = /obj/item/clothing/cloak/stabard/templar/necra
neck = /obj/item/clothing/neck/roguetown/gorget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/datum/outfit/job/roguetown/undertaker/pre_equip(mob/living/carbon/human/H)
..()
head = /obj/item/clothing/head/roguetown/padded/deathshroud
mask = /obj/item/clothing/mask/roguetown/padded/deathshroud
neck = /obj/item/clothing/neck/roguetown/psycross/silver/necra
pants = /obj/item/clothing/under/roguetown/trou/leather/mourning
armor = /obj/item/clothing/suit/roguetown/shirt/robe/necra
Expand Down
2 changes: 1 addition & 1 deletion code/modules/roguetown/roguecrafting/weaving.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@

/datum/crafting_recipe/roguetown/weaving/necrahood
name = "necra hood"
result = list(/obj/item/clothing/head/roguetown/padded/deathshroud)
result = list(/obj/item/clothing/mask/roguetown/padded/deathshroud)
reqs = list(/obj/item/natural/cloth = 2)
craftdiff = 4
sellprice = 20
Expand Down
Binary file modified icons/roguetown/clothing/head.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/masks.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/masks.dmi
Binary file not shown.
Loading