From 38d90773cc9b73f608a119c7e36b5ad3f9ffadbb Mon Sep 17 00:00:00 2001 From: rockdtben Date: Thu, 17 Nov 2011 23:42:09 +0000 Subject: [PATCH] Implemented getToxLoss() git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2528 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/virus2/Disease2/base.dm | 2 +- code/datums/diseases/appendicitis.dm | 2 +- code/defines/mob/mob.dm | 5 ++-- code/game/dna.dm | 4 ++-- .../gamemodes/changeling/changeling_powers.dm | 4 ++-- code/game/gamemodes/events/ninja_equipment.dm | 2 +- code/game/machinery/Sleeper.dm | 4 ++-- code/game/machinery/bots/medbot.dm | 6 ++--- code/game/machinery/cloning.dm | 4 ++-- code/game/machinery/computer/Operating.dm | 2 +- code/game/machinery/computer/aifixer.dm | 2 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/cryo.dm | 6 ++--- code/game/objects/devices/PDA/PDA.dm | 2 +- code/game/objects/devices/scanners.dm | 10 ++++---- code/game/verbs/suicide.dm | 10 ++++---- code/modules/chemical/Chemistry-Reagents.dm | 24 +++++++++---------- code/modules/mob/living/blob/blob.dm | 4 ++-- .../carbon/alien/humanoid/alien_powers.dm | 2 +- .../carbon/alien/humanoid/caste/hunter.dm | 2 +- .../carbon/alien/humanoid/caste/sentinel.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../mob/living/carbon/alien/humanoid/life.dm | 4 ++-- .../mob/living/carbon/alien/humanoid/queen.dm | 2 +- .../mob/living/carbon/alien/larva/larva.dm | 2 +- .../mob/living/carbon/alien/larva/life.dm | 2 +- code/modules/mob/living/carbon/brain/life.dm | 4 ++-- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 6 ++--- .../modules/mob/living/carbon/metroid/life.dm | 6 ++--- .../mob/living/carbon/metroid/metroid.dm | 4 ++-- .../mob/living/carbon/metroid/powers.dm | 6 ++--- code/modules/mob/living/carbon/monkey/life.dm | 2 +- .../mob/living/carbon/monkey/monkey.dm | 12 +++++----- code/modules/mob/living/living.dm | 4 ++-- code/modules/mob/living/silicon/ai/life.dm | 4 ++-- code/modules/mob/living/silicon/decoy/life.dm | 2 +- .../mob/living/silicon/pai/software.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 2 +- code/modules/power/singularity/singularity.dm | 8 +++---- code/unused/pda2/scanners.dm | 2 +- 41 files changed, 90 insertions(+), 89 deletions(-) diff --git a/code/WorkInProgress/virus2/Disease2/base.dm b/code/WorkInProgress/virus2/Disease2/base.dm index 0d93cacaa1c..5ccff0caf64 100644 --- a/code/WorkInProgress/virus2/Disease2/base.dm +++ b/code/WorkInProgress/virus2/Disease2/base.dm @@ -288,7 +288,7 @@ mob.suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while viewers(mob) << "\red [mob.name] is attempting to bite off \his tongue. It looks like \he's trying to commit suicide." - mob.oxyloss = max(175 - mob.toxloss - mob.fireloss - mob.getBruteLoss(), mob.getOxyLoss()) + mob.oxyloss = max(175 - mob.getToxLoss() - mob.fireloss - mob.getBruteLoss(), mob.getOxyLoss()) mob.updatehealth() spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds mob.suiciding = 0 diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index be728403089..949a6fbcc5a 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -32,7 +32,7 @@ if (istype(location, /turf/simulated)) location.add_vomit_floor(affected_mob) affected_mob.nutrition -= 95 - affected_mob:toxloss = max(affected_mob:toxloss-1,0) + affected_mob:toxloss = max(affected_mob:getToxLoss()-1,0) else affected_mob << "\red You gag as you want to throw up, but there's nothing in your stomach!" affected_mob.weakened += 10 diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm index 5909ec3ed92..59dd7144cdb 100644 --- a/code/defines/mob/mob.dm +++ b/code/defines/mob/mob.dm @@ -17,6 +17,8 @@ // var/uses_hud = 0 var/bruteloss = 0.0//Living + var/oxyloss = 0.0//Living + var/toxloss = 0.0//Living var/obj/screen/flash = null @@ -89,8 +91,7 @@ var/lying = 0.0 var/canmove = 1.0 var/eye_stat = null//Living, potentially Carbon - var/oxyloss = 0.0//Living - var/toxloss = 0.0//Living + var/fireloss = 0.0//Living var/timeofdeath = 0.0//Living diff --git a/code/game/dna.dm b/code/game/dna.dm index 7c012019af2..7404cbea1ef 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -392,7 +392,7 @@ connected = null O.name = text("monkey ([])",copytext(md5(M.real_name), 2, 6)) O.take_overall_damage(M.getBruteLoss() + 40, M.fireloss) - O.toxloss += (M.toxloss + 20) + O.toxloss += (M.getToxLoss() + 20) O.oxyloss += M.getOxyLoss() O.stat = M.stat O.a_intent = "hurt" @@ -467,7 +467,7 @@ i++ updateappearance(O,O.dna.uni_identity) O.take_overall_damage(M.getBruteLoss(), M.fireloss) - O.toxloss += M.toxloss + O.toxloss += M.getToxLoss() O.oxyloss += M.getOxyLoss() O.stat = M.stat for (var/obj/item/weapon/implant/I in implants) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index f685efa549d..4c6cd5287ac 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -232,7 +232,7 @@ O.loc = usr.loc O.name = text("monkey ([])",copytext(md5(usr.real_name), 2, 6)) - O.toxloss = usr.toxloss + O.toxloss = usr.getToxLoss() O.bruteloss = usr.getBruteLoss() O.oxyloss = usr.getOxyLoss() O.fireloss = usr.fireloss @@ -327,7 +327,7 @@ updateappearance(O,O.dna.uni_identity) domutcheck(O, null) - O.toxloss = usr.toxloss + O.toxloss = usr.getToxLoss() O.bruteloss = usr.getBruteLoss() O.oxyloss = usr.getOxyLoss() O.fireloss = usr.fireloss diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 1b36a2786c9..54aa0e0cac4 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -288,7 +288,7 @@ ________________________________________________________________________________ dat += "

Overall Status: [U.stat > 1 ? "dead" : "[U.health]% healthy"]

" dat += "

Nutrition Status: [U.nutrition]

" dat += "Oxygen loss: [U.getOxyLoss()]" - dat += " | Toxin levels: [U.toxloss]
" + dat += " | Toxin levels: [U.getToxLoss()]
" dat += "Burn severity: [U.fireloss]" dat += " | Brute trauma: [U.getBruteLoss()]
" dat += "Radiation Level: [U.radiation] rad
" diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 76624d7cdfd..79245eb7909 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -63,7 +63,7 @@ dat += text("[]\tHealth %: [] ([])
", (occupant.health > 50 ? "" : ""), occupant.health, t1) dat += text("[]\t-Brute Damage %: []
", (occupant.getBruteLoss() < 60 ? "" : ""), occupant.getBruteLoss()) dat += text("[]\t-Respiratory Damage %: []
", (occupant.getOxyLoss() < 60 ? "" : ""), occupant.getOxyLoss()) - dat += text("[]\t-Toxin Content %: []
", (occupant.toxloss < 60 ? "" : ""), occupant.toxloss) + dat += text("[]\t-Toxin Content %: []
", (occupant.getToxLoss() < 60 ? "" : ""), occupant.getToxLoss()) dat += text("[]\t-Burn Severity %: []
", (occupant.fireloss < 60 ? "" : ""), occupant.fireloss) dat += text("
Paralysis Summary %: [] ([] seconds left!)
", occupant.paralysis, round(occupant.paralysis / 4)) dat += text("Inaprovaline units: [] units
", occupant.reagents.get_reagent_amount("inaprovaline")) @@ -333,7 +333,7 @@ user << text("[]\t -Core Temperature: []°C ([]°F)
", (src.occupant.bodytemperature > 50 ? "" : ""), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67) user << text("[]\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "\blue " : "\red "), src.occupant.getBruteLoss()) user << text("[]\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "\blue " : "\red "), src.occupant.getOxyLoss()) - user << text("[]\t -Toxin Content %: []", (src.occupant.toxloss < 60 ? "\blue " : "\red "), src.occupant.toxloss) + user << text("[]\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "\blue " : "\red "), src.occupant.getToxLoss()) user << text("[]\t -Burn Severity %: []", (src.occupant.fireloss < 60 ? "\blue " : "\red "), src.occupant.fireloss) user << "\blue Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)" user << text("\blue \t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 0292c3a76f9..49b45a31cb1 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -326,7 +326,7 @@ return 1 //If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS. - if((src.reagent_glass) && (src.use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.toxloss >= heal_threshold) || (C.toxloss >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15)))) + if((src.reagent_glass) && (src.use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15)))) for(var/datum/reagent/R in src.reagent_glass.reagents.reagent_list) if(!C.reagents.has_reagent(R)) return 1 @@ -342,7 +342,7 @@ if((C.fireloss >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_fire))) return 1 - if((C.toxloss >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_tox))) + if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(src.treatment_tox))) return 1 @@ -403,7 +403,7 @@ if(!C.reagents.has_reagent(src.treatment_fire)) reagent_id = src.treatment_fire - if (!reagent_id && (C.toxloss >= heal_threshold)) + if (!reagent_id && (C.getToxLoss() >= heal_threshold)) if(!C.reagents.has_reagent(src.treatment_tox)) reagent_id = src.treatment_tox diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 8ac31cf3fd1..7b62a7e0cd2 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -415,7 +415,7 @@ if (!src.implanted) return "ERROR" else - src.healthstring = "[round(src.implanted:getOxyLoss())] - [round(src.implanted:fireloss)] - [round(src.implanted:toxloss)] - [round(src.implanted:getBruteLoss())]" + src.healthstring = "[round(src.implanted:getOxyLoss())] - [round(src.implanted:fireloss)] - [round(src.implanted:getToxLoss())] - [round(src.implanted:getBruteLoss())]" if (!src.healthstring) src.healthstring = "ERROR" return src.healthstring @@ -457,7 +457,7 @@ src.occupant.paralysis += 4 //Here let's calculate their health so the pod doesn't immediately eject them!!! - src.occupant.health = (src.occupant.getBruteLoss() + src.occupant.toxloss + src.occupant.getOxyLoss() + src.occupant.cloneloss) + src.occupant.health = (src.occupant.getBruteLoss() + src.occupant.getToxLoss() + src.occupant.getOxyLoss() + src.occupant.cloneloss) src.occupant << "\blue Clone generation process initiated." src.occupant << "\blue This will take a moment, please hold." diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 4dd38811bc6..4890a89cc1d 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -37,7 +37,7 @@
Health: [src.victim.health]
Brute Damage: [src.victim.getBruteLoss()]
-Toxins Damage: [src.victim.toxloss]
+Toxins Damage: [src.victim.getToxLoss()]
Fire Damage: [src.victim.fireloss]
Suffocation Damage: [src.victim.getOxyLoss()]
Patient Status: [src.victim.stat ? "Non-responsive" : "Stable"]
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 816cb004bf1..d452b5eaa0c 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -124,7 +124,7 @@ while (src.occupant.health < 100) src.occupant.oxyloss = max (src.occupant.getOxyLoss()-1, 0) src.occupant.fireloss = max (src.occupant.fireloss-1, 0) - src.occupant.toxloss = max (src.occupant.toxloss-1, 0) + src.occupant.toxloss = max (src.occupant.getToxLoss()-1, 0) src.occupant.bruteloss = max (src.occupant.getBruteLoss()-1, 0) src.occupant.updatehealth() if (src.occupant.health >= 0 && src.occupant.stat == 2) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index ee94a5efbcb..1e6a082122f 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -62,7 +62,7 @@ if(istype(C.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C.loc var/dam1 = round(H.getOxyLoss(),1) - var/dam2 = round(H.toxloss,1) + var/dam2 = round(H.getToxLoss(),1) var/dam3 = round(H.fireloss,1) var/dam4 = round(H.getBruteLoss(),1) switch(C.sensor_mode) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index cfd4a1f91b5..d9a1f10f716 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -90,7 +90,7 @@ Current cell temperature: [temp_text]K
Cryo status: [ src.on ? "Off On" : "Off On"]
[beaker_text]

- Current occupant: [src.occupant ? "
Name: [src.occupant]
Health: [health_text]
Oxygen deprivation: [round(src.occupant.getOxyLoss(),0.1)]
Brute damage: [round(src.occupant.getBruteLoss(),0.1)]
Fire damage: [round(src.occupant.fireloss,0.1)]
Toxin damage: [round(src.occupant.toxloss,0.1)]
Body temperature: [src.occupant.bodytemperature]" : "None"]
+ Current occupant: [src.occupant ? "
Name: [src.occupant]
Health: [health_text]
Oxygen deprivation: [round(src.occupant.getOxyLoss(),0.1)]
Brute damage: [round(src.occupant.getBruteLoss(),0.1)]
Fire damage: [round(src.occupant.fireloss,0.1)]
Toxin damage: [round(src.occupant.getToxLoss(),0.1)]
Body temperature: [src.occupant.bodytemperature]" : "None"]
"} user.machine = src @@ -173,8 +173,8 @@ occupant.oxyloss -= 1 //severe damage should heal waaay slower without proper chemicals if(occupant.bodytemperature < 225) - if (occupant.toxloss) - occupant.toxloss = max(0, occupant.toxloss - min(1, 20/occupant.toxloss)) + if (occupant.getToxLoss()) + occupant.toxloss = max(0, occupant.getToxLoss() - min(1, 20/occupant.getToxLoss())) var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0 var/heal_fire = occupant.fireloss ? min(1, 20/occupant.fireloss) : 0 occupant.heal_organ_damage(heal_brute,heal_fire) diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 6f76e42767d..a8ff26b2aae 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -721,7 +721,7 @@ user.show_message("\blue Analyzing Results for [C]:") user.show_message("\blue \t Overall Status: [C.stat > 1 ? "dead" : "[C.health]% healthy"]", 1) - user.show_message("\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.toxloss > 50 ? "\red" : "\blue"][C.toxloss]-[C.fireloss > 50 ? "\red" : "\blue"][C.fireloss]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]", 1) + user.show_message("\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.fireloss > 50 ? "\red" : "\blue"][C.fireloss]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]", 1) user.show_message("\blue \t Key: Suffocation/Toxin/Burns/Brute", 1) user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1) for(var/datum/disease/D in C.viruses) diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index 50162ddbbd0..141debe6be9 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -195,19 +195,19 @@ MASS SPECTROMETER for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has analyzed []'s vitals!", user, M), 1) //Foreach goto(67) - var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.toxloss + M.fireloss + M.getBruteLoss()))) + var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.fireloss + M.getBruteLoss()))) if((M.reagents && M.reagents.has_reagent("zombiepowder")) || (M.changeling && M.changeling.changeling_fakedeath)) user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1) - user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.toxloss > 50 ? "\red [M.toxloss]" : M.toxloss, M.fireloss > 50 ? "\red[M.fireloss]" : M.fireloss, M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) + user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.fireloss > 50 ? "\red[M.fireloss]" : M.fireloss, M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) else user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, (M.stat > 1 ? "dead" : text("[]% healthy", M.health))), 1) - user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.toxloss > 50 ? "\red [M.toxloss]" : M.toxloss, M.fireloss > 50 ? "\red[M.fireloss]" : M.fireloss, M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) + user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.fireloss > 50 ? "\red[M.fireloss]" : M.fireloss, M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1) user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) if((M.changeling && M.changeling.changeling_fakedeath) || (M.reagents && M.reagents.has_reagent("zombiepowder"))) - user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.toxloss > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.fireloss > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) + user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.fireloss > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) else - user.show_message(text("\blue [] | [] | [] | []", M.getOxyLoss() > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.toxloss > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.fireloss > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) + user.show_message(text("\blue [] | [] | [] | []", M.getOxyLoss() > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.fireloss > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) if (M.cloneloss) user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1) for(var/datum/disease/D in M.viruses) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index ad1abc03dc2..be6f318d96b 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -25,7 +25,7 @@ suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while viewers(src) << "\red [src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide." - oxyloss = max(175 - toxloss - fireloss - getBruteLoss(), getOxyLoss()) + oxyloss = max(175 - getToxLoss() - fireloss - getBruteLoss(), getOxyLoss()) updatehealth() /mob/living/carbon/brain/verb/suicide() @@ -48,7 +48,7 @@ if(confirm == "Yes") suiciding = 1 viewers(loc) << "\red [src]'s brain is growing dull and lifeless. It looks like it's trying to commit suicide. Somehow." - oxyloss = max(175 - toxloss - fireloss - getBruteLoss(), getOxyLoss()) + oxyloss = max(175 - getToxLoss() - fireloss - getBruteLoss(), getOxyLoss()) updatehealth() spawn(200) suiciding = 0 @@ -74,7 +74,7 @@ suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while viewers(src) << "\red [src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide." - oxyloss = max(175 - toxloss - fireloss - getBruteLoss(), getOxyLoss()) + oxyloss = max(175 - getToxLoss() - fireloss - getBruteLoss(), getOxyLoss()) updatehealth() /mob/living/silicon/ai/verb/suicide() @@ -94,7 +94,7 @@ suiciding = 1 viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." //put em at -175 - oxyloss = max(175 - toxloss - fireloss - getBruteLoss(), getOxyLoss()) + oxyloss = max(175 - getToxLoss() - fireloss - getBruteLoss(), getOxyLoss()) updatehealth() /mob/living/silicon/robot/verb/suicide() @@ -114,7 +114,7 @@ suiciding = 1 viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." //put em at -175 - oxyloss = max(475 - toxloss - fireloss - getBruteLoss(), getOxyLoss()) + oxyloss = max(475 - getToxLoss() - fireloss - getBruteLoss(), getOxyLoss()) updatehealth() /mob/living/silicon/pai/verb/suicide() diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index cdd4d6ae5f7..df45f769bcd 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -324,7 +324,7 @@ datum holder.remove_reagent("carpotoxin", 1) if(holder.has_reagent("zombiepowder")) holder.remove_reagent("zombiepowder", 0.5) - M:toxloss = max(M:toxloss-2,0) + M:toxloss = max(M:getToxLoss()-2,0) ..() return @@ -1202,7 +1202,7 @@ datum if(M:getOxyLoss() && prob(40)) M:oxyloss-- if(M:getBruteLoss() && prob(40)) M:heal_organ_damage(1,0) if(M:fireloss && prob(40)) M:heal_organ_damage(0,1) - if(M:toxloss && prob(40)) M:toxloss-- + if(M:getToxLoss() && prob(40)) M:toxloss-- ..() return @@ -1219,7 +1219,7 @@ datum M:oxyloss = 0 M:radiation = 0 M:heal_organ_damage(5,5) - if(M:toxloss) M:toxloss = max(0, M:toxloss-5) + if(M:getToxLoss()) M:toxloss = max(0, M:getToxLoss()-5) if(holder.has_reagent("toxin")) holder.remove_reagent("toxin", 5) if(holder.has_reagent("stoxin")) @@ -1326,7 +1326,7 @@ datum return //See above, down and around. --Agouri if(!M) M = holder.my_atom M:radiation = max(M:radiation-7,0) - if(M:toxloss) M:toxloss-- + if(M:getToxLoss()) M:toxloss-- if(prob(15)) M.take_organ_damage(1, 0) ..() @@ -1403,7 +1403,7 @@ datum if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-1) if(M:getOxyLoss()) M:oxyloss = max(0, M:getOxyLoss()-3) M:heal_organ_damage(3,3) - if(M:toxloss) M:toxloss = max(0, M:toxloss-3) + if(M:getToxLoss()) M:toxloss = max(0, M:getToxLoss()-3) ..() return @@ -1420,7 +1420,7 @@ datum if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-3) if(M:getOxyLoss()) M:oxyloss = max(0, M:getOxyLoss()-3) M:heal_organ_damage(3,3) - if(M:toxloss) M:toxloss = max(0, M:toxloss-3) + if(M:getToxLoss()) M:toxloss = max(0, M:getToxLoss()-3) ..() return @@ -1640,7 +1640,7 @@ datum M.jitteriness += rand(0, 5) M.dizziness = max (0, (M.dizziness - rand(0, 15))) M.druggy = max (0, (M.druggy - rand(0, 15))) - M.toxloss = max (0, (M.toxloss - rand(5, 15))) + M.toxloss = max (0, (M.getToxLoss() - rand(5, 15))) M.updatehealth() */ ..() @@ -1960,7 +1960,7 @@ datum on_mob_life(var/mob/living/M as mob) M:nutrition += nutriment_factor if(!M) M = holder.my_atom - if(M:toxloss && prob(20)) M:toxloss-- + if(M:getToxLoss() && prob(20)) M:toxloss-- M:nutrition++ ..() return @@ -2167,7 +2167,7 @@ datum M:drowsyness = max(0,M:drowsyness-1) M:jitteriness = max(0,M:jitteriness-3) M:sleeping = 0 - if(M:toxloss && prob(20)) + if(M:getToxLoss() && prob(20)) M:toxloss-- if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature+5) @@ -2204,7 +2204,7 @@ datum M.dizziness = max(0,M.dizziness-2) M:drowsyness = max(0,M:drowsyness-1) M:sleeping = 0 - if(M:toxloss && prob(20)) + if(M:getToxLoss() && prob(20)) M:toxloss-- if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 M.bodytemperature = min(310, M.bodytemperature-5) @@ -3033,7 +3033,7 @@ datum if(M:getOxyLoss() && prob(50)) M:oxyloss -= 2 if(M:getBruteLoss() && prob(60)) M:heal_organ_damage(2,0) if(M:fireloss && prob(50)) M:heal_organ_damage(0,2) - if(M:toxloss && prob(50)) M:toxloss -= 2 + if(M:getToxLoss() && prob(50)) M:toxloss -= 2 if(M.dizziness !=0) M.dizziness = max(0,M.dizziness-15) if(M.confused !=0) M.confused = max(0,M.confused - 5) ..() @@ -3677,7 +3677,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M:oxyloss += 0.5 - M:toxloss += 0.5 + M:getToxLoss() += 0.5 M:weakened = max(M:weakened, 15) M:silent = max(M:silent, 15) if(!data) data = 1 diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm index da747ef4728..84c61a0f7df 100644 --- a/code/modules/mob/living/blob/blob.dm +++ b/code/modules/mob/living/blob/blob.dm @@ -41,7 +41,7 @@ weakened = 0 sleeping = 0 bruteloss = max(getBruteLoss(), 0) - toxloss = max(toxloss, 0) + toxloss = max(getToxLoss(), 0) oxyloss = max(getOxyLoss(), 0) fireloss = max(fireloss, 0) if(stat) @@ -50,7 +50,7 @@ proc/UpdateDamage() - health = 60 - (getOxyLoss() + toxloss + fireloss + getBruteLoss() + cloneloss) + health = 60 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss) return diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index bcbd5ede402..ec1bb65084e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -10,7 +10,7 @@ Doesn't work on other aliens/AI.*/ if(stat) src << "\green You must be conscious to do this." return 0 - else if(X&&toxloss < X) + else if(X&&getToxLoss() < X) src << "\green Not enough plasma stored." return 0 else if(Y&&(!isturf(src.loc) || istype(src.loc, /turf/space))) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 0938c342c61..50bbc47c680 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -67,7 +67,7 @@ if(locate(/obj/effect/alien/weeds) in loc) if(health >= 150) toxloss += 5 - if(toxloss > max_plasma) + if(getToxLoss() > max_plasma) toxloss = max_plasma else diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index ecda92fbb57..2cc8166bce3 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -67,7 +67,7 @@ if(locate(/obj/effect/alien/weeds) in loc) if(health >= 125) toxloss += 10 - if(toxloss > max_plasma) + if(getToxLoss() > max_plasma) toxloss = max_plasma else diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 7c0c89044ca..6101c6c0720 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -72,7 +72,7 @@ stat(null, "Move Mode: [m_intent]") if (client.statpanel == "Status") - stat(null, "Plasma Stored: [toxloss]") + stat(null, "Plasma Stored: [getToxLoss()]") ///mob/living/carbon/alien/humanoid/bullet_act(var/obj/item/projectile/Proj) taken care of in living diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index e0b95641285..9c565e06539 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -85,7 +85,7 @@ weakened = max(min(weakened, 20), 0) sleeping = max(min(sleeping, 20), 0) bruteloss = max(getBruteLoss(), 0) - toxloss = max(toxloss, 0) + toxloss = max(getToxLoss(), 0) oxyloss = max(getOxyLoss(), 0) fireloss = max(fireloss, 0) @@ -296,7 +296,7 @@ if(locate(/obj/effect/alien/weeds) in loc) if(health >= 100) toxloss += 15 - if(toxloss > max_plasma) + if(getToxLoss() > max_plasma) toxloss = max_plasma else diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index df0f8f2887e..c491e3f5f67 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -70,7 +70,7 @@ if(locate(/obj/effect/alien/weeds) in loc) if(health >= 250) toxloss += 20 - if(toxloss > max_plasma) + if(getToxLoss() > max_plasma) toxloss = max_plasma else bruteloss -= 5 diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 4deeebfa83b..a1972b669dd 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -63,7 +63,7 @@ if (client.statpanel == "Status") stat(null, "Progress: [amount_grown]/200") - stat(null, "Plasma Stored: [toxloss]") + stat(null, "Plasma Stored: [getToxLoss()]") ///mob/living/carbon/alien/larva/bullet_act(var/obj/item/projectile/Proj) taken care of in living diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index a22a2839a69..f6586579cb7 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -83,7 +83,7 @@ weakened = max(min(weakened, 20), 0) sleeping = max(min(sleeping, 20), 0) bruteloss = max(getBruteLoss(), 0) - toxloss = max(toxloss, 0) + toxloss = max(getToxLoss(), 0) oxyloss = max(getOxyLoss(), 0) fireloss = max(fireloss, 0) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index dd04b50beb2..bd9277fa59b 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -48,7 +48,7 @@ bruteloss = max(getBruteLoss(), 0) fireloss = max(fireloss, 0) oxyloss = max(getOxyLoss(), 0) - toxloss = max(toxloss, 0) + toxloss = max(getToxLoss(), 0) handle_mutations_and_radiation() @@ -144,7 +144,7 @@ handle_regular_status_updates() - health = 100 - (getOxyLoss() + toxloss + fireloss + getBruteLoss() + cloneloss) + health = 100 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss) if(getOxyLoss() > 25) paralysis = max(paralysis, 3) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 18babfb546a..383fbd6ffc0 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -2195,7 +2195,7 @@ It can still be worn/put on as normal. for(var/datum/organ/external/O in organs) src.bruteloss += O.brute_dam src.fireloss += O.burn_dam - src.health = 100 - src.getOxyLoss() - src.toxloss - src.fireloss - src.getBruteLoss() - src.cloneloss + src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss() - src.cloneloss /mob/living/carbon/human/abiotic(var/full_body = 0) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c281d8a014a..c6a6b28e2b5 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -103,7 +103,7 @@ weakened = max(min(weakened, 20), 0) sleeping = max(min(sleeping, 20), 0) bruteloss = max(getBruteLoss(), 0) - toxloss = max(toxloss, 0) + toxloss = max(getToxLoss(), 0) oxyloss = max(getOxyLoss(), 0) fireloss = max(fireloss, 0) @@ -605,7 +605,7 @@ heal_overall_damage(0,1) if(getBruteLoss()) heal_overall_damage(1,0) - if(toxloss) + if(getToxLoss()) toxloss-- if(getOxyLoss()) oxyloss-- @@ -656,7 +656,7 @@ handle_regular_status_updates() - // health = 100 - (getOxyLoss() + toxloss + fireloss + bruteloss + cloneloss) + // health = 100 - (getOxyLoss() + getToxLoss() + fireloss + bruteloss + cloneloss) if(getOxyLoss() > 50) paralysis = max(paralysis, 3) diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index a6a0a008486..48edc4c9045 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -396,9 +396,9 @@ handle_regular_status_updates() if(istype(src, /mob/living/carbon/metroid/adult)) - health = 200 - (getOxyLoss() + toxloss + fireloss + getBruteLoss() + cloneloss) + health = 200 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss) else - health = 150 - (getOxyLoss() + toxloss + fireloss + getBruteLoss() + cloneloss) + health = 150 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss) @@ -417,7 +417,7 @@ if(prob(30)) if(getOxyLoss()>0) oxyloss = max(getOxyLoss()-1, 0) - if(toxloss>0) toxloss = max(toxloss-1, 0) + if(getToxLoss()>0) toxloss = max(getToxLoss()-1, 0) if(fireloss>0) fireloss = max(fireloss-1,0) if(cloneloss>0) cloneloss = max(cloneloss-1,0) if(getBruteLoss()>0) bruteloss = max(getBruteLoss()-1,0) diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 84030d9b7e3..38f3faa63ea 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -648,9 +648,9 @@ mob/living/carbon/metroid/var/temperature_resistance = T0C+75 if (nodamage == 0) // metroids can't suffocate unless they suicide. They are also not harmed by fire if(istype(src, /mob/living/carbon/metroid/adult)) - health = 200 - (getOxyLoss() + toxloss + fireloss + getBruteLoss() + cloneloss) + health = 200 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss) else - health = 150 - (getOxyLoss() + toxloss + fireloss + getBruteLoss() + cloneloss) + health = 150 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss) else if(istype(src, /mob/living/carbon/metroid/adult)) health = 200 diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm index 013aab158d6..2073eae04f3 100644 --- a/code/modules/mob/living/carbon/metroid/powers.dm +++ b/code/modules/mob/living/carbon/metroid/powers.dm @@ -76,8 +76,8 @@ if(Victim.health <= 0) Victim.toxloss += rand(2,4) - if(toxloss > 0) - toxloss = max(0, toxloss-10) + if(getToxLoss() > 0) + toxloss = max(0, getToxLoss()-10) if(getOxyLoss() > 0) oxyloss = max(0, getOxyLoss()-10) @@ -96,7 +96,7 @@ if(Metroid.Victim == M && Metroid != src) Metroid.Feedstop() - if(toxloss<0) toxloss = 0 + if(getToxLoss()<0) toxloss = 0 if(getOxyLoss()<0) oxyloss = 0 if(getBruteLoss()<0) bruteloss = 0 if(fireloss<0) fireloss = 0 diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 9ebdd2b9086..cd8e4f7c56b 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -397,7 +397,7 @@ handle_regular_status_updates() - health = 100 - (getOxyLoss() + toxloss + fireloss + getBruteLoss() + cloneloss) + health = 100 - (getOxyLoss() + getToxLoss() + fireloss + getBruteLoss() + cloneloss) if(getOxyLoss() > 25) paralysis = max(paralysis, 3) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 9bf837a2331..f6e834d1190 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -103,7 +103,7 @@ bruteloss += 30 if ((O.icon_state == "flaming" && !( shielded ))) fireloss += 40 - health = 100 - getOxyLoss() - toxloss - fireloss - getBruteLoss() + health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss() return //mob/living/carbon/monkey/bullet_act(var/obj/item/projectile/Proj)taken care of in living @@ -139,7 +139,7 @@ O.show_message("\red [M.name] has bit [name]!", 1) var/damage = rand(1, 5) bruteloss += damage - health = 100 - getOxyLoss() - toxloss - fireloss - getBruteLoss() + health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss() for(var/datum/disease/D in M.viruses) if(istype(D, /datum/disease/jungle_fever)) contract_disease(D,1,0) @@ -536,16 +536,16 @@ if(1.0) if (stat != 2) bruteloss += 200 - health = 100 - getOxyLoss() - toxloss - fireloss - getBruteLoss() + health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss() if(2.0) if (stat != 2) bruteloss += 60 fireloss += 60 - health = 100 - getOxyLoss() - toxloss - fireloss - getBruteLoss() + health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss() if(3.0) if (stat != 2) bruteloss += 30 - health = 100 - getOxyLoss() - toxloss - fireloss - getBruteLoss() + health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss() if (prob(50)) paralysis += 10 else @@ -554,7 +554,7 @@ /mob/living/carbon/monkey/blob_act() if (stat != 2) fireloss += 60 - health = 100 - getOxyLoss() - toxloss - fireloss - getBruteLoss() + health = 100 - getOxyLoss() - getToxLoss() - fireloss - getBruteLoss() if (prob(50)) paralysis += 10 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 151b31247ba..3139017e76a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -2,13 +2,13 @@ set hidden = 1 if ((src.health < 0 && src.health > -95.0)) src.oxyloss += src.health + 200 - src.health = 100 - src.getOxyLoss() - src.toxloss - src.fireloss - src.getBruteLoss() + src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss() src << "\blue You have given up life and succumbed to death." /mob/living/proc/updatehealth() if(!src.nodamage) - src.health = 100 - src.getOxyLoss() - src.toxloss - src.fireloss - src.getBruteLoss() - src.cloneloss + src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss() - src.cloneloss else src.health = 100 src.stat = 0 diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index db549dee925..9252b308168 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -239,9 +239,9 @@ /mob/living/silicon/ai/updatehealth() if (src.nodamage == 0) if(src.fire_res_on_core) - src.health = 100 - src.getOxyLoss() - src.toxloss - src.getBruteLoss() + src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getBruteLoss() else - src.health = 100 - src.getOxyLoss() - src.toxloss - src.fireloss - src.getBruteLoss() + src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss() else src.health = 100 src.stat = 0 diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm index 5f9d87a6391..e004ea42fe0 100644 --- a/code/modules/mob/living/silicon/decoy/life.dm +++ b/code/modules/mob/living/silicon/decoy/life.dm @@ -9,7 +9,7 @@ /mob/living/silicon/decoy/updatehealth() if (src.nodamage == 0) - src.health = 100 - src.getOxyLoss() - src.toxloss - src.fireloss - src.getBruteLoss() + src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.fireloss - src.getBruteLoss() else src.health = 100 src.stat = 0 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index e7427fca9c0..4c025d33484 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -470,7 +470,7 @@ Overall Status: [M.stat > 1 ? "dead" : "[M.health]% healthy"]
Scan Breakdown:
Respiratory: [M.getOxyLoss() > 50 ? "" : ""][M.getOxyLoss()]
- Toxicology: [M.toxloss > 50 ? "" : ""][M.toxloss]
+ Toxicology: [M.getToxLoss() > 50 ? "" : ""][M.getToxLoss()]
Burns: [M.fireloss > 50 ? "" : ""][M.fireloss]
Structural Integrity: [M.getBruteLoss() > 50 ? "" : ""][M.getBruteLoss()]
Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 50393ca9948..98fd2d08913 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -35,7 +35,7 @@ weakened = max(min(weakened, 20), 0) sleeping = 0 bruteloss = max(getBruteLoss(), 0) - toxloss = max(toxloss, 0) + toxloss = max(getToxLoss(), 0) oxyloss = max(getOxyLoss(), 0) fireloss = max(fireloss, 0) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index d29d1d57d00..e14594d9e2e 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -391,16 +391,16 @@ var/global/list/uneatable = list( toxmob() var/toxrange = 10 - var/toxloss = 4 + var/toxdamage = 4 // changed the name to toxdamage from toxloss to prevent further conflicts var/radiation = 5 if (src.energy>200) - toxloss = round(((src.energy-150)/50)*4,1) + toxdamage = round(((src.energy-150)/50)*4,1) radiation = round(((src.energy-150)/50)*5,1) for(var/mob/living/M in view(toxrange, src.loc)) if(istype(M,/mob/living/)) M.apply_effect(rand(radiation), IRRADIATE) - toxloss = (toxloss - (toxloss*M.getarmor(null, "rad"))) - M.apply_effect(toxloss, TOX) + toxdamage = (toxdamage - (toxdamage*M.getarmor(null, "rad"))) + M.apply_effect(toxdamage, TOX) return diff --git a/code/unused/pda2/scanners.dm b/code/unused/pda2/scanners.dm index e65753b00f8..198dbc93183 100644 --- a/code/unused/pda2/scanners.dm +++ b/code/unused/pda2/scanners.dm @@ -38,7 +38,7 @@ var/dat = "\blue Analyzing Results for [C]:\n" dat += "\blue \t Overall Status: [C.stat > 1 ? "dead" : "[C.health]% healthy"]\n" - dat += "\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.toxloss > 50 ? "\red" : "\blue"][C.toxloss]-[C.fireloss > 50 ? "\red" : "\blue"][C.fireloss]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]\n" + dat += "\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.fireloss > 50 ? "\red" : "\blue"][C.fireloss]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]\n" dat += "\blue \t Key: Suffocation/Toxin/Burns/Brute\n" dat += "\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)" if(C.virus)