From d992f96b1bedfdfedd5afa769cbd228e13485cf0 Mon Sep 17 00:00:00 2001
From: forest2001 <ingram.josh@gmail.com>
Date: Fri, 18 Aug 2023 01:15:30 +0100
Subject: [PATCH] attempted conflict resolution

---
 code/__DEFINES/ARES.dm                      | 13 +++++++------
 tgui/packages/tgui/interfaces/WorkingJoe.js |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm
index ec84a6ab5992..8ad9a124e471 100644
--- a/code/__DEFINES/ARES.dm
+++ b/code/__DEFINES/ARES.dm
@@ -35,12 +35,13 @@
 #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
+#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/tgui/packages/tgui/interfaces/WorkingJoe.js b/tgui/packages/tgui/interfaces/WorkingJoe.js
index 7413e321308a..4cb47c7bcbc1 100644
--- a/tgui/packages/tgui/interfaces/WorkingJoe.js
+++ b/tgui/packages/tgui/interfaces/WorkingJoe.js
@@ -73,7 +73,7 @@ const MainMenu = (props, context) => {
     ticket_console,
   } = data;
   let can_request_access = 'Yes';
-  if (access_level === 2) {
+  if (access_level === 3) {
     can_request_access = 'No';
   }
 
@@ -135,7 +135,7 @@ const MainMenu = (props, context) => {
               />
             </Stack.Item>
           )}
-          {access_level === 2 && (
+          {access_level === 3 && (
             <Stack.Item>
               <Button
                 content="Surrender Access Ticket"
@@ -163,7 +163,7 @@ const MainMenu = (props, context) => {
           </Stack.Item>
         </Stack>
 
-        {access_level >= 3 && (
+        {access_level >= 4 && (
           <Stack>
             <Stack.Item grow>
               <h3>Certified Personnel</h3>
@@ -194,7 +194,7 @@ const MainMenu = (props, context) => {
             </Stack.Item>
           </Stack>
         )}
-        {access_level >= 4 && (
+        {access_level >= 5 && (
           <Stack>
             <Stack.Item grow>
               <h3>Task Management</h3>