From ee72a60e34bc8a7953a4a53b47803c672dc954be Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Mon, 11 Aug 2025 19:38:43 +0100 Subject: [PATCH] Makes chaplain armour have consistent wound protection (#92477) ## About The Pull Request Eliminates the separate armour datums for chaplain helmets and clock armour, which were identical to the regular suits apart from a missing wound protection. These items now use the same armour datus as everthing else. Incidentally removes a useless redefinition of a var to the parent's value, and adds missing time defines. Fixes #92448 ## Why It's Good For The Game It makes more sense for these values to be consistent between matching suits and helmets, and also between otherwise functionally identical clock around and all the other sets. ## Changelog :cl: fix: Chaplain helmets and clockwork armour now have the same wound protection as the other chaplain body armours. /:cl: --- .../job_types/chaplain/chaplain_costumes.dm | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm index 9925626799f..2bc8ffdaf32 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_costumes.dm @@ -14,8 +14,8 @@ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor_type = /datum/armor/chaplainsuit_armor - strip_delay = 80 - equip_delay_other = 60 + strip_delay = 8 SECONDS + equip_delay_other = 6 SECONDS /datum/armor/chaplainsuit_armor melee = 50 @@ -130,20 +130,10 @@ desc = "It has the unyielding gaze of a god eternally forgotten." icon_state = "clockwork_helmet" inhand_icon_state = null - armor_type = /datum/armor/chaplain_clock flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - strip_delay = 8 SECONDS dog_fashion = null -/datum/armor/chaplain_clock - melee = 50 - bullet = 10 - laser = 10 - energy = 10 - fire = 80 - acid = 80 - /obj/item/clothing/suit/chaplainsuit/armor/clock name = "forgotten armour" desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life." @@ -162,20 +152,12 @@ worn_icon = 'icons/mob/clothing/head/chaplain.dmi' icon_state = "knight_templar" inhand_icon_state = null - armor_type = /datum/armor/helmet_chaplain + armor_type = /datum/armor/chaplainsuit_armor flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - strip_delay = 80 + strip_delay = 8 SECONDS dog_fashion = null -/datum/armor/helmet_chaplain - melee = 50 - bullet = 10 - laser = 10 - energy = 10 - fire = 80 - acid = 80 - /obj/item/clothing/suit/chaplainsuit/armor/templar name = "crusader armour" desc = "God wills it!"