mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 10:03:50 +01: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
@@ -233,10 +233,10 @@
|
||||
O.loc = usr.loc
|
||||
|
||||
O.name = text("monkey ([])",copytext(md5(usr.real_name), 2, 6))
|
||||
O.toxloss = usr.getToxLoss()
|
||||
O.bruteloss = usr.getBruteLoss()
|
||||
O.oxyloss = usr.getOxyLoss()
|
||||
O.fireloss = usr.getFireLoss()
|
||||
O.setToxLoss(usr.getToxLoss())
|
||||
O.setBruteLoss(usr.getBruteLoss())
|
||||
O.setOxyLoss(usr.getOxyLoss())
|
||||
O.setFireLoss(usr.getFireLoss())
|
||||
O.stat = usr.stat
|
||||
O.a_intent = "hurt"
|
||||
for (var/obj/item/weapon/implant/I in implants)
|
||||
@@ -328,10 +328,10 @@
|
||||
|
||||
updateappearance(O,O.dna.uni_identity)
|
||||
domutcheck(O, null)
|
||||
O.toxloss = usr.getToxLoss()
|
||||
O.bruteloss = usr.getBruteLoss()
|
||||
O.oxyloss = usr.getOxyLoss()
|
||||
O.fireloss = usr.getFireLoss()
|
||||
O.setToxLoss(usr.getToxLoss())
|
||||
O.setBruteLoss(usr.getBruteLoss())
|
||||
O.setOxyLoss(usr.getOxyLoss())
|
||||
O.setFireLoss(usr.getFireLoss())
|
||||
O.stat = usr.stat
|
||||
for (var/obj/item/weapon/implant/I in implants)
|
||||
I.loc = O
|
||||
@@ -372,10 +372,10 @@
|
||||
spawn(1200)
|
||||
usr.stat = 0
|
||||
//usr.fireloss = 0
|
||||
usr.toxloss = 0
|
||||
usr.setToxLoss(0)
|
||||
//usr.bruteloss = 0
|
||||
usr.oxyloss = 0
|
||||
usr.cloneloss = 0
|
||||
usr.setOxyLoss(0)
|
||||
usr.setCloneLoss(0)
|
||||
usr.paralysis = 0
|
||||
usr.stunned = 0
|
||||
usr.weakened = 0
|
||||
|
||||
@@ -273,8 +273,8 @@ var/list/sacrificed = list()
|
||||
del(ghost)
|
||||
for(var/datum/organ/external/affecting in corpse_to_raise.organs)
|
||||
affecting.heal_damage(1000, 1000)
|
||||
corpse_to_raise.toxloss = 0
|
||||
corpse_to_raise.oxyloss = 0
|
||||
corpse_to_raise.setToxLoss(0)
|
||||
corpse_to_raise.setOxyLoss(0)
|
||||
corpse_to_raise.paralysis = 0
|
||||
corpse_to_raise.stunned = 0
|
||||
corpse_to_raise.weakened = 0
|
||||
|
||||
@@ -167,9 +167,9 @@
|
||||
|
||||
if(confirm == "Yes")
|
||||
suiciding = 1
|
||||
oxyloss = 100
|
||||
bruteloss = 100
|
||||
toxloss = 100
|
||||
cloneloss = 100
|
||||
setOxyLoss(100)
|
||||
setBruteLoss(100)
|
||||
setToxLoss(100)
|
||||
setCloneLoss(100)
|
||||
|
||||
updatehealth()
|
||||
|
||||
Reference in New Issue
Block a user