Skip to content

Commit

Permalink
attempted conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Aug 18, 2023
1 parent 87bd994 commit d992f96
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
13 changes: 7 additions & 6 deletions code/__DEFINES/ARES.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tgui/packages/tgui/interfaces/WorkingJoe.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}

Expand Down Expand Up @@ -135,7 +135,7 @@ const MainMenu = (props, context) => {
/>
</Stack.Item>
)}
{access_level === 2 && (
{access_level === 3 && (
<Stack.Item>
<Button
content="Surrender Access Ticket"
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit d992f96

Please sign in to comment.