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

Merge pull request #8297 from VOREStation/upstream-merge-7286

Browse Source 
[MIRROR] Combo damage type repair.
This commit is contained in:
Novacat
2020-06-16 08:34:27 -04:00
committed by GitHub
parent fe58fb5aab c66a553432
commit db7c1121f0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/mob/living/damage_procs.dm
View File

@@ -18,6 +18,9 @@
damage -= round(damage*0.8)
else
damage -= soaked
var/initial_blocked = blocked
blocked = (100-blocked)/100
switch(damagetype)
if(BRUTE)
@@ -27,8 +30,8 @@
damage = 0
adjustFireLoss(damage * blocked)
if(SEARING)
apply_damage(damage / 3, BURN, def_zone, blocked, soaked, used_weapon, sharp, edge)
apply_damage(damage / 3 * 2, BRUTE, def_zone, blocked, soaked, used_weapon, sharp, edge)
apply_damage(round(damage / 3), BURN, def_zone, initial_blocked, soaked, used_weapon, sharp, edge)
apply_damage(round(damage / 3 * 2), BRUTE, def_zone, initial_blocked, soaked, used_weapon, sharp, edge)
if(TOX)
adjustToxLoss(damage * blocked)
if(OXY)
@@ -41,7 +44,7 @@
electrocute_act(damage, used_weapon, 1.0, def_zone)
if(BIOACID)
if(isSynthetic())
adjustFireLoss(damage * blocked)
apply_damage(damage, BURN, def_zone, initial_blocked, soaked, used_weapon, sharp, edge) // Handle it as normal burn.
else
adjustToxLoss(damage * blocked)
flash_weak_pain()