From 167fae9cf470479230c881b0efcf87fb6631581b Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Fri, 30 May 2014 03:05:50 -0700 Subject: [PATCH] Fixed accidental rename during Phoron project --- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/carbon/monkey/life.dm | 2 +- code/setup.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a190f0221c3..18d5137ac7c 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -561,7 +561,7 @@ var/ratio = (poison/safe_toxins_max) * 10 if(reagents) //TODO: Fix Ravensdale's shit, make toxins toxins again instead of phoron. - reagents.add_reagent("phoron", Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) + reagents.add_reagent("phoron", Clamp(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE)) phoron_alert = max(phoron_alert, 1) else phoron_alert = 0 diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 6afcc887645..f94dd17467e 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -364,7 +364,7 @@ var/ratio = (breath.phoron/safe_phoron_max) * 10 //adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) //Limit amount of damage toxin exposure can do per second if(reagents) - reagents.add_reagent("phoron", Clamp(ratio, MIN_PHORON_DAMAGE, MAX_PHORON_DAMAGE)) + reagents.add_reagent("phoron", Clamp(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE)) phoron_alert = max(phoron_alert, 1) else phoron_alert = 0 diff --git a/code/setup.dm b/code/setup.dm index b31ed19205c..de854622ae7 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -17,8 +17,8 @@ #define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD // N2 standard value (79%) #define MOLES_PHORON_VISIBLE 0.7 //Moles in a standard cell after which phoron is visible -#define MIN_PHORON_DAMAGE 1 -#define MAX_PHORON_DAMAGE 10 +#define MIN_TOXIN_DAMAGE 1 //This and MAX_TOXIN are for when a mob breathes poisonous air, apparently. +#define MAX_TOXIN_DAMAGE 10 //This and MIN_TOXIN are for when a mob breathes poisonous air, apparently. #define BREATH_VOLUME 0.5 //liters in a normal breath #define BREATH_MOLES (ONE_ATMOSPHERE * BREATH_VOLUME /(T20C*R_IDEAL_GAS_EQUATION))