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

Psydonian Reflavoring - Alters the names-and-descriptions of Onutsio's Inquisitorial garbs, adds the 'ITEM_SLOT_SHIRT' flag to its tabards, and so-on. #1101

Merged
merged 18 commits into from
Jan 1, 2025
Merged
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
10 changes: 5 additions & 5 deletions _maps/map_files/dun_manor/dun_manor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10124,9 +10124,9 @@
/area/rogue/under/town/sewer)
"jiL" = (
/obj/structure/closet/crate/roguecloset,
/obj/item/clothing/shoes/roguetown/psydonboots,
/obj/item/clothing/shoes/roguetown/psydonboots,
/obj/item/clothing/shoes/roguetown/psydonboots,
/obj/item/clothing/shoes/roguetown/boots/psydonboots,
/obj/item/clothing/shoes/roguetown/boots/psydonboots,
/obj/item/clothing/shoes/roguetown/boots/psydonboots,
/obj/item/clothing/head/roguetown/helmet/heavy/psydonhelm,
/obj/item/clothing/head/roguetown/helmet/heavy/psydonhelm,
/obj/item/clothing/head/roguetown/roguehood/psydon,
Expand Down Expand Up @@ -11117,7 +11117,7 @@
/obj/structure/table/wood{
icon_state = "longtable"
},
/obj/item/clothing/head/roguetown/helmet/psydonbarbute,
/obj/item/clothing/head/roguetown/helmet/heavy/psydonbarbute,
/turf/open/floor/rogue/tile,
/area/rogue/under/town/basement)
"khi" = (
Expand Down Expand Up @@ -20576,7 +20576,7 @@
dir = 1;
icon_state = "longtable"
},
/obj/item/clothing/head/roguetown/helmet/psydonbarbute,
/obj/item/clothing/head/roguetown/helmet/heavy/psydonbarbute,
/turf/open/floor/rogue/tile,
/area/rogue/under/town/basement)
"swd" = (
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/rogueclothes/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

/obj/item/clothing/suit/roguetown/armor/chainmail/hauberk/fluted
name = "fluted hauberk"
desc = "A steel maille, of a pattern popularized by Otavan templars."
desc = "An ornate cuirass, flanked with sleeves of steel maille."
icon_state = "flutedhauberk"
item_state = "flutedhauberk"

Expand Down
22 changes: 11 additions & 11 deletions code/modules/clothing/rogueclothes/cloaks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@
flags_inv = HIDECROTCH|HIDEBOOB

/obj/item/clothing/cloak/psydontabard
name = "inquisitorial tabard"
desc = "A long vest bearing Psydonian symbology"
name = "psydonian tabard"
desc = "A tabard worn by Psydon's disciples. Delicate stitchwork professes the psycross with pride."
color = null
icon_state = "psydontabard"
item_state = "psydontabard"
mob_overlay_icon = 'icons/roguetown/clothing/onmob/cloaks.dmi'
alternate_worn_layer = TABARD_LAYER
body_parts_covered = CHEST|GROIN
boobed = TRUE
slot_flags = ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK
slot_flags = ITEM_SLOT_SHIRT|ITEM_SLOT_ARMOR|ITEM_SLOT_CLOAK
flags_inv = HIDECROTCH|HIDEBOOB
var/open_wear = FALSE

/obj/item/clothing/cloak/psydontabard/alt
name = "open otavan tabard"
desc = "A long vest bearing Psydonian symbology"
name = "opened psydonian tabard"
desc = "A tabard worn by Psydon's disciples, peeled back to reveal its enduring innards."
body_parts_covered = GROIN
icon_state = "psydontabardalt"
item_state = "psydontabardalt"
Expand All @@ -67,23 +67,23 @@
/obj/item/clothing/cloak/psydontabard/attack_right(mob/user)
switch(open_wear)
if(FALSE)
name = "inquisitorial tabard"
desc = "A long vest bearing Psydonian symbology"
name = "opened psydonian tabard"
desc = "A tabard worn by Psydon's disciples, peeled back to reveal its enduring innards."
body_parts_covered = GROIN
icon_state = "psydontabardalt"
item_state = "psydontabardalt"
open_wear = TRUE
flags_inv = HIDECROTCH // BARE YOUR CHEST, NOT YOUR WEEN!
to_chat(usr, span_warning("Now wearing ENDURINGLY!"))
to_chat(usr, span_warning("ENDURING, like the MARTYRS who'll guide the faithful-and-pious to PARADISE."))
if(TRUE)
name = "inquisitorial tabard"
desc = "A long vest bearing Psydonian symbology"
name = "psydonian tabard"
desc = "A tabard worn by Psydon's disciples. Delicate stitchwork professes the psycross with pride."
body_parts_covered = CHEST|GROIN
icon_state = "psydontabard"
item_state = "psydontabard"
flags_inv = HIDECROTCH|HIDEBOOB
open_wear = FALSE
to_chat(usr, span_warning("Now wearing normally!"))
to_chat(usr, span_warning("VEILED, like the CORPSES who've been shepherded by your steel to the AFTERLYFE."))
update_icon()
if(user)
if(ishuman(user))
Expand Down
7 changes: 4 additions & 3 deletions code/modules/clothing/rogueclothes/feet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
armor = list("blunt" = 30, "slash" = 10, "stab" = 20, "fire" = 0, "acid" = 0)

/obj/item/clothing/shoes/roguetown/psydonboots
name = "enduring boots"
desc = "A reliable pair of dark leather boots. Seems like they could endure the world!"
color = "#d5c2aa"
name = "psydonian boots"
desc = "Blacksteel-heeled boots. The leather refuses to be worn down, no matter how far you march through these lands."
icon_state = "psydonboots"
item_state = "psydonboots"
sewrepair = TRUE
armor = list("blunt" = 30, "slash" = 10, "stab" = 20, "fire" = 0, "acid" = 0)

/obj/item/clothing/shoes/roguetown/nobleboot
name = "noble boots"
Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/rogueclothes/gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
smeltresult = /obj/item/ingot/steel

/obj/item/clothing/gloves/roguetown/chain/psydon
name = "otavan chain gauntlets"
name = "psydonian gloves"
desc = "Blacksteel-bound gauntlets. These ritualistic restraints, when left to dangle-and-sway, assist in the deflection of unpredictable blows."
icon_state = "psydongloveschain"
item_state = "psydongloveschains"

Expand Down
33 changes: 19 additions & 14 deletions code/modules/clothing/rogueclothes/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -552,16 +552,6 @@
icon_state = "kettle"
body_parts_covered = HEAD|HAIR|EARS
armor = list("blunt" = 80, "slash" = 90, "piercing" = 100, "stab" = 70, "fire" = 0, "acid" = 0)

/obj/item/clothing/head/roguetown/helmet/psydonbarbute
name = "psydonian barbute"
desc = "A barbute styled with Psydonian Imagery."
icon_state = "psydonbarbute"
item_state = "psydonbarbute"
block2add = FOV_BEHIND
flags_inv = HIDEEARS|HIDEFACE
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
body_parts_covered = FULL_HEAD

/obj/item/clothing/head/roguetown/helmet/kettle/attackby(obj/item/W, mob/living/user, params)
..()
Expand Down Expand Up @@ -940,9 +930,16 @@
smeltresult = /obj/item/ingot/steel
smelt_bar_num = 2

/obj/item/clothing/head/roguetown/helmet/heavy/psydonbarbute
name = "psydonian barbute"
desc = "A ceremonial barbute, masterfully forged to represent Psydon's divine authority. The Order of Saint Malum's artisans have chiseled this pronged visage into more statues than you could possibly imagine."
icon_state = "psydonbarbute"
item_state = "psydonbarbute"
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR

/obj/item/clothing/head/roguetown/helmet/heavy/psydonhelm
name ="otavan armet"
desc = "Headwear commonly worn by Templars in service to the Inquisition of Otava. PSYDON Endures."
name = "psydonian armet"
desc = "An ornate helmet, whose visor has been bound shut with blacksteel chains. The Order of Saint Eora often decorates these armets with flowers - not only as a lucky charm gifted to them by fair maidens and family, but also as a vibrant reminder that 'happiness has to be fought for.'"
icon_state = "psydonarmet"
item_state = "psydonarmet"
flags_inv = HIDEEARS|HIDEFACE|HIDEHAIR
Expand Down Expand Up @@ -977,6 +974,14 @@
var/mob/living/carbon/H = user
H.update_inv_head()

/obj/item/clothing/head/roguetown/helmet/heavy/psydonhelm/update_icon()
cut_overlays()
if(get_detail_tag())
var/mutable_appearance/pic = mutable_appearance(icon(icon, "[icon_state][detail_tag]"))
pic.appearance_flags = RESET_COLOR
if(get_detail_color())
pic.color = get_detail_color()
add_overlay(pic)

/obj/item/clothing/head/roguetown/helmet/heavy/nochelm
name = "noc helmet"
Expand Down Expand Up @@ -1453,12 +1458,12 @@

/obj/item/clothing/head/roguetown/roguehood/psydon
name = "psydonian hood"
desc = "A hood worn by those who favor Psydon. Forever enduring!"
desc = "A hood worn by Psydon's disciples, oft-worn in conjunction with its matching tabard."
icon_state = "psydonhood"
item_state = "psydonhood"
color = null
body_parts_covered = NECK
slot_flags = ITEM_SLOT_HEAD
slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_MASK
dynamic_hair_suffix = ""
edelay_type = 1
adjustable = CAN_CADJUST
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/rogueclothes/mask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
smeltresult = /obj/item/ingot/iron

/obj/item/clothing/mask/rogue/facemask/psydonmask
name = "Psydonian Mask"
desc = "A symbolic mask typically worn by members of the Otavan Inquisition."
name = "psydonian mask"
desc = "A silver mask, forever locked in a rigor of uncontestable joy. The Order of Saint Xylix can't decide on whether it's meant to represent Psydon's 'mirthfulness', 'theatricality', or the unpredictable melding of both."
icon_state = "psydonmask"
item_state = "psydonmask"

Expand Down
6 changes: 4 additions & 2 deletions code/modules/clothing/rogueclothes/neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@

/obj/item/clothing/neck/roguetown/psicross
name = "psycross"
desc = ""
desc = "'With every broken bone, I swore I lived!'"
icon_state = "psicross"
//dropshrink = 0.75
resistance_flags = FIRE_PROOF
Expand Down Expand Up @@ -247,12 +247,14 @@

/obj/item/clothing/neck/roguetown/psicross/wood
name = "wooden psycross"
desc = "'A man with nothing can still have faith!'"
icon_state = "psycross_w"
item_state = "psycross_w"
sellprice = 0

/obj/item/clothing/neck/roguetown/psicross/silver
name = "silver psycross"
desc = "'The horrors persist, but so do I!'"
icon_state = "psycross_s"
item_state = "psycross_s"
sellprice = 50
Expand Down Expand Up @@ -307,7 +309,7 @@

/obj/item/clothing/neck/roguetown/psicross/g
name = "golden psycross"
desc = ""
desc = "'Purity afloat, for paradise awaits!'"
icon_state = "psycross_g"
item_state = "psycross_g"
//dropshrink = 0.75
Expand Down
Loading