mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 11:13:16 +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
@@ -440,43 +440,60 @@ the mob is also allowed to move without any sort of restriction. For instance, i
|
|||||||
|
|
||||||
// ++++ROCKDTBEN++++ MOB PROCS
|
// ++++ROCKDTBEN++++ MOB PROCS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/mob/proc/getBruteLoss()
|
/mob/proc/getBruteLoss()
|
||||||
return bruteloss
|
return bruteloss
|
||||||
|
|
||||||
/mob/proc/adjustBruteLoss(var/amount)
|
/mob/proc/adjustBruteLoss(var/amount)
|
||||||
bruteloss = max(bruteloss + amount, 0)
|
bruteloss = max(bruteloss + amount, 0)
|
||||||
|
|
||||||
|
/mob/proc/setBruteLoss(var/amount)
|
||||||
|
bruteloss = amount
|
||||||
|
|
||||||
/mob/proc/getOxyLoss()
|
/mob/proc/getOxyLoss()
|
||||||
return oxyloss
|
return oxyloss
|
||||||
|
|
||||||
/mob/proc/adjustOxyLoss(var/amount)
|
/mob/proc/adjustOxyLoss(var/amount)
|
||||||
oxyloss = max(oxyloss + amount, 0)
|
oxyloss = max(oxyloss + amount, 0)
|
||||||
|
|
||||||
|
/mob/proc/setOxyLoss(var/amount)
|
||||||
|
oxyloss = amount
|
||||||
|
|
||||||
/mob/proc/getToxLoss()
|
/mob/proc/getToxLoss()
|
||||||
return toxloss
|
return toxloss
|
||||||
|
|
||||||
/mob/proc/adjustToxLoss(var/amount)
|
/mob/proc/adjustToxLoss(var/amount)
|
||||||
toxloss = max(toxloss + amount, 0)
|
toxloss = max(toxloss + amount, 0)
|
||||||
|
|
||||||
|
/mob/proc/setToxLoss(var/amount)
|
||||||
|
toxloss = amount
|
||||||
|
|
||||||
/mob/proc/getFireLoss()
|
/mob/proc/getFireLoss()
|
||||||
return fireloss
|
return fireloss
|
||||||
|
|
||||||
/mob/proc/adjustFireLoss(var/amount)
|
/mob/proc/adjustFireLoss(var/amount)
|
||||||
fireloss = max(fireloss + amount, 0)
|
fireloss = max(fireloss + amount, 0)
|
||||||
|
|
||||||
|
/mob/proc/setFireLoss(var/amount)
|
||||||
|
fireloss = amount
|
||||||
|
|
||||||
|
|
||||||
/mob/proc/getCloneLoss()
|
/mob/proc/getCloneLoss()
|
||||||
return cloneloss
|
return cloneloss
|
||||||
|
|
||||||
/mob/proc/adjustCloneLoss(var/amount)
|
/mob/proc/adjustCloneLoss(var/amount)
|
||||||
cloneloss = max(cloneloss + amount, 0)
|
cloneloss = max(cloneloss + amount, 0)
|
||||||
|
|
||||||
|
/mob/proc/setCloneLoss(var/amount)
|
||||||
|
cloneloss = amount
|
||||||
|
|
||||||
/mob/proc/getBrainLoss()
|
/mob/proc/getBrainLoss()
|
||||||
return brainloss
|
return brainloss
|
||||||
|
|
||||||
/mob/proc/adjustBrainLoss(var/amount)
|
/mob/proc/adjustBrainLoss(var/amount)
|
||||||
brainloss = max(brainloss + amount, 0)
|
brainloss = max(brainloss + amount, 0)
|
||||||
|
|
||||||
|
/mob/proc/setBrainLoss(var/amount)
|
||||||
|
brainloss = amount
|
||||||
|
|
||||||
// ++++ROCKDTBEN++++ MOB PROCS //END
|
// ++++ROCKDTBEN++++ MOB PROCS //END
|
||||||
|
|
||||||
|
|||||||
@@ -233,10 +233,10 @@
|
|||||||
O.loc = usr.loc
|
O.loc = usr.loc
|
||||||
|
|
||||||
O.name = text("monkey ([])",copytext(md5(usr.real_name), 2, 6))
|
O.name = text("monkey ([])",copytext(md5(usr.real_name), 2, 6))
|
||||||
O.toxloss = usr.getToxLoss()
|
O.setToxLoss(usr.getToxLoss())
|
||||||
O.bruteloss = usr.getBruteLoss()
|
O.setBruteLoss(usr.getBruteLoss())
|
||||||
O.oxyloss = usr.getOxyLoss()
|
O.setOxyLoss(usr.getOxyLoss())
|
||||||
O.fireloss = usr.getFireLoss()
|
O.setFireLoss(usr.getFireLoss())
|
||||||
O.stat = usr.stat
|
O.stat = usr.stat
|
||||||
O.a_intent = "hurt"
|
O.a_intent = "hurt"
|
||||||
for (var/obj/item/weapon/implant/I in implants)
|
for (var/obj/item/weapon/implant/I in implants)
|
||||||
@@ -328,10 +328,10 @@
|
|||||||
|
|
||||||
updateappearance(O,O.dna.uni_identity)
|
updateappearance(O,O.dna.uni_identity)
|
||||||
domutcheck(O, null)
|
domutcheck(O, null)
|
||||||
O.toxloss = usr.getToxLoss()
|
O.setToxLoss(usr.getToxLoss())
|
||||||
O.bruteloss = usr.getBruteLoss()
|
O.setBruteLoss(usr.getBruteLoss())
|
||||||
O.oxyloss = usr.getOxyLoss()
|
O.setOxyLoss(usr.getOxyLoss())
|
||||||
O.fireloss = usr.getFireLoss()
|
O.setFireLoss(usr.getFireLoss())
|
||||||
O.stat = usr.stat
|
O.stat = usr.stat
|
||||||
for (var/obj/item/weapon/implant/I in implants)
|
for (var/obj/item/weapon/implant/I in implants)
|
||||||
I.loc = O
|
I.loc = O
|
||||||
@@ -372,10 +372,10 @@
|
|||||||
spawn(1200)
|
spawn(1200)
|
||||||
usr.stat = 0
|
usr.stat = 0
|
||||||
//usr.fireloss = 0
|
//usr.fireloss = 0
|
||||||
usr.toxloss = 0
|
usr.setToxLoss(0)
|
||||||
//usr.bruteloss = 0
|
//usr.bruteloss = 0
|
||||||
usr.oxyloss = 0
|
usr.setOxyLoss(0)
|
||||||
usr.cloneloss = 0
|
usr.setCloneLoss(0)
|
||||||
usr.paralysis = 0
|
usr.paralysis = 0
|
||||||
usr.stunned = 0
|
usr.stunned = 0
|
||||||
usr.weakened = 0
|
usr.weakened = 0
|
||||||
|
|||||||
@@ -273,8 +273,8 @@ var/list/sacrificed = list()
|
|||||||
del(ghost)
|
del(ghost)
|
||||||
for(var/datum/organ/external/affecting in corpse_to_raise.organs)
|
for(var/datum/organ/external/affecting in corpse_to_raise.organs)
|
||||||
affecting.heal_damage(1000, 1000)
|
affecting.heal_damage(1000, 1000)
|
||||||
corpse_to_raise.toxloss = 0
|
corpse_to_raise.setToxLoss(0)
|
||||||
corpse_to_raise.oxyloss = 0
|
corpse_to_raise.setOxyLoss(0)
|
||||||
corpse_to_raise.paralysis = 0
|
corpse_to_raise.paralysis = 0
|
||||||
corpse_to_raise.stunned = 0
|
corpse_to_raise.stunned = 0
|
||||||
corpse_to_raise.weakened = 0
|
corpse_to_raise.weakened = 0
|
||||||
|
|||||||
@@ -167,9 +167,9 @@
|
|||||||
|
|
||||||
if(confirm == "Yes")
|
if(confirm == "Yes")
|
||||||
suiciding = 1
|
suiciding = 1
|
||||||
oxyloss = 100
|
setOxyLoss(100)
|
||||||
bruteloss = 100
|
setBruteLoss(100)
|
||||||
toxloss = 100
|
setToxLoss(100)
|
||||||
cloneloss = 100
|
setCloneLoss(100)
|
||||||
|
|
||||||
updatehealth()
|
updatehealth()
|
||||||
|
|||||||
@@ -481,9 +481,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
|||||||
return
|
return
|
||||||
if(config.allow_admin_rev)
|
if(config.allow_admin_rev)
|
||||||
//M.fireloss = 0
|
//M.fireloss = 0
|
||||||
M.toxloss = 0
|
M.setToxLoss(0)
|
||||||
//M.bruteloss = 0
|
//M.bruteloss = 0
|
||||||
M.oxyloss = 0
|
M.setOxyLoss(0)
|
||||||
M.paralysis = 0
|
M.paralysis = 0
|
||||||
M.stunned = 0
|
M.stunned = 0
|
||||||
M.weakened = 0
|
M.weakened = 0
|
||||||
|
|||||||
@@ -40,10 +40,10 @@
|
|||||||
paralysis = 0
|
paralysis = 0
|
||||||
weakened = 0
|
weakened = 0
|
||||||
sleeping = 0
|
sleeping = 0
|
||||||
bruteloss = max(getBruteLoss(), 0)
|
setBruteLoss(max(getBruteLoss(), 0))
|
||||||
toxloss = max(getToxLoss(), 0)
|
setToxLoss(max(getToxLoss(), 0))
|
||||||
oxyloss = max(getOxyLoss(), 0)
|
setOxyLoss(max(getOxyLoss(), 0))
|
||||||
fireloss = max(getFireLoss(), 0)
|
setFireLoss(max(getFireLoss(), 0))
|
||||||
if(stat)
|
if(stat)
|
||||||
stat = 0
|
stat = 0
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -296,8 +296,6 @@
|
|||||||
if(locate(/obj/effect/alien/weeds) in loc)
|
if(locate(/obj/effect/alien/weeds) in loc)
|
||||||
if(health >= 100)
|
if(health >= 100)
|
||||||
adjustToxLoss(15)
|
adjustToxLoss(15)
|
||||||
if(getToxLoss() > max_plasma)
|
|
||||||
toxloss = max_plasma
|
|
||||||
|
|
||||||
else
|
else
|
||||||
adjustBruteLoss(-15)
|
adjustBruteLoss(-15)
|
||||||
|
|||||||
@@ -82,9 +82,9 @@
|
|||||||
paralysis = max(min(paralysis, 20), 0)
|
paralysis = max(min(paralysis, 20), 0)
|
||||||
weakened = max(min(weakened, 20), 0)
|
weakened = max(min(weakened, 20), 0)
|
||||||
sleeping = max(min(sleeping, 20), 0)
|
sleeping = max(min(sleeping, 20), 0)
|
||||||
bruteloss = max(getBruteLoss(), 0)
|
setBruteLoss(max(getBruteLoss(), 0))
|
||||||
toxloss = max(getToxLoss(), 0)
|
setToxLoss(max(getToxLoss(), 0))
|
||||||
oxyloss = max(getOxyLoss(), 0)
|
setOxyLoss(max(getOxyLoss(), 0))
|
||||||
adjustFireLoss(0)
|
adjustFireLoss(0)
|
||||||
|
|
||||||
handle_mutations_and_radiation()
|
handle_mutations_and_radiation()
|
||||||
|
|||||||
@@ -135,9 +135,9 @@
|
|||||||
|
|
||||||
/mob/living/proc/revive()
|
/mob/living/proc/revive()
|
||||||
//src.fireloss = 0
|
//src.fireloss = 0
|
||||||
src.toxloss = 0
|
src.setToxLoss(0)
|
||||||
//src.bruteloss = 0
|
//src.bruteloss = 0
|
||||||
src.oxyloss = 0
|
src.setOxyLoss(0)
|
||||||
src.paralysis = 0
|
src.paralysis = 0
|
||||||
src.stunned = 0
|
src.stunned = 0
|
||||||
src.weakened =0
|
src.weakened =0
|
||||||
|
|||||||
@@ -469,10 +469,10 @@ Doing this because FindTurfs() isn't even used
|
|||||||
/mob/verb/Revive()
|
/mob/verb/Revive()
|
||||||
set category = "Debug"
|
set category = "Debug"
|
||||||
if(Debug)
|
if(Debug)
|
||||||
fireloss = 0
|
setFireLoss(0)
|
||||||
toxloss = 0
|
setToxLoss(0)
|
||||||
bruteloss = 0
|
setBruteLoss(0)
|
||||||
oxyloss = 0
|
setOxyLoss(0)
|
||||||
paralysis = 0
|
paralysis = 0
|
||||||
stunned = 0
|
stunned = 0
|
||||||
weakened = 0
|
weakened = 0
|
||||||
|
|||||||
@@ -32,9 +32,9 @@
|
|||||||
paralysis = max(min(paralysis, 1), 0)
|
paralysis = max(min(paralysis, 1), 0)
|
||||||
weakened = max(min(weakened, 15), 0)
|
weakened = max(min(weakened, 15), 0)
|
||||||
sleeping = max(min(sleeping, 1), 0)
|
sleeping = max(min(sleeping, 1), 0)
|
||||||
bruteloss = max(getBruteLoss(), 0)
|
setBruteLoss(max(getBruteLoss(), 0))
|
||||||
toxloss = 0
|
setToxLoss(0)
|
||||||
oxyloss = 0
|
setOxyLoss(0)
|
||||||
adjustFireLoss(0)
|
adjustFireLoss(0)
|
||||||
|
|
||||||
use_power()
|
use_power()
|
||||||
|
|||||||
Reference in New Issue
Block a user