Skip to content

Commit

Permalink
Makes some armor that shouldnt be burning immune to being burned (#2290)
Browse files Browse the repository at this point in the history
byeah

Co-authored-by: Paxilmaniac <[email protected]>
  • Loading branch information
Steals-The-PRs and Paxilmaniac authored Mar 7, 2024
1 parent 7bae88a commit 1c9816d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions modular_nova/modules/specialist_armor/code/hardened.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
blood_overlay_type = "armor"
armor_type = /datum/armor/armor_sf_hardened
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
resistance_flags = FIRE_PROOF

/obj/item/clothing/suit/armor/sf_hardened/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text, final_block_chance, damage, attack_type, damage_type)
. = ..()
Expand Down Expand Up @@ -68,6 +69,7 @@
visor_flags_cover = HEADCOVERSEYES
dog_fashion = null
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
resistance_flags = FIRE_PROOF

/obj/item/clothing/head/helmet/toggleable/sf_hardened/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text, final_block_chance, damage, attack_type, damage_type)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions modular_nova/modules/specialist_armor/code/peacekeeper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
dog_fashion = null
flags_inv = null
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
resistance_flags = FIRE_PROOF

/obj/item/clothing/head/helmet/sf_peacekeeper/examine_more(mob/user)
. = ..()
Expand Down
2 changes: 2 additions & 0 deletions modular_nova/modules/specialist_armor/code/sacrificial.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
limb_integrity = 200
repairable_by = null // No being cheeky and keeping a pile of repair materials in your bag to fix it either
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
resistance_flags = FIRE_PROOF

/obj/item/clothing/suit/armor/sf_sacrificial/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -59,6 +60,7 @@
dog_fashion = null
flags_inv = null
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
resistance_flags = FIRE_PROOF
/// Holds the faceshield for quick reference
var/obj/item/sacrificial_face_shield/face_shield

Expand Down

0 comments on commit 1c9816d

Please sign in to comment.