mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
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 🆑 fix: Chaplain helmets and clockwork armour now have the same wound protection as the other chaplain body armours. /🆑
This commit is contained in:
@@ -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!"
|
||||
|
||||
Reference in New Issue
Block a user