From 5a012c3ba3bb3097afb6a96c8e1efcff9cfe2b85 Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Sat, 10 Apr 2021 22:50:13 +1200 Subject: [PATCH] smh (#1779) --- code/modules/mob/living/carbon/human/human_damage.dm | 2 ++ code/modules/nifsoft/software/10_combat.dm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 50b3c9b053..04afa47243 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -492,6 +492,7 @@ This function restores all organs. switch(damagetype) if(BRUTE) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} //CHOMPSTATION edit. Fixes NIF armour. damage = damage*species.brute_mod for(var/datum/modifier/M in modifiers) @@ -504,6 +505,7 @@ This function restores all organs. UpdateDamageIcon() if(BURN) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} //CHOMPSTATION edit. Fixes NIF armour. damage = damage*species.burn_mod for(var/datum/modifier/M in modifiers) diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index a63e323792..ea9810ad4c 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -7,7 +7,7 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. + //CHOMPSTATION edit. Makes NIF armour toggleable. combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/burn_armor @@ -19,7 +19,7 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. + //CHOMPSTATION edit. Makes NIF armour toggleable. combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/painkillers