From 11e1bd2f5def194f71dea0dffaf8232ddc1658bb Mon Sep 17 00:00:00 2001
From: Birdtalon <birdtalon@gmail.com>
Date: Thu, 26 Oct 2017 21:32:49 +0100
Subject: [PATCH] requested changes

---
 code/modules/admin/tickets/admintickets.dm   | 22 +++++++++++---------
 code/modules/admin/tickets/adminticketsUI.dm | 15 +++++++------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/code/modules/admin/tickets/admintickets.dm b/code/modules/admin/tickets/admintickets.dm
index 7f59b5f7ec5..5ef1f58dbf5 100644
--- a/code/modules/admin/tickets/admintickets.dm
+++ b/code/modules/admin/tickets/admintickets.dm
@@ -69,25 +69,25 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke
 	to_chat(C, "<span class='adminticket'>You have opened admin ticket number #[(globAdminTicketHolder.getTicketCounter() - 1)]! Please be patient and we will help you soon!</span>")
 
 	//Begin the stale count for this ticket.
-	spawn()
-	T.beginStaleCount()
+	spawn(0)
+		T.beginStaleCount()
 
 //Set ticket state with key N to open
-/datum/adminTicketHolder/proc/openTicket(var/N as num)
+/datum/adminTicketHolder/proc/openTicket(var/N)
 	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
 	if(T.ticketState != ADMIN_TICKET_OPEN)
 		T.ticketState = ADMIN_TICKET_OPEN
 		return TRUE
 
 //Set ticket state with key N to resolved
-/datum/adminTicketHolder/proc/resolveTicket(var/N as num)
+/datum/adminTicketHolder/proc/resolveTicket(var/N)
 	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
 	if(T.ticketState != ADMIN_TICKET_RESOLVED)
 		T.ticketState = ADMIN_TICKET_RESOLVED
 		return TRUE
 
 //Set ticket state with key N to closed
-/datum/adminTicketHolder/proc/closeTicket(var/N as num)
+/datum/adminTicketHolder/proc/closeTicket(var/N)
 	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
 	if(T.ticketState != ADMIN_TICKET_CLOSED)
 		T.ticketState = ADMIN_TICKET_CLOSED
@@ -111,11 +111,11 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke
 	return FALSE
 
 //return the client of a ticket number
-/datum/adminTicketHolder/proc/returnClient(var/N as num)
+/datum/adminTicketHolder/proc/returnClient(var/N)
 	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
 	return T.clientName
 
-/datum/adminTicketHolder/proc/assignAdminToTicket(var/client/C, var/N as num)
+/datum/adminTicketHolder/proc/assignAdminToTicket(var/client/C, var/N)
 	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
 	T.assignAdmin(C)
 	return TRUE
@@ -139,9 +139,11 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke
 
 //Ticker called when a ticket is created, checks for stale-ness.
 /datum/admin_ticket/proc/beginStaleCount()
-	if(!src)
-		return
 	while(world.time < timeUntilStale || !lastAdminResponse || !adminAssigned) // While within the stale period OR no admin responded OR no admin assigned.
+
+		if(!src)
+			return
+
 		sleep(200) // Check every 20 seconds.
 		if(ticketState == ADMIN_TICKET_OPEN && world.time > timeUntilStale)
 			message_adminTicket("<span class='adminticket'>Ticket #[ticketNum] has been open for [ADMIN_TICKET_TIMEOUT * 0.1] seconds. Changing status to stale.</span>")
@@ -170,7 +172,7 @@ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicke
 			return "<font color='orange'>STALE</font>"
 
 //Assign the client passed to var/adminAsssigned
-/datum/admin_ticket/proc/assignAdmin(var/client/C, var/N as num)
+/datum/admin_ticket/proc/assignAdmin(var/client/C, var/N)
 	if(!C)
 		return
 	adminAssigned = C
diff --git a/code/modules/admin/tickets/adminticketsUI.dm b/code/modules/admin/tickets/adminticketsUI.dm
index 570a97469e7..750fa13e6cb 100644
--- a/code/modules/admin/tickets/adminticketsUI.dm
+++ b/code/modules/admin/tickets/adminticketsUI.dm
@@ -44,14 +44,14 @@
 
 	return dat
 
-/datum/adminTicketHolder/proc/showUI(var/client/C, var/tab)
+/datum/adminTicketHolder/proc/showUI(var/client/user, var/tab)
 	var/dat = null
 	dat = returnUI(tab)
-	var/datum/browser/popup = new(usr, "admintickets", "Admin Tickets", 1400, 600)
+	var/datum/browser/popup = new(user, "admintickets", "Admin Tickets", 1400, 600)
 	popup.set_content(dat)
 	popup.open()
 
-/datum/adminTicketHolder/proc/showDetailUI(var/client/C, var/ticketID)
+/datum/adminTicketHolder/proc/showDetailUI(var/client/user, var/ticketID)
 	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[ticketID]
 	var/status = "[T.state2text()]"
 
@@ -87,15 +87,14 @@
 
 	dat += "<a href='?src=[UID()];detailclose=[T.ticketNum]'>Close Ticket</a>"
 
-	var/datum/browser/popup = new(usr, "adminticketsdetail", "Admin Ticket #[T.ticketNum]", 1000, 600)
+	var/datum/browser/popup = new(user, "adminticketsdetail", "Admin Ticket #[T.ticketNum]", 1000, 600)
 	popup.set_content(dat)
 	popup.open()
 
-/datum/adminTicketHolder/proc/userDetailUI(var/client/C)
+/datum/adminTicketHolder/proc/userDetailUI(var/client/user)
 //dat
-	var/tickets = checkForTicket(C)
+	var/tickets = checkForTicket(user)
 	var/dat
-//	tickets = checkForTicket(C)
 	dat += "<h1>Your open tickets</h1>"
 	dat += "<table>"
 	for(var/datum/admin_ticket/T in tickets)
@@ -104,7 +103,7 @@
 			dat += "<tr><td>[T.content[i]]</td></tr>"
 	dat += "</table>"
 
-	var/datum/browser/popup = new(usr, "userticketsdetail", "Tickets", 1000, 600)
+	var/datum/browser/popup = new(user, "userticketsdetail", "Tickets", 1000, 600)
 	popup.set_content(dat)
 	popup.open()