mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
TG update: Fixed a few derps in Poly's commit (namely, the revert back to public vars instead of procs).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2662 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
committed by
Albert Iordache
parent
cd9821e371
commit
df54c71559
@@ -15,7 +15,7 @@
|
||||
adjustFireLoss(-getFireLoss())
|
||||
for(var/datum/organ/external/O in organs)
|
||||
if(istype(O, /datum/organ/external))
|
||||
bruteloss += O.brute_dam
|
||||
adjustBruteLoss(O.brute_dam)
|
||||
adjustFireLoss(O.burn_dam)
|
||||
return
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
if(!damage || (blocked >= 2)) return 0
|
||||
switch(damagetype)
|
||||
if(BRUTE)
|
||||
bruteloss += (damage/(blocked+1))
|
||||
adjustBruteLoss(damage/(blocked+1))
|
||||
if(BURN)
|
||||
if(mutations & COLD_RESISTANCE) damage = 0
|
||||
adjustFireLoss(damage/(blocked+1))
|
||||
if(TOX)
|
||||
adjustToxLoss(damage/(blocked+1))
|
||||
if(OXY)
|
||||
oxyloss += (damage/(blocked+1))
|
||||
adjustOxyLoss(damage/(blocked+1))
|
||||
if(CLONE)
|
||||
cloneloss += (damage/(blocked+1))
|
||||
UpdateDamageIcon()
|
||||
|
||||
Reference in New Issue
Block a user