From 8412b2ab490e6a0692a95710d25713ee2447a7ca Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 28 Aug 2020 17:50:30 -0700 Subject: [PATCH] simplify --- code/modules/security_levels/keycard authentication.dm | 7 +++++-- tgui/packages/tgui/interfaces/KeycardAuth.js | 7 +------ tgui/packages/tgui/public/tgui.bundle.js | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm index fb92cf84a3e..2ba3c4b3f19 100644 --- a/code/modules/security_levels/keycard authentication.dm +++ b/code/modules/security_levels/keycard authentication.dm @@ -89,10 +89,13 @@ return data /obj/machinery/keycard_auth/tgui_act(action, params) - if(..() || !allowed(usr)) + if(..()) return if(busy) - to_chat(usr, "This device is busy.") + to_chat(usr, "This device is busy.") + return + if(!allowed(usr)) + to_chat(usr, "Access denied.") return . = TRUE switch(action) diff --git a/tgui/packages/tgui/interfaces/KeycardAuth.js b/tgui/packages/tgui/interfaces/KeycardAuth.js index b755956d96e..70f22aee264 100644 --- a/tgui/packages/tgui/interfaces/KeycardAuth.js +++ b/tgui/packages/tgui/interfaces/KeycardAuth.js @@ -24,7 +24,7 @@ export const KeycardAuth = (props, context) => { label="Red Alert">