cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/machinery/vending.dm
This commit is contained in:
PsiOmega
2015-04-10 15:25:34 +02:00
parent 05da117d10 4c44482dfc
commit 1ba8dcbca9
12 changed files with 1093 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/port_gen.dm
+1
View File
@@ -342,6 +342,7 @@
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "pacman.tmpl", src.name, 500, 560)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)