cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Large merge resultion. Used remote for map conflicts.

Browse Source
This commit is contained in:
Zuhayr
2014-09-23 21:41:54 +09:30
parent c529e014a7 29c29cd408
commit 0c83a95b90
164 changed files with 8010 additions and 7210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+1 -1
View File
@@ -129,7 +129,7 @@
var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
//limit flow rate from turfs
transfer_moles = min(transfer_moles, environment.total_moles*MAX_SIPHON_FLOWRATE/environment.volume) //group_multiplier gets divided out here
transfer_moles = min(transfer_moles, environment.total_moles*air2.volume/environment.volume) //group_multiplier gets divided out here
power_draw = pump_gas(src, environment, air2, transfer_moles, active_power_usage)
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+1 -1
View File
@@ -63,7 +63,7 @@
pressure_delta = target_pressure - output_starting_pressure
var/flowing_old = flowing
if((REGULATE_NONE || pressure_delta > 0.01) && (air1.temperature > 0 || air2.temperature > 0)) //since it's basically a valve, it makes sense to check both temperatures
if((regulate_mode == REGULATE_NONE || pressure_delta > 0.01) && (air1.temperature > 0 || air2.temperature > 0)) //since it's basically a valve, it makes sense to check both temperatures
flowing = 1
//flow rate limit