From 2b13e6507332e91673e3224b925c9b428723f7e4 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 28 Aug 2023 23:49:48 +0100 Subject: [PATCH 1/2] fixes missing level defines x --- code/__DEFINES/ARES.dm | 15 ++++++++------- code/game/machinery/ARES/ARES_procs.dm | 14 ++++++++------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm index c391d9fb3861..405070218741 100644 --- a/code/__DEFINES/ARES.dm +++ b/code/__DEFINES/ARES.dm @@ -34,13 +34,14 @@ /// Logged in the security updates #define ARES_LOG_SECURITY 2 -/// Access levels specifically for Working Joe management console -#define APOLLO_ACCESS_REQUEST 0 -#define APOLLO_ACCESS_REPORTER 1 -#define APOLLO_ACCESS_TEMP 2 -#define APOLLO_ACCESS_AUTHED 3 -#define APOLLO_ACCESS_JOE 4 -#define APOLLO_ACCESS_DEBUG 5 +// Access levels specifically for Working Joe management console +#define APOLLO_ACCESS_LOGOUT 0 +#define APOLLO_ACCESS_REQUEST 1 +#define APOLLO_ACCESS_REPORTER 2 +#define APOLLO_ACCESS_TEMP 3 +#define APOLLO_ACCESS_AUTHED 4 +#define APOLLO_ACCESS_JOE 5 +#define APOLLO_ACCESS_DEBUG 6 /// Ticket statuses, both for Access and Maintenance /// Pending assignment/rejection diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 45c98171665f..3224332f35be 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -622,17 +622,19 @@ GLOBAL_LIST_INIT(maintenance_categories, list( /obj/structure/machinery/computer/working_joe/ares_auth_to_text(access_level) switch(access_level) - if(APOLLO_ACCESS_REQUEST)//0 + if(APOLLO_ACCESS_LOGOUT)//0 + return "Logged Out" + if(APOLLO_ACCESS_REQUEST)//1 return "Unauthorized Personnel" - if(APOLLO_ACCESS_REPORTER)//1 + if(APOLLO_ACCESS_REPORTER)//2 return "Validated Incident Reporter" - if(APOLLO_ACCESS_TEMP)//2 + if(APOLLO_ACCESS_TEMP)//3 return "Authorized Visitor" - if(APOLLO_ACCESS_AUTHED)//3 + if(APOLLO_ACCESS_AUTHED)//4 return "Certified Personnel" - if(APOLLO_ACCESS_JOE)//4 + if(APOLLO_ACCESS_JOE)//5 return "Working Joe" - if(APOLLO_ACCESS_DEBUG)//5 + if(APOLLO_ACCESS_DEBUG)//6 return "AI Service Technician" // ------ Maintenance Controller UI ------ // From 71d86d60590a12b90770d7b34f18df01f831ed87 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 30 Aug 2023 22:20:19 +0100 Subject: [PATCH 2/2] Fixes 4289 --- tgui/packages/tgui/interfaces/WorkingJoe.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tgui/packages/tgui/interfaces/WorkingJoe.js b/tgui/packages/tgui/interfaces/WorkingJoe.js index 5f82721647ee..6881d731db1b 100644 --- a/tgui/packages/tgui/interfaces/WorkingJoe.js +++ b/tgui/packages/tgui/interfaces/WorkingJoe.js @@ -637,8 +637,14 @@ const MaintManagement = (props, context) => { }; const AccessRequests = (props, context) => { const { data, act } = useBackend(context); - const { logged_in, access_text, last_page, current_menu, access_tickets } = - data; + const { + logged_in, + access_text, + access_level, + last_page, + current_menu, + access_tickets, + } = data; return ( <>