cloneloss is now only referenced via procs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2871 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rockdtben
2011-12-30 17:28:21 +00:00
parent 56e24aa16b
commit 3029c0d58c
6 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -1239,7 +1239,7 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom ///This can even heal dead people.
M.cloneloss = 0
M.setCloneLoss(0)
M.setOxyLoss(0)
M.radiation = 0
M.heal_organ_damage(5,5)
+1 -1
View File
@@ -46,7 +46,7 @@
proc/UpdateDamage()
health = 60 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + cloneloss)
health = 60 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss())
return
@@ -121,8 +121,8 @@
else
usr << "\red <B>[src.name] looks severely injured!</B>"
if (src.cloneloss)
if (src.cloneloss < 30)
if (src.getCloneLoss())
if (src.getCloneLoss() < 30)
usr << "\red [src.name] looks slightly... unfinished?"
else
usr << "\red <B>[src.name] looks very... unfinished?</B>"
@@ -71,7 +71,7 @@
"A sharp, deep pain bathes every inch of your body!")]"
if(istype(M, /mob/living/carbon))
Victim.cloneloss += rand(1,10)
Victim.adjustCloneLoss(rand(1,10))
Victim.adjustToxLoss(rand(1,2))
if(Victim.health <= 0)
Victim.adjustToxLoss(rand(2,4))
+1 -1
View File
@@ -21,7 +21,7 @@
if(OXY)
adjustOxyLoss(damage/(blocked+1))
if(CLONE)
cloneloss += (damage/(blocked+1))
adjustCloneLoss(damage/(blocked+1))
UpdateDamageIcon()
updatehealth()
return 1
+1 -1
View File
@@ -8,7 +8,7 @@
/mob/living/proc/updatehealth()
if(!src.nodamage)
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.cloneloss
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss()
else
src.health = 100
src.stat = 0