cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

NanoUI changes from Faerdan

Browse Source 
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/reagents/Chemistry-Machinery.dm
This commit is contained in:
Rob Nelson
2014-01-20 02:02:31 -05:00
committed by ZomgPonies
parent d31bc9def9
commit 520a2cd401
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cryo.dm
+3 -3
View File
@@ -121,13 +121,13 @@
data["beakerVolume"] += R.volume
// 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)
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
ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 410)
// when the ui is first opened this is the data it will use
ui.set_initial_data(data)
ui.set_initial_data(data)
// open the new ui window
ui.open()
// auto update every Master Controller tick
@@ -260,7 +260,7 @@
return
/obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob)
if (!istype(M))
usr << "\red <B>The cryo cell cannot handle such liveform!</B>"
usr << "\red <B>The cryo cell cannot handle such a lifeform!</B>"
return
if (occupant)
usr << "\red <B>The cryo cell is already occupied!</B>"