shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3398 from Citadel-Station-13/upstream-merge-31688

Browse Source 
[MIRROR] fixes filter NaN issue
This commit is contained in:
LetterJay
2017-10-15 10:21:46 -04:00
committed by GitHub
parent 0a43141b87 bad7db64c0
commit 8f97e8c65f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+7 -2
View File
@@ -128,10 +128,15 @@
data["on"] = on
data["pressure"] = round(target_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
if(filter_type)
data["filter_type"] = GLOB.meta_gas_info[filter_type][META_GAS_ID] //ui code is garbage and this is needed for it to work grr
if(filter_type) //ui code is garbage and this is needed for it to work grr
if(ispath(filter_type)) //we need to send the gas ID. if it's a path, get it from the metainfo list...
data["filter_type"] = GLOB.meta_gas_info[filter_type][META_GAS_ID]
else //...otherwise, it's already in the form we need.
data["filter_type"] = filter_type
else
data["filter_type"] = "none"
return data
/obj/machinery/atmospherics/components/trinary/filter/ui_act(action, params)