cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10123 from Novacat/nova-ert

Browse Source 
Ports Chomp fix for Burn/brute nifsoft
This commit is contained in:
Novacat
2021-04-10 08:46:54 -04:00
committed by Chompstation Bot
parent 3e7c6d7261
commit aa20186609
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -492,6 +492,7 @@ This function restores all organs.
switch(damagetype) switch(damagetype)
if(BRUTE) if(BRUTE)
damageoverlaytemp = 20 damageoverlaytemp = 20
if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7}
damage = damage*species.brute_mod damage = damage*species.brute_mod
for(var/datum/modifier/M in modifiers) for(var/datum/modifier/M in modifiers)
@@ -504,6 +505,7 @@ This function restores all organs.
UpdateDamageIcon() UpdateDamageIcon()
if(BURN) if(BURN)
damageoverlaytemp = 20 damageoverlaytemp = 20
if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7}
damage = damage*species.burn_mod damage = damage*species.burn_mod
for(var/datum/modifier/M in modifiers) for(var/datum/modifier/M in modifiers)

2
code/modules/nifsoft/software/10_combat.dm
View File

@@ -7,7 +7,6 @@
illegal = TRUE illegal = TRUE
wear = 3 wear = 3
access = 999 //Prevents anyone from buying it without an emag. access = 999 //Prevents anyone from buying it without an emag.
activates = FALSE //It's armor.
combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled
/datum/nifsoft/burn_armor /datum/nifsoft/burn_armor
@@ -19,7 +18,6 @@
illegal = TRUE illegal = TRUE
wear = 3 wear = 3
access = 999 //Prevents anyone from buying it without an emag. access = 999 //Prevents anyone from buying it without an emag.
activates = FALSE //It's armor.
combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled
/datum/nifsoft/painkillers /datum/nifsoft/painkillers