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

Adds gas mixing proc and updates gas mixer

Browse Source 
Also includes a whole bunch of fixes and updates for atmos machinery
This commit is contained in:
mwerezak
2014-08-02 17:43:08 -04:00
parent d034511ee6
commit 3647fa4d7d
13 changed files with 244 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -154,7 +154,7 @@
if(pressure_delta > 0.5)
if(pump_direction) //internal -> external
var/output_volume = environment.volume * environment.group_multiplier
var/air_temperature = environment.temperature? environment.volume : air_contents.temperature
var/air_temperature = environment.temperature? environment.temperature : air_contents.temperature
var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
power_draw = pump_gas(air_contents, environment, transfer_moles, active_power_usage)
@@ -176,12 +176,8 @@
last_flow_rate = 0
//update_use_power(0)
use_power = 0 //don't force update - easier on CPU
if (power_draw > 0)
handle_power_draw(power_draw)
last_power_draw = power_draw
else
handle_power_draw(idle_power_usage)
last_power_draw = idle_power_usage
last_power_draw = handle_power_draw(power_draw)
return 1
@@ -367,6 +363,7 @@
/obj/machinery/atmospherics/unary/vent_pump/examine()
set src in oview(1)
..()
usr << "A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W"
if(welded)
usr << "It seems welded shut."

10
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -138,12 +138,9 @@
if (power_draw < 0)
//update_use_power(0)
use_power = 0 //don't force update. Sure, we will continue to use power even though we're not pumping anything, but it is easier on the CPU
else if (power_draw > 0)
else
//last_power_draw = power_draw
handle_power_draw(power_draw)
else
//last_power_draw = idle_power_usage
handle_power_draw(idle_power_usage)
if(network)
network.update = 1
@@ -250,6 +247,11 @@
new /obj/item/pipe(loc, make_from=src)
del(src)
/obj/machinery/atmospherics/unary/vent_scrubber/examine()
set src in oview(1)
..()
usr << "A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s"
/obj/machinery/atmospherics/unary/vent_scrubber/Del()
if(initial_loc)
initial_loc.air_scrub_info -= id_tag