cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combo damage types no longer shrink armor values passed to them.

Browse Source
This commit is contained in:
Mechoid
2020-06-09 03:55:52 -07:00
parent 844766aa47
commit 94d2ac226f
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()