Fixed various instances of toxin being named phoron (#333)

* Fixed various instances of toxin being named phoron

These changes intended to reduce confusion, by fixing a few instances of
phoron being referred to as 'toxin', which i believe is a legacy
holdover from some bygone time.

*The biggest and most important change here, is that now when a mob
breathes a gas that's toxic to them, that gas is what's put into their
bloodstream, instead of the generic 'toxin'. This is so that blood tests
can actually be functional to find out what happened to the patient,
instead of only telling that the blood contained 'toxin'
*The toxin strength of phoron has been lowered to 4, so as not to make
people die any faster from phoron poisoning. This strength value only
affects it being injected into the blood, which is never done, or it
being inhaled.
*All references to 'Toxin' in Air Alarm interfaces have been changed to
phoron, they have always meant phoron only.
*In the core cooling computer, the abbreviation of phoron has been
changed from Tx to Ph
This commit is contained in:
NanakoAC
2016-05-31 01:10:13 +03:00
committed by skull132
parent 78c8951030
commit 3df0610edd
6 changed files with 47 additions and 10 deletions
+3 -3
View File
@@ -510,7 +510,7 @@
environment_data[++environment_data.len] = list("name" = "Pressure", "value" = pressure, "unit" = "kPa", "danger_level" = pressure_dangerlevel)
environment_data[++environment_data.len] = list("name" = "Oxygen", "value" = environment.gas["oxygen"] / total * 100, "unit" = "%", "danger_level" = oxygen_dangerlevel)
environment_data[++environment_data.len] = list("name" = "Carbon dioxide", "value" = environment.gas["carbon_dioxide"] / total * 100, "unit" = "%", "danger_level" = co2_dangerlevel)
environment_data[++environment_data.len] = list("name" = "Toxins", "value" = environment.gas["phoron"] / total * 100, "unit" = "%", "danger_level" = phoron_dangerlevel)
environment_data[++environment_data.len] = list("name" = "Phoron", "value" = environment.gas["phoron"] / total * 100, "unit" = "%", "danger_level" = phoron_dangerlevel)
environment_data[++environment_data.len] = list("name" = "Temperature", "value" = environment.temperature, "unit" = "K ([round(environment.temperature - T0C, 0.1)]C)", "danger_level" = temperature_dangerlevel)
data["total_danger"] = danger_level
data["environment"] = environment_data
@@ -556,7 +556,7 @@
scrubbers[scrubbers.len]["filters"] += list(list("name" = "Oxygen", "command" = "o2_scrub", "val" = info["filter_o2"]))
scrubbers[scrubbers.len]["filters"] += list(list("name" = "Nitrogen", "command" = "n2_scrub", "val" = info["filter_n2"]))
scrubbers[scrubbers.len]["filters"] += list(list("name" = "Carbon Dioxide", "command" = "co2_scrub","val" = info["filter_co2"]))
scrubbers[scrubbers.len]["filters"] += list(list("name" = "Toxin" , "command" = "tox_scrub","val" = info["filter_phoron"]))
scrubbers[scrubbers.len]["filters"] += list(list("name" = "Phoron" , "command" = "tox_scrub","val" = info["filter_phoron"]))
scrubbers[scrubbers.len]["filters"] += list(list("name" = "Nitrous Oxide", "command" = "n2o_scrub","val" = info["filter_n2o"]))
data["scrubbers"] = scrubbers
if(AALARM_SCREEN_MODE)
@@ -576,7 +576,7 @@
var/list/gas_names = list(
"oxygen" = "O<sub>2</sub>",
"carbon dioxide" = "CO<sub>2</sub>",
"phoron" = "Toxin",
"phoron" = "Phoron",
"other" = "Other")
for (var/g in gas_names)
thresholds[++thresholds.len] = list("name" = gas_names[g], "settings" = list())
+1 -1
View File
@@ -131,7 +131,7 @@ obj/machinery/computer/general_air_control/Destroy()
if(data["carbon_dioxide"])
sensor_part += "[data["carbon_dioxide"]]% CO2; "
if(data["phoron"])
sensor_part += "[data["phoron"]]% TX; "
sensor_part += "[data["phoron"]]% PH; "
sensor_part += "<HR>"
else
+1 -3
View File
@@ -526,7 +526,7 @@
if(toxins_pp > safe_toxins_max)
var/ratio = (poison/safe_toxins_max) * 10
if(reagents)
reagents.add_reagent("toxin", Clamp(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
reagents.add_reagent(poison_type, Clamp(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE))
breath.adjust_gas(poison_type, -poison/6, update = 0) //update after
phoron_alert = max(phoron_alert, 1)
else
@@ -719,7 +719,6 @@
return
proc/adjust_body_temperature(current, loc_temp, boost)
var/temperature = current
var/difference = abs(current-loc_temp) //get difference
@@ -736,7 +735,6 @@
temperature = max(loc_temp, temperature-change)
temp_change = (temperature - current)
return temp_change
proc/stabilize_body_temperature()
if (species.flags & IS_SYNTHETIC)
@@ -201,7 +201,7 @@
color = "#808080"
/datum/reagent/nitrogen/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_VOX)
if(alien == IS_VOX )
M.adjustOxyLoss(-removed * 3)
/datum/reagent/oxygen
@@ -212,7 +212,7 @@
color = "#808080"
/datum/reagent/oxygen/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_VOX)
if(alien == IS_VOX|| M.get_species() == "Vaurca")
M.adjustToxLoss(removed * 3)
/datum/reagent/phosphorus
@@ -48,7 +48,7 @@
description = "Phoron in its liquid form."
reagent_state = LIQUID
color = "#9D14DB"
strength = 30
strength = 4
/datum/reagent/toxin/phoron/touch_mob(var/mob/living/L, var/amount)
if(istype(L))