Implemented getToxLoss()

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2528 316c924e-a436-60f5-8080-3fe189b3f50e

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 <b>[mob.name] is attempting to bite off \his tongue. It looks like \he's trying to commit suicide.</b>"
-		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

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

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

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)

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

code/game/gamemodes/events/ninja_equipment.dm

@@ -288,7 +288,7 @@ ________________________________________________________________________________
 			dat += "<h4>Overall Status: [U.stat > 1 ? "dead" : "[U.health]% healthy"]</h4>"
 			dat += "<h4>Nutrition Status: [U.nutrition]</h4>"
 			dat += "Oxygen loss: [U.getOxyLoss()]"
-			dat += " | Toxin levels: [U.toxloss]<br>"
+			dat += " | Toxin levels: [U.getToxLoss()]<br>"
 			dat += "Burn severity: [U.fireloss]"
 			dat += " | Brute trauma: [U.getBruteLoss()]<br>"
 			dat += "Radiation Level: [U.radiation] rad<br>"

code/game/machinery/Sleeper.dm

@@ -63,7 +63,7 @@
 			dat += text("[]\tHealth %: [] ([])</FONT><BR>", (occupant.health > 50 ? "<font color='blue'>" : "<font color='red'>"), occupant.health, t1)
 			dat += text("[]\t-Brute Damage %: []</FONT><BR>", (occupant.getBruteLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getBruteLoss())
 			dat += text("[]\t-Respiratory Damage %: []</FONT><BR>", (occupant.getOxyLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getOxyLoss())
-			dat += text("[]\t-Toxin Content %: []</FONT><BR>", (occupant.toxloss < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.toxloss)
+			dat += text("[]\t-Toxin Content %: []</FONT><BR>", (occupant.getToxLoss() < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.getToxLoss())
 			dat += text("[]\t-Burn Severity %: []</FONT><BR>", (occupant.fireloss < 60 ? "<font color='blue'>" : "<font color='red'>"), occupant.fireloss)
 			dat += text("<HR>Paralysis Summary %: [] ([] seconds left!)<BR>", occupant.paralysis, round(occupant.paralysis / 4))
 			dat += text("Inaprovaline units: [] units<BR>", occupant.reagents.get_reagent_amount("inaprovaline"))
@@ -333,7 +333,7 @@
 			user << text("[]\t -Core Temperature: []&deg;C ([]&deg;F)</FONT><BR>", (src.occupant.bodytemperature > 50 ? "<font color='blue'>" : "<font color='red'>"), 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)

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
 

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 <b>Clone generation process initiated.</b>"
 	src.occupant << "\blue This will take a moment, please hold."

code/game/machinery/computer/Operating.dm

@@ -37,7 +37,7 @@
 <BR>
 <B>Health:</B> [src.victim.health]<BR>
 <B>Brute Damage:</B> [src.victim.getBruteLoss()]<BR>
-<B>Toxins Damage:</B> [src.victim.toxloss]<BR>
+<B>Toxins Damage:</B> [src.victim.getToxLoss()]<BR>
 <B>Fire Damage:</B> [src.victim.fireloss]<BR>
 <B>Suffocation Damage:</B> [src.victim.getOxyLoss()]<BR>
 <B>Patient Status:</B> [src.victim.stat ? "Non-responsive" : "Stable"]<BR>

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)

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)

code/game/machinery/cryo.dm

@@ -90,7 +90,7 @@
 			<B>Current cell temperature:</B> [temp_text]K<BR>
 			<B>Cryo status:</B> [ src.on ? "<A href='?src=\ref[src];start=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];start=1'>On</A>"]<BR>
 			[beaker_text]<BR><BR>
-			<B>Current occupant:</B> [src.occupant ? "<BR>Name: [src.occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(src.occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(src.occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(src.occupant.fireloss,0.1)]<BR>Toxin damage: [round(src.occupant.toxloss,0.1)]<BR>Body temperature: [src.occupant.bodytemperature]" : "<FONT color=red>None</FONT>"]<BR>
+			<B>Current occupant:</B> [src.occupant ? "<BR>Name: [src.occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(src.occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(src.occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(src.occupant.fireloss,0.1)]<BR>Toxin damage: [round(src.occupant.getToxLoss(),0.1)]<BR>Body temperature: [src.occupant.bodytemperature]" : "<FONT color=red>None</FONT>"]<BR>
 
 		"}
 		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)

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)

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]&deg;C ([M.bodytemperature*1.8-459.67]&deg;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)

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 <b>[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.</b>"
-		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 <b>[src]'s brain is growing dull and lifeless. It looks like it's trying to commit suicide. Somehow.</b>"
-		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 <b>[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.</b>"
-		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 <b>[src] is powering down. It looks like \he's trying to commit suicide.</b>"
 		//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 <b>[src] is powering down. It looks like \he's trying to commit suicide.</b>"
 		//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()