cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG: toxloss is now only referenced via procs. r2875

Browse Source
This commit is contained in:
Ren Erthilo
2012-03-26 23:23:46 +01:00
parent e6b85575f6
commit 81f76406a3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/WorkInProgress/virus2/base.dm
View File

@@ -305,7 +305,7 @@ proc/airborne_can_reach(turf/source, turf/target)
stage = 4 stage = 4
activate(var/mob/living/carbon/mob,var/multiplier) activate(var/mob/living/carbon/mob,var/multiplier)
mob << "\red You feel something tearing its way out of your stomach..." mob << "\red You feel something tearing its way out of your stomach..."
mob.toxloss += 10 mob.adjustToxLoss(10)
mob.updatehealth() mob.updatehealth()
if(prob(40)) if(prob(40))
if(mob.client) if(mob.client)
@@ -340,7 +340,7 @@ proc/airborne_can_reach(turf/source, turf/target)
stage = 3 stage = 3
maxm = 3 maxm = 3
activate(var/mob/living/carbon/mob,var/multiplier) activate(var/mob/living/carbon/mob,var/multiplier)
mob.toxloss += (2*multiplier) mob.adjustToxLoss((2*multiplier))
/datum/disease2/effect/greater/drowsness /datum/disease2/effect/greater/drowsness
name = "Automated sleeping syndrome" name = "Automated sleeping syndrome"
@@ -425,7 +425,7 @@ proc/airborne_can_reach(turf/source, turf/target)
name = "Toxification syndrome" name = "Toxification syndrome"
stage = 4 stage = 4
activate(var/mob/living/carbon/mob,var/multiplier) activate(var/mob/living/carbon/mob,var/multiplier)
mob.toxloss += 15 mob.adjustToxLoss(15)
/datum/disease2/effect/greater/sleepy /datum/disease2/effect/greater/sleepy
name = "Resting syndrome" name = "Resting syndrome"

2
code/WorkInProgress/virus2/cureimplanter.dm
View File

@@ -36,7 +36,7 @@
if(M.virus2) if(M.virus2)
M.virus2.cure_added(resistance) M.virus2.cure_added(resistance)
else if(works == 1) else if(works == 1)
M.toxloss += 60 M.adjustToxLoss(60)
else if(works == 2) else if(works == 2)
M.gib() M.gib()
else if(works == 3) else if(works == 3)

2
code/modules/power/singularity/singularity.dm
View File

@@ -399,7 +399,7 @@ var/global/list/uneatable = list(
toxmob() toxmob()
var/toxrange = 10 var/toxrange = 10
var/toxdamage = 4 // changed the name to toxdamage from toxloss to prevent further conflicts var/toxdamage = 4
var/radiation = 5 var/radiation = 5
if (src.energy>200) if (src.energy>200)
toxdamage = round(((src.energy-150)/50)*4,1) toxdamage = round(((src.energy-150)/50)*4,1)