Implemented adjustToxLoss(amount)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2535 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rockdtben
2011-11-20 10:25:24 +02:00
committed by Albert Iordache
parent 91c2fd77e7
commit e7a0a44ea4
32 changed files with 108 additions and 111 deletions
+2 -2
View File
@@ -51,11 +51,11 @@
if(prob(2))
affected_mob << "\red Your stomach hurts."
if(prob(20))
affected_mob.toxloss += 1
affected_mob.adjustToxLoss(1)
affected_mob.updatehealth()
if(5)
affected_mob << "\red You feel something tearing its way out of your stomach..."
affected_mob.toxloss += 10
affected_mob.adjustToxLoss(10)
affected_mob.updatehealth()
if(prob(40))
ASSERT(gibbed == 0)
+3 -3
View File
@@ -22,7 +22,7 @@
if(prob(3))
affected_mob << "\red You feel a stabbing pain in your abdomen!"
affected_mob.stunned = rand(2,3)
affected_mob.toxloss += 1
affected_mob.adjustToxLoss(1)
if(3)
if(prob(1))
if (affected_mob.nutrition > 100)
@@ -32,8 +32,8 @@
if (istype(location, /turf/simulated))
location.add_vomit_floor(affected_mob)
affected_mob.nutrition -= 95
affected_mob:toxloss = max(affected_mob:getToxLoss()-1,0)
affected_mob:adjustToxLoss(-1)
else
affected_mob << "\red You gag as you want to throw up, but there's nothing in your stomach!"
affected_mob.weakened += 10
affected_mob.toxloss += 3
affected_mob.adjustToxLoss(3)
+2 -2
View File
@@ -36,7 +36,7 @@
if(prob(2))
affected_mob << "\red Your try to remember something important...but can't."
/* if(prob(10))
affected_mob.toxloss +=3
affected_mob.adjustToxLoss(3)
affected_mob.updatehealth()
if(prob(2))
affected_mob << "\red Your head hurts." */
@@ -46,7 +46,7 @@
if(prob(2))
affected_mob.emote("drool")
/* if(prob(15))
affected_mob.toxloss +=4
affected_mob.adjustToxLoss(4)
affected_mob.updatehealth()
if(prob(2))
affected_mob << "\red Your head hurts." */
+1 -1
View File
@@ -29,7 +29,7 @@
if(prob(1))
affected_mob << "\red Your stomach hurts."
if(prob(20))
affected_mob.toxloss += 2
affected_mob.adjustToxLoss(2)
affected_mob.updatehealth()
if(4)
if(!src.transformed)
+2 -2
View File
@@ -30,7 +30,7 @@
if(prob(1))
affected_mob << "\red Your stomach hurts."
if(prob(20))
affected_mob.toxloss += 1
affected_mob.adjustToxLoss(1)
affected_mob.updatehealth()
if(3)
@@ -49,6 +49,6 @@
if(prob(1))
affected_mob << "\red Your stomach hurts."
if(prob(20))
affected_mob.toxloss += 1
affected_mob.adjustToxLoss(1)
affected_mob.updatehealth()
return
+2 -2
View File
@@ -16,7 +16,7 @@
switch(stage)
if(2)
if(prob(45))
affected_mob.toxloss += 5
affected_mob.adjustToxLoss(5)
affected_mob.updatehealth()
if(prob(1))
affected_mob.emote("sneeze")
@@ -30,7 +30,7 @@
if(4)
if(prob(10))
affected_mob.emote("cough")
affected_mob.toxloss += 5
affected_mob.adjustToxLoss(5)
affected_mob.updatehealth()
if(5)
affected_mob << "\red Your body feels as if it's trying to rip itself open..."
+2 -2
View File
@@ -19,7 +19,7 @@
if(affected_mob.ckey == "rosham")
src.cure()
if(prob(45))
affected_mob.toxloss += 5
affected_mob.adjustToxLoss(5)
affected_mob.updatehealth()
if(prob(1))
affected_mob << "\red You feel strange..."
@@ -39,7 +39,7 @@
affected_mob.emote("gasp")
affected_mob << "\red You feel a burning beat inside..."
if(prob(20))
affected_mob.toxloss += 5
affected_mob.adjustToxLoss(5)
affected_mob.updatehealth()
if(5)
if(affected_mob.ckey == "rosham")
@@ -49,7 +49,7 @@
affected_mob << "\red You can feel... something...inside you."
if(5)
affected_mob <<"\red Your skin feels as if it's about to burst off..."
affected_mob.toxloss += 10
affected_mob.adjustToxLoss(10)
affected_mob.updatehealth()
if(prob(40)) //So everyone can feel like robot Seth Brundle
ASSERT(src.gibbed == 0)
+1 -1
View File
@@ -49,7 +49,7 @@
affected_mob << "\red You can feel... something...inside you."
if(5)
affected_mob <<"\red Your skin feels impossibly calloused..."
affected_mob.toxloss += 10
affected_mob.adjustToxLoss(10)
affected_mob.updatehealth()
if(prob(40))
ASSERT(gibbed == 0)
+1 -1
View File
@@ -40,7 +40,7 @@
target.heal_overall_damage(amt_dam_brute,0)
else if (amt_dam_fire <= 0)
target.heal_overall_damage(amt_dam_brute,amt_dam_fire)
target.toxloss += amt_dam_tox
target.adjustToxLoss(amt_dam_tox)
target.oxyloss += amt_dam_oxy
//disabling
target.weakened += amt_weaken