From 938fc1e0f087568406050092a9156034454fa2ea Mon Sep 17 00:00:00 2001 From: rockdtben Date: Fri, 30 Dec 2011 17:59:19 +0000 Subject: [PATCH] toxloss is now only referenced via procs. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2875 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/virus2/base.dm | 6 +++--- code/WorkInProgress/virus2/cureimplanter.dm | 2 +- code/modules/power/singularity/singularity.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/WorkInProgress/virus2/base.dm b/code/WorkInProgress/virus2/base.dm index a797a1f2771..f0d6f4d78c0 100644 --- a/code/WorkInProgress/virus2/base.dm +++ b/code/WorkInProgress/virus2/base.dm @@ -301,7 +301,7 @@ stage = 4 activate(var/mob/living/carbon/mob,var/multiplier) mob << "\red You feel something tearing its way out of your stomach..." - mob.toxloss += 10 + mob.adjustToxLoss(10) mob.updatehealth() if(prob(40)) if(mob.client) @@ -330,7 +330,7 @@ stage = 3 maxm = 3 activate(var/mob/living/carbon/mob,var/multiplier) - mob.toxloss += (2*multiplier) + mob.adjustToxLoss((2*multiplier)) /datum/disease2/effect/greater/scream name = "Random screaming syndrome" @@ -401,7 +401,7 @@ name = "Toxification syndrome" stage = 4 activate(var/mob/living/carbon/mob,var/multiplier) - mob.toxloss += 15 + mob.adjustToxLoss(15) /*/datum/disease2/effect/greater/hallucinations name = "Hallucinational Syndrome" diff --git a/code/WorkInProgress/virus2/cureimplanter.dm b/code/WorkInProgress/virus2/cureimplanter.dm index ea40dff7339..80354e5765b 100644 --- a/code/WorkInProgress/virus2/cureimplanter.dm +++ b/code/WorkInProgress/virus2/cureimplanter.dm @@ -36,7 +36,7 @@ if(M.virus2) M.virus2.cure_added(resistance) else if(works == 1) - M.toxloss += 60 + M.adjustToxLoss(60) else if(works == 2) M.gib() else if(works == 3) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 86d4493df80..02127dbed5c 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -391,7 +391,7 @@ var/global/list/uneatable = list( toxmob() var/toxrange = 10 - var/toxdamage = 4 // changed the name to toxdamage from toxloss to prevent further conflicts + var/toxdamage = 4 var/radiation = 5 if (src.energy>200) toxdamage = round(((src.energy-150)/50)*4,1)