From ee499426ad0bdb26e53db06a4766fb10ec59c5e8 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 21 Aug 2014 12:19:10 +0930 Subject: [PATCH] Compile fixes. --- code/game/objects/items/weapons/shards.dm | 2 +- code/modules/mob/living/carbon/monkey/life.dm | 2 +- code/setup.dm | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 089d731c58c..1eeb6dff8df 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -68,7 +68,7 @@ return return ..() -/obj/item/weapon/shard/HasEntered(AM as mob|obj) +/obj/item/weapon/shard/Crossed(AM as mob|obj) if(ismob(AM)) var/mob/M = AM M << "\red You step on \the [src]!" diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index e5876cab706..ce681063582 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -384,7 +384,7 @@ //Moved these vars here for use in the fuck-it-skip-processing check. var/pressure = environment.return_pressure() - if(pressure < WARNING_HIGH_PRESSURE && pressure > WARNING_LOW_PRESSURE && abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.phoron < MOLES_PHORON_VISIBLE) + if(pressure < WARNING_HIGH_PRESSURE && pressure > WARNING_LOW_PRESSURE && abs(environment.temperature - 293.15) < 20 && abs(bodytemperature - 310.14) < 0.5 && environment.gas["phoron"] < MOLES_PHORON_VISIBLE) //Hopefully should fix the walk-inside-still-pressure-warning issue. diff --git a/code/setup.dm b/code/setup.dm index 16c617ce9ff..361cfaa66cc 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -19,6 +19,7 @@ #define O2STANDARD 0.21 #define N2STANDARD 0.79 +#define MOLES_PHORON_VISIBLE 0.7 //Moles in a standard cell after which phoron is visible #define MOLES_O2STANDARD MOLES_CELLSTANDARD*O2STANDARD // O2 standard value (21%) #define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD // N2 standard value (79%) @@ -834,7 +835,7 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define MAX_SIPHON_FLOWRATE 2500 //L/s This can be used to balance how fast a room is siphoned. Anything higher than CELL_VOLUME has no effect. #define MAX_SCRUBBER_FLOWRATE 200 //L/s Max flow rate when scrubbing from a turf. -//These balance how easy or hard it is to create huge pressure gradients with pumps and filters. Lower values means it takes longer to create large pressures differences. +//These balance how easy or hard it is to create huge pressure gradients with pumps and filters. Lower values means it takes longer to create large pressures differences. //Has no effect on pumping gasses from high pressure to low, only from low to high. Must be between 0 and 1. #define ATMOS_PUMP_EFFICIENCY 0.6 #define ATMOS_FILTER_EFFICIENCY 0.45