From 3029c0d58cc763ab8a2857faa74cd8adcaa785b3 Mon Sep 17 00:00:00 2001 From: rockdtben Date: Fri, 30 Dec 2011 17:28:21 +0000 Subject: [PATCH] cloneloss is now only referenced via procs. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2871 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/chemical/Chemistry-Reagents.dm | 2 +- code/modules/mob/living/blob/blob.dm | 2 +- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- code/modules/mob/living/carbon/metroid/powers.dm | 2 +- code/modules/mob/living/damage_procs.dm | 2 +- code/modules/mob/living/living.dm | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index f55e08e3e00..6c032fd1473 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -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) diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm index 38d848bb9c3..c7948526af4 100644 --- a/code/modules/mob/living/blob/blob.dm +++ b/code/modules/mob/living/blob/blob.dm @@ -46,7 +46,7 @@ proc/UpdateDamage() - health = 60 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + cloneloss) + health = 60 - (getOxyLoss() + getToxLoss() + getFireLoss() + getBruteLoss() + getCloneLoss()) return diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 0743dccdd95..273ca94c812 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -121,8 +121,8 @@ else usr << "\red [src.name] looks severely injured!" - if (src.cloneloss) - if (src.cloneloss < 30) + if (src.getCloneLoss()) + if (src.getCloneLoss() < 30) usr << "\red [src.name] looks slightly... unfinished?" else usr << "\red [src.name] looks very... unfinished?" diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm index 6cba3331f0a..7c836158453 100644 --- a/code/modules/mob/living/carbon/metroid/powers.dm +++ b/code/modules/mob/living/carbon/metroid/powers.dm @@ -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)) diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index ec814720a80..ce8176d1c30 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -21,7 +21,7 @@ if(OXY) adjustOxyLoss(damage/(blocked+1)) if(CLONE) - cloneloss += (damage/(blocked+1)) + adjustCloneLoss(damage/(blocked+1)) UpdateDamageIcon() updatehealth() return 1 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2c64b511dbe..da04f0673b6 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -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