From 2ae097d92d92ea14f8568bebab01bc0a94bcba51 Mon Sep 17 00:00:00 2001 From: panvxv <68397497+panvxv@users.noreply.github.com> Date: Thu, 7 Aug 2025 16:13:15 +0200 Subject: [PATCH] Chaplain's armors fixes and tweaks - matching body parts covered with coresponding sprites (#92446) ## About The Pull Request Matching body parts covered of chaplain's armor to sprites. I think a leftover from times when those armours where subtype of riot armour. 474691928-183826a3-79e5-431e-aed5-b9a02a2c382e Adept armor was covering arms, hands and feet yet it sprite wasn't covering those parts. In exchange gave bone bracers to the kit so it wasn't the worst choice. obraz Same for Divine Archer coat. It's unique boots and bracers now have armor. Boots provide less protection to keep the archer comfortable while on the move (RP reason). (Real reason: so armor from coat and boots don't give too much legs protection) ## Why It's Good For The Game Makes Chaplain's armor less confusing. No exposed arms with secret 50% melee resist. Exposed limbs are actually exposed. Profane Kit getting something unique - really strong helmet against melee. ## Changelog :cl: add: Bone bracers to Divine Adept kit qol: Adept robes doesn't cover arms, hands and feet as to match the sprite qol: Ancient armour doesn't cover hands as to match the sprite qol: Divine Archer coat doesn't cover arms, hands and feet as to match the sprite qol: Divine Archer bracers now have the same armor as Divine Archer coat balance: Divine Archer boots have their own unique armor /:cl: (cherry picked from commit 255801a668f6818e223cafe58fd9b58e49a81caa) --- .../objects/items/storage/boxes/clothes_boxes.dm | 1 + .../jobs/job_types/chaplain/chaplain_costumes.dm | 2 ++ .../job_types/chaplain/chaplain_divine_archer.dm | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm index 4da6c3cb6dc..9eda3ebbfb8 100644 --- a/code/game/objects/items/storage/boxes/clothes_boxes.dm +++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm @@ -209,6 +209,7 @@ /obj/item/storage/box/holy/adept/PopulateContents() new /obj/item/clothing/suit/chaplainsuit/armor/adept(src) new /obj/item/clothing/head/helmet/chaplain/adept(src) + new /obj/item/clothing/gloves/bracer(src) /obj/item/storage/box/holy/follower name = "Followers of the Chaplain Kit" diff --git a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm index 9bd6436994d..9925626799f 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm @@ -206,6 +206,7 @@ desc = "Defend the treasure..." icon_state = "knight_ancient" inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS /obj/item/clothing/suit/chaplainsuit/armor/ancient/Initialize(mapload) . = ..() @@ -232,6 +233,7 @@ desc = "The ideal outfit for burning the unfaithful." icon_state = "crusader" inhand_icon_state = null + body_parts_covered = CHEST|GROIN|LEGS /obj/item/clothing/suit/chaplainsuit/armor/crusader name = "crusader's armour" diff --git a/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm b/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm index 3eea5f79aa5..8c6d1a8c6a3 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_divine_archer.dm @@ -16,7 +16,7 @@ desc = "Outer coat for divine archers. Offers some protection." icon_state = "archercoat" inhand_icon_state = "archercoat" - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + body_parts_covered = CHEST|GROIN|LEGS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/chaplainsuit_armor_weaker @@ -47,9 +47,11 @@ desc = "Bracers, a wise choice for archers who do not want their outfit to get in the way of drawing and firing their weapon." icon_state = "archerbracers" inhand_icon_state = "archerbracers" + body_parts_covered = ARMS|HANDS strip_delay = 40 equip_delay_other = 20 resistance_flags = NONE + armor_type = /datum/armor/chaplainsuit_armor_weaker /// boots /obj/item/clothing/shoes/divine_archer @@ -57,7 +59,18 @@ desc = "Boots, For steady footing while aiming." icon_state = "archerboots" inhand_icon_state = "archerboots" + body_parts_covered = LEGS|FEET strip_delay = 30 equip_delay_other = 50 resistance_flags = NONE fastening_type = SHOES_SLIPON + armor_type = /datum/armor/shoes_divine_archer + +/datum/armor/shoes_divine_archer + melee = 10 + bullet = 5 + laser = 5 + energy = 5 + fire = 60 + acid = 60 + wound = 10