From 9f23d871a6f05140306e430e24410b773e66f1be Mon Sep 17 00:00:00 2001
From: forest2001 <ingram.josh@gmail.com>
Date: Mon, 4 Sep 2023 11:35:33 +0100
Subject: [PATCH 1/2] button size

---
 tgui/packages/tgui/interfaces/AresAdmin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tgui/packages/tgui/interfaces/AresAdmin.js b/tgui/packages/tgui/interfaces/AresAdmin.js
index 4d6a6023c623..7328516883ee 100644
--- a/tgui/packages/tgui/interfaces/AresAdmin.js
+++ b/tgui/packages/tgui/interfaces/AresAdmin.js
@@ -353,7 +353,7 @@ const MainMenu = (props, context) => {
           </Stack.Item>
           <Stack.Item>
             <Button
-              content="Access Ticket Management"
+              content="Access Tickets"
               tooltip="View and update access tickets."
               icon="user-tag"
               ml="auto"

From f35b700d609b1a87a4e01b7f5dfe0ca07799e08b Mon Sep 17 00:00:00 2001
From: forest2001 <ingram.josh@gmail.com>
Date: Mon, 4 Sep 2023 11:42:06 +0100
Subject: [PATCH 2/2] fixes the claim button

---
 code/game/machinery/ARES/AdminAres.dm      | 23 ++++++++++++++++++++++
 tgui/packages/tgui/interfaces/AresAdmin.js |  6 ++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/code/game/machinery/ARES/AdminAres.dm b/code/game/machinery/ARES/AdminAres.dm
index ffc3260d14bf..d31821c5b51a 100644
--- a/code/game/machinery/ARES/AdminAres.dm
+++ b/code/game/machinery/ARES/AdminAres.dm
@@ -347,6 +347,29 @@
 			admin_interface.last_menu = admin_interface.current_menu
 			admin_interface.current_menu = "read_deleted"
 
+		if("claim_ticket")
+			var/datum/ares_ticket/ticket = locate(params["ticket"])
+			if(!istype(ticket))
+				return FALSE
+			var/claim = TRUE
+			var/assigned = ticket.ticket_assignee
+			if(assigned)
+				if(assigned == MAIN_AI_SYSTEM)
+					var/prompt = tgui_alert(usr, "You already claimed this ticket! Do you wish to drop your claim?", "Unclaim ticket", list("Yes", "No"))
+					if(prompt != "Yes")
+						return FALSE
+					/// set ticket back to pending
+					ticket.ticket_assignee = null
+					ticket.ticket_status = TICKET_PENDING
+					return claim
+				var/choice = tgui_alert(usr, "This ticket has already been claimed by [assigned]! Do you wish to override their claim?", "Claim Override", list("Yes", "No"))
+				if(choice != "Yes")
+					claim = FALSE
+			if(claim)
+				ticket.ticket_assignee = MAIN_AI_SYSTEM
+				ticket.ticket_status = TICKET_ASSIGNED
+			return claim
+
 		if("auth_access")
 			var/datum/ares_ticket/access/access_ticket = locate(params["ticket"])
 			if(!access_ticket)
diff --git a/tgui/packages/tgui/interfaces/AresAdmin.js b/tgui/packages/tgui/interfaces/AresAdmin.js
index 7328516883ee..d19329094827 100644
--- a/tgui/packages/tgui/interfaces/AresAdmin.js
+++ b/tgui/packages/tgui/interfaces/AresAdmin.js
@@ -1691,13 +1691,11 @@ const AccessManagement = (props, context) => {
         )}
         {access_tickets.map((ticket, i) => {
           let can_claim = 'Yes';
-          if (ticket.assignee === logged_in) {
-            can_claim = 'No';
-          } else if (ticket.lock_status === 'CLOSED') {
+          if (ticket.lock_status === 'CLOSED') {
             can_claim = 'No';
           }
           let can_update = 'Yes';
-          if (ticket.assignee !== logged_in) {
+          if (ticket.assignee !== 'ARES v3.2') {
             can_update = 'No';
           } else if (ticket.lock_status === 'CLOSED') {
             can_update = 'No';