cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6537 from mwerezak/flow-rate-meter

Browse Source 
Fixes pressure regulator flow rate reporting
This commit is contained in:
Chinsky
2014-09-28 21:21:26 +04:00
parent 302d854514 5dae1fb667
commit 104eb426d5
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
View File

@@ -62,7 +62,8 @@
if (REGULATE_OUTPUT) if (REGULATE_OUTPUT)
pressure_delta = target_pressure - output_starting_pressure pressure_delta = target_pressure - output_starting_pressure
var/flowing_old = flowing //-1 if pump_gas() did not move any gas, >= 0 otherwise
var/returnval = -1
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 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 flowing = 1
@@ -82,20 +83,22 @@
transfer_moles = min(transfer_moles, pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)) transfer_moles = min(transfer_moles, pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION))
//pump_gas() will return a negative number if no flow occurred //pump_gas() will return a negative number if no flow occurred
var/flow = pump_gas(src, air1, air2, transfer_moles, available_power=0) //available_power=0 means we only move gas if it would flow naturally returnval = pump_gas(src, air1, air2, transfer_moles, available_power=0) //available_power=0 means we only move gas if it would flow naturally
if (flow >= 0) if (returnval < 0)
if(network1)
network1.update = 1
if(network2)
network2.update = 1
else
flowing = 0 flowing = 0
last_flow_rate = 0 last_flow_rate = 0
else
if(network1)
network1.update = 1
if(network2)
network2.update = 1
if (!last_flow_rate)
flowing = 0
if (flowing != flowing_old) update_icon()
update_icon()
//Radio remote control //Radio remote control