cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 13:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continued work in progress on a major revision of the NanoUI templating system.

Browse Source
This commit is contained in:
Mark Aherne
2014-07-11 10:48:42 +01:00
parent 728ba52af0
commit 7e7e6cd8ac
73 changed files with 1367 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
View File

@@ -114,7 +114,7 @@
if(total_purity && fresh_coolant)
coolant_purity = total_purity / fresh_coolant
/obj/machinery/radiocarbon_spectrometer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
/obj/machinery/radiocarbon_spectrometer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(user.stat)
return
@@ -146,7 +146,7 @@
data["rad_shield_on"] = rad_shield
// update the ui if it exists, returns null if no ui is passed/found
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm