mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-01-25 16:35:28 +00:00
TG update: Removed all global modifications of toxloss. Added a setToxLoss() proc.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2653 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
committed by
Albert Iordache
parent
ea79e4b272
commit
fac10fb031
@@ -481,9 +481,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
return
|
||||
if(config.allow_admin_rev)
|
||||
//M.fireloss = 0
|
||||
M.toxloss = 0
|
||||
M.setToxLoss(0)
|
||||
//M.bruteloss = 0
|
||||
M.oxyloss = 0
|
||||
M.setOxyLoss(0)
|
||||
M.paralysis = 0
|
||||
M.stunned = 0
|
||||
M.weakened = 0
|
||||
|
||||
@@ -40,10 +40,10 @@
|
||||
paralysis = 0
|
||||
weakened = 0
|
||||
sleeping = 0
|
||||
bruteloss = max(getBruteLoss(), 0)
|
||||
toxloss = max(getToxLoss(), 0)
|
||||
oxyloss = max(getOxyLoss(), 0)
|
||||
fireloss = max(getFireLoss(), 0)
|
||||
setBruteLoss(max(getBruteLoss(), 0))
|
||||
setToxLoss(max(getToxLoss(), 0))
|
||||
setOxyLoss(max(getOxyLoss(), 0))
|
||||
setFireLoss(max(getFireLoss(), 0))
|
||||
if(stat)
|
||||
stat = 0
|
||||
return
|
||||
|
||||
@@ -296,8 +296,6 @@
|
||||
if(locate(/obj/effect/alien/weeds) in loc)
|
||||
if(health >= 100)
|
||||
adjustToxLoss(15)
|
||||
if(getToxLoss() > max_plasma)
|
||||
toxloss = max_plasma
|
||||
|
||||
else
|
||||
adjustBruteLoss(-15)
|
||||
|
||||
@@ -82,9 +82,9 @@
|
||||
paralysis = max(min(paralysis, 20), 0)
|
||||
weakened = max(min(weakened, 20), 0)
|
||||
sleeping = max(min(sleeping, 20), 0)
|
||||
bruteloss = max(getBruteLoss(), 0)
|
||||
toxloss = max(getToxLoss(), 0)
|
||||
oxyloss = max(getOxyLoss(), 0)
|
||||
setBruteLoss(max(getBruteLoss(), 0))
|
||||
setToxLoss(max(getToxLoss(), 0))
|
||||
setOxyLoss(max(getOxyLoss(), 0))
|
||||
adjustFireLoss(0)
|
||||
|
||||
handle_mutations_and_radiation()
|
||||
|
||||
@@ -135,9 +135,9 @@
|
||||
|
||||
/mob/living/proc/revive()
|
||||
//src.fireloss = 0
|
||||
src.toxloss = 0
|
||||
src.setToxLoss(0)
|
||||
//src.bruteloss = 0
|
||||
src.oxyloss = 0
|
||||
src.setOxyLoss(0)
|
||||
src.paralysis = 0
|
||||
src.stunned = 0
|
||||
src.weakened =0
|
||||
|
||||
Reference in New Issue
Block a user