cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed accidental rename during Phoron project

Browse Source
This commit is contained in:
Ravensdale
2014-05-30 03:05:50 -07:00
parent de829f4995
commit 167fae9cf4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/monkey/life.dm
+1 -1
View File
@@ -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
code/setup.dm
+2 -2
View File
@@ -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))