cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

smh (#1779)

Browse Source
This commit is contained in:
BlackMajor
2021-04-10 03:50:13 -07:00
committed by GitHub
parent 3e7c6d7261
commit 5a012c3ba3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_damage.dm
+2
View File
@@ -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)
code/modules/nifsoft/software/10_combat.dm
+2 -2
View File
@@ -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