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

Merge pull request #7299 from Loganbacca/freezefix

Browse Source 
Fixes omni-filters not working
This commit is contained in:
Mloc
2014-12-08 13:17:36 +00:00
parent 499c30f8aa 92c81aa958
commit efe78df3ff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/ATMOSPHERICS/components/omni_devices/mixer.dm
View File

@@ -49,8 +49,6 @@
for(var/datum/omni_port/P in ports) for(var/datum/omni_port/P in ports)
P.air.volume = ATMOS_DEFAULT_VOLUME_MIXER P.air.volume = ATMOS_DEFAULT_VOLUME_MIXER
rebuild_mixing_inputs()
/obj/machinery/atmospherics/omni/mixer/Del() /obj/machinery/atmospherics/omni/mixer/Del()
inputs.Cut() inputs.Cut()
output = null output = null
@@ -77,6 +75,8 @@
if(output) if(output)
output.air.volume = ATMOS_DEFAULT_VOLUME_MIXER * 0.75 * inputs.len output.air.volume = ATMOS_DEFAULT_VOLUME_MIXER * 0.75 * inputs.len
output.concentration = 1 output.concentration = 1
rebuild_mixing_inputs()
/obj/machinery/atmospherics/omni/mixer/proc/mapper_set() /obj/machinery/atmospherics/omni/mixer/proc/mapper_set()
return (tag_north_con || tag_south_con || tag_east_con || tag_west_con) return (tag_north_con || tag_south_con || tag_east_con || tag_west_con)
@@ -108,7 +108,7 @@
var/power_draw = -1 var/power_draw = -1
if (transfer_moles > MINUMUM_MOLES_TO_FILTER) if (transfer_moles > MINUMUM_MOLES_TO_FILTER)
power_draw = mix_gas(src, mixing_inputs, output, transfer_moles, active_power_usage) power_draw = mix_gas(src, mixing_inputs, output.air, transfer_moles, active_power_usage)
if (power_draw < 0) if (power_draw < 0)
//update_use_power(0) //update_use_power(0)