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

Merge remote-tracking branch 'upstream/master' into night_shift

Browse Source 
# Conflicts:
#	paradise.dme
This commit is contained in:
tigercat2000
2018-03-30 10:20:21 -07:00
parent affc986684 e4483b123d
commit e71c4279a7
142 changed files with 537 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/NTNet/NTNet_relay.dm
+1 -1
View File
@@ -60,7 +60,7 @@
..()
/obj/machinery/ntnet_relay/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "ntnet_relay.tmpl", "NTNet Quantum Relay", 500, 300)
ui.open()