cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +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/security_levels/keycard authentication.dm
+2 -2
View File
@@ -70,7 +70,7 @@
user.set_machine(src)
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, "keycard_auth.tmpl", "Keycard Authentication Device UI", 540, 320)
ui.open()
@@ -98,7 +98,7 @@
if(href_list["ert"])
ert_reason = input(usr, "Reason for ERT Call:", "", "")
nanomanager.update_uis(src)
SSnanoui.update_uis(src)
add_fingerprint(usr)
return