From 3df0610edd4bc8a8d637e8650a687e6e0418ad26 Mon Sep 17 00:00:00 2001 From: NanakoAC Date: Mon, 30 May 2016 23:10:13 +0100 Subject: [PATCH] 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 --- Nanako-PR-333.yml | 39 +++++++++++++++++++ code/game/machinery/alarm.dm | 6 +-- code/game/machinery/atmo_control.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 4 +- .../Chemistry-Reagents-Dispenser.dm | 4 +- .../Chemistry-Reagents-Toxins.dm | 2 +- 6 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 Nanako-PR-333.yml diff --git a/Nanako-PR-333.yml b/Nanako-PR-333.yml new file mode 100644 index 00000000000..3598454bb96 --- /dev/null +++ b/Nanako-PR-333.yml @@ -0,0 +1,39 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Nanako + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Mobs breathing a poisonous gas now get that chemical added to their bloodstream, instead of generic 'toxin'." + - tweak: "Air alarms now properly say phoron instead of toxin" + - tweak: "Engine cooling computers now identify phoron as Ph instead of Tx" + diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 57f5f9eeef7..dd6d05e82e7 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -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" = "O2", "carbon dioxide" = "CO2", - "phoron" = "Toxin", + "phoron" = "Phoron", "other" = "Other") for (var/g in gas_names) thresholds[++thresholds.len] = list("name" = gas_names[g], "settings" = list()) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 09e55720a83..c28ab5966b9 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -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 += "
" else diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 26963486d3e..19e13fe4306 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -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) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm index 783fb26ae92..1f22c3418c2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm @@ -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 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 83cfacbb020..201436a37c9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -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))