cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes.

Browse Source
This commit is contained in:
Zuhayr
2014-08-21 12:19:10 +09:30
parent b47d91b612
commit ee499426ad
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/weapons/shards.dm
View File

@@ -68,7 +68,7 @@
return return
return ..() return ..()
/obj/item/weapon/shard/HasEntered(AM as mob|obj) /obj/item/weapon/shard/Crossed(AM as mob|obj)
if(ismob(AM)) if(ismob(AM))
var/mob/M = AM var/mob/M = AM
M << "\red <B>You step on \the [src]!</B>" M << "\red <B>You step on \the [src]!</B>"

2
code/modules/mob/living/carbon/monkey/life.dm
View File

@@ -384,7 +384,7 @@
//Moved these vars here for use in the fuck-it-skip-processing check. //Moved these vars here for use in the fuck-it-skip-processing check.
var/pressure = environment.return_pressure() 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. //Hopefully should fix the walk-inside-still-pressure-warning issue.

3
code/setup.dm
View File

@@ -19,6 +19,7 @@
#define O2STANDARD 0.21 #define O2STANDARD 0.21
#define N2STANDARD 0.79 #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_O2STANDARD MOLES_CELLSTANDARD*O2STANDARD // O2 standard value (21%)
#define MOLES_N2STANDARD MOLES_CELLSTANDARD*N2STANDARD // N2 standard value (79%) #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_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. #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. //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_PUMP_EFFICIENCY 0.6
#define ATMOS_FILTER_EFFICIENCY 0.45 #define ATMOS_FILTER_EFFICIENCY 0.45