Merge branch 'master' into ERT-changes

code/modules/admin/admin_verbs.dm

@@ -170,7 +170,6 @@ var/list/admin_verbs_debug = list(
 	/client/proc/admin_serialize,
 	/client/proc/jump_to_ruin,
 	/client/proc/toggle_medal_disable,
-	/client/proc/startadmintickets,
 	)
 var/list/admin_verbs_possess = list(
 	/proc/possess,

code/modules/admin/player_panel.dm

@@ -407,11 +407,11 @@
 		dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"
 		dat += "Round Duration: <B>[round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)]:[add_zero(num2text(ROUND_TIME / 10 % 60), 2)]</B><BR>"
 		dat += "<B>Emergency shuttle</B><BR>"
-		if(shuttle_master.emergency.mode < SHUTTLE_CALL)
+		if(SSshuttle.emergency.mode < SHUTTLE_CALL)
 			dat += "<a href='?src=[UID()];call_shuttle=1'>Call Shuttle</a><br>"
 		else
-			var/timeleft = shuttle_master.emergency.timeLeft()
-			if(shuttle_master.emergency.mode < SHUTTLE_DOCKED)
+			var/timeleft = SSshuttle.emergency.timeLeft()
+			if(SSshuttle.emergency.mode < SHUTTLE_DOCKED)
 				dat += "ETA: <a href='?_src_=holder;edit_shuttle_time=1'>[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]</a><BR>"
 				dat += "<a href='?_src_=holder;call_shuttle=2'>Send Back</a><br>"
 			else

code/modules/admin/tickets/admintickets.dm

@@ -1,185 +0,0 @@
-/*
-Admin ticket system by Birdtalon
-*/
-//Global holder
-
-var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
-
-//Defines
-//Deciseconds until ticket becomes stale if unanswered. Alerts admins.
-#define ADMIN_TICKET_TIMEOUT 6000 // 10 minutes
-//Decisecions before the user is allowed to open another ticket while their existing one is open.
-#define ADMIN_TICKET_DUPLICATE_COOLDOWN 3000 // 5 minutes
-
-//Status defines
-#define ADMIN_TICKET_OPEN       1
-#define ADMIN_TICKET_CLOSED     2
-#define ADMIN_TICKET_RESOLVED   3
-#define ADMIN_TICKET_STALE      4
-
-//Datum holding all tickets
-/datum/adminTicketHolder
-	var/ticketCounter = 1 // Counts the tickets and used to assign the id number
-	var/list/allTickets = list()
-
-//Return the current ticket number ready to be called off.
-/datum/adminTicketHolder/proc/getTicketCounter()
-	return ticketCounter
-
-//Return the ticket counter and increment
-/datum/adminTicketHolder/proc/getTicketCounterAndInc()
-	. = ticketCounter
-	ticketCounter++
-	return
-
-/datum/adminTicketHolder/proc/resolveAllOpenTickets() // Resolve all open tickets
-	for(var/i in allTickets)
-		var/datum/admin_ticket/T = i
-		resolveTicket(T.ticketNum)
-
-//Open a new ticket and populate details then add to the list of open tickets
-/datum/adminTicketHolder/proc/newTicket(var/client/C, var/passedContent, var/title)
-	if(!C || !passedContent)
-		return
-
-  //Check if the user has an open ticket already within the cooldown period, if so we don't create a new one and re-set the cooldown period
-	var/datum/admin_ticket/existingTicket = checkForOpenTicket(C)
-	if(existingTicket)
-		existingTicket.setCooldownPeriod()
-		to_chat(C, "<span class='adminticket'>Your ticket #[existingTicket.ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.</span>")
-		return
-
-	if(!title)
-		title = passedContent
-
-	var/datum/admin_ticket/T =  new /datum/admin_ticket
-	T.clientName = C
-	T.timeOpened = worldtime2text()
-	T.title = title
-	T.content += passedContent
-	T.locationSent = C.mob.loc.loc.name
-	T.mobControlled = C.mob
-	T.ticketState = ADMIN_TICKET_OPEN
-	T.timeUntilStale = world.time + ADMIN_TICKET_TIMEOUT
-	T.setCooldownPeriod()
-	T.ticketNum = getTicketCounterAndInc()
-	allTickets += T
-
-	//Inform the user that they have opened a ticket
-	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(0)
-		T.beginStaleCount()
-
-//Set ticket state with key N to open
-/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)
-	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)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
-	if(T.ticketState != ADMIN_TICKET_CLOSED)
-		T.ticketState = ADMIN_TICKET_CLOSED
-		return TRUE
-
-//Check if the user already has a ticket open and within the cooldown period.
-/datum/adminTicketHolder/proc/checkForOpenTicket(var/client/C)
-	for(var/datum/admin_ticket/T in allTickets)
-		if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN && (T.ticketCooldown > world.time))
-			return T
-	return FALSE
-
-//Check if the user has ANY ticket not resolved or closed.
-/datum/adminTicketHolder/proc/checkForTicket(var/client/C)
-	var/list/tickets = list()
-	for(var/datum/admin_ticket/T in allTickets)
-		if(T.clientName == C && (T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE))
-			tickets += T
-	if(tickets.len)
-		return tickets
-	return FALSE
-
-//return the client of a ticket number
-/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)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
-	T.assignAdmin(C)
-	return TRUE
-
-//Single admin ticket
-
-/datum/admin_ticket
-	var/ticketNum // Ticket number
-	var/clientName // Client which opened the ticket
-	var/timeOpened // Time the ticket was opened
-	var/title //The initial message with links
-	var/list/content = list() // content of the admin help
-	var/lastAdminResponse // Last admin who responded
-	var/lastResponseTime // When the admin last responded
-	var/locationSent // Location the player was when they send the ticket
-	var/mobControlled // Mob they were controlling
-	var/ticketState // State of the ticket, open, closed, resolved etc
-	var/timeUntilStale // When the ticket goes stale
-	var/ticketCooldown // Cooldown before allowing the user to open another ticket.
-	var/adminAssigned // Admin who has assigned themselves to this ticket
-
-//Ticker called when a ticket is created, checks for stale-ness.
-/datum/admin_ticket/proc/beginStaleCount()
-	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>")
-			ticketState = ADMIN_TICKET_STALE
-			break
-
-//Set the cooldown period for the ticket. The time when it's created plus the defined cooldown time.
-/datum/admin_ticket/proc/setCooldownPeriod()
-	ticketCooldown = world.time + ADMIN_TICKET_DUPLICATE_COOLDOWN
-
-//Set the last admin who responded as the client passed as an arguement.
-/datum/admin_ticket/proc/setLastAdminResponse(var/client/C)
-	lastAdminResponse = C
-	lastResponseTime = worldtime2text()
-
-//Return the ticket state as a colour coded text string.
-/datum/admin_ticket/proc/state2text()
-	switch(ticketState)
-		if(ADMIN_TICKET_OPEN)
-			return "<font color='green'>OPEN</font>"
-		if(ADMIN_TICKET_RESOLVED)
-			return "<font color='blue'>RESOLVED</font>"
-		if(ADMIN_TICKET_CLOSED)
-			return "<font color='red'>CLOSED</font>"
-		if(ADMIN_TICKET_STALE)
-			return "<font color='orange'>STALE</font>"
-
-//Assign the client passed to var/adminAsssigned
-/datum/admin_ticket/proc/assignAdmin(var/client/C, var/N)
-	if(!C)
-		return
-	adminAssigned = C
-	return TRUE
-
-/datum/admin_ticket/proc/addResponse(var/client/C, var/M as text)
-	if(C.holder)
-		setLastAdminResponse(C)
-	M = "[C]: [M]"
-	content += M

code/modules/admin/tickets/adminticketsUI.dm

@@ -1,172 +0,0 @@
-/datum/adminTicketHolder/proc/returnUI(var/tab = ADMIN_TICKET_OPEN)
-	set name = "Open Ticket Interface"
-	set category = "Tickets"
-
-//dat
-	var/trStyle = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;"
-	var/tdStyleleft = "border-top:2px solid; border-bottom:2px solid; width:150px; text-align:center;"
-	var/tdStyle = "border-top:2px solid; border-bottom:2px solid;"
-	var/datum/admin_ticket/ticket
-	var/dat
-	dat += "<head><style>.adminticket{border:2px solid}</style></head>"
-	dat += "<body><h1>Admin Tickets</h1>"
-
-	dat +="<a href='?src=[UID()];refresh=1'>Refresh</a><br /><a href='?src=[UID()];showopen=1'>Open Tickets</a><a href='?src=[UID()];showresolved=1'>Resolved Tickets</a><a href='?src=[UID()];showclosed=1'>Closed Tickets</a>"
-	if(tab == ADMIN_TICKET_OPEN)
-		dat += "<h2>Open Tickets</h2>"
-	dat += "<table style='width:1300px; border: 3px solid;'>"
-	dat +="<tr style='[trStyle]'><th style='[tdStyleleft]'>Control</th><th style='[tdStyle]'>Ticket</th></tr>"
-	if(tab == ADMIN_TICKET_OPEN)
-		for(var/T in allTickets)
-			ticket = T
-			if(ticket.ticketState == ADMIN_TICKET_OPEN || ticket.ticketState == ADMIN_TICKET_STALE)
-				dat += "<tr style='[trStyle]'><td style ='[tdStyleleft]'><a href='?src=[UID()];resolve=[ticket.ticketNum]'>Resolve</a><a href='?src=[UID()];details=[ticket.ticketNum]'>Details</a> <br /> #[ticket.ticketNum] ([ticket.timeOpened]) [ticket.ticketState == ADMIN_TICKET_STALE ? "<font color='red'><b>STALE</font>" : ""] </td><td style='[tdStyle]'><b>[ticket.title]</td></tr>"
-			else
-				continue
-	else  if(tab == ADMIN_TICKET_RESOLVED)
-		dat += "<h2>Resolved Tickets</h2>"
-		for(var/T in allTickets)
-			ticket = T
-			if(ticket.ticketState == ADMIN_TICKET_RESOLVED)
-				dat += "<tr style='[trStyle]'><td style ='[tdStyleleft]'><a href='?src=[UID()];resolve=[ticket.ticketNum]'>Resolve</a><a href='?src=[UID()];details=[ticket.ticketNum]'>Details</a> <br /> #[ticket.ticketNum] ([ticket.timeOpened]) </td><td style='[tdStyle]'><b>[ticket.title]</td></tr>"
-			else
-				continue
-	else if(tab == ADMIN_TICKET_CLOSED)
-		dat += "<h2>Closed Tickets</h2>"
-		for(var/T in allTickets)
-			ticket = T
-			if(ticket.ticketState == ADMIN_TICKET_CLOSED)
-				dat += "<tr style='[trStyle]'><td style ='[tdStyleleft]'><a href='?src=[UID()];resolve=[ticket.ticketNum]'>Resolve</a><a href='?src=[UID()];details=[ticket.ticketNum]'>Details</a> <br /> #[ticket.ticketNum] ([ticket.timeOpened]) </td><td style='[tdStyle]'><b>[ticket.title]</td></tr>"
-			else
-				continue
-
-	dat += "</table></body>"
-
-	return dat
-
-/datum/adminTicketHolder/proc/showUI(mob/user, var/tab)
-	var/dat = null
-	dat = returnUI(tab)
-	var/datum/browser/popup = new(user, "admintickets", "Admin Tickets", 1400, 600)
-	popup.set_content(dat)
-	popup.open()
-
-/datum/adminTicketHolder/proc/showDetailUI(mob/user, var/ticketID)
-	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[ticketID]
-	var/status = "[T.state2text()]"
-
-	var/dat = "<h1>Admin Tickets</h1>"
-
-	dat +="<a href='?src=[UID()];refresh=1'>Show All</a><a href='?src=[UID()];refreshdetail=[T.ticketNum]'>Refresh</a>"
-
-	dat += "<h2>Ticket #[T.ticketNum]</h2>"
-
-	dat += "<h3>[T.clientName] / [T.mobControlled] opened this ticket at [T.timeOpened] at location [T.locationSent]</h3>"
-	dat += "<h4>Ticket Status: <font color='red'>[status]</font>"
-	dat += "<table style='width:950px; border: 3px solid;'>"
-	dat += "<tr><td>[T.title]</td></tr>"
-
-	if(T.content.len > 1)
-		for(var/i = 2, i <= T.content.len, i++)
-			dat += "<tr><td>[T.content[i]]</td></tr>"
-
-	dat += "</table><br /><br />"
-	dat += "<a href='?src=[UID()];detailreopen=[T.ticketNum]'>Re-Open</a><a href='?src=[UID()];detailresolve=[T.ticketNum]'>Resolve</a><br /><br />"
-
-	if(!T.adminAssigned)
-		dat += "No admin assigned to this ticket - <a href='?src=[UID()];assignadmin=[T.ticketNum]'>Take Ticket</a><br />"
-	else
-		dat += "[T.adminAssigned] is assigned to this Ticket. - <a href='?src=[UID()];assignadmin=[T.ticketNum]'>Take Ticket</a><br />"
-
-	if(T.lastAdminResponse)
-		dat += "<b>Last Admin Response:</b> [T.lastAdminResponse] at [T.lastResponseTime]"
-	else
-		dat +="<font color='red'>No Admin Response</font>"
-
-	dat += "<br /><br />"
-
-	dat += "<a href='?src=[UID()];detailclose=[T.ticketNum]'>Close Ticket</a>"
-
-	var/datum/browser/popup = new(user, "adminticketsdetail", "Admin Ticket #[T.ticketNum]", 1000, 600)
-	popup.set_content(dat)
-	popup.open()
-
-/datum/adminTicketHolder/proc/userDetailUI(mob/user)
-//dat
-	var/tickets = checkForTicket(user.client)
-	var/dat
-	dat += "<h1>Your open tickets</h1>"
-	dat += "<table>"
-	for(var/datum/admin_ticket/T in tickets)
-		dat += "<tr><td><h2>Ticket #[T.ticketNum]</h2></td></tr>"
-		for(var/i = 1, i <= T.content.len, i++)
-			dat += "<tr><td>[T.content[i]]</td></tr>"
-	dat += "</table>"
-
-	var/datum/browser/popup = new(user, "userticketsdetail", "Tickets", 1000, 600)
-	popup.set_content(dat)
-	popup.open()
-
-/datum/adminTicketHolder/Topic(href, href_list)
-
-	if(href_list["refresh"])
-		showUI(usr)
-		return
-
-	if(href_list["refreshdetail"])
-		var/indexNum = text2num(href_list["refreshdetail"])
-		showDetailUI(usr, indexNum)
-		return
-
-	if(href_list["showopen"])
-		showUI(usr, ADMIN_TICKET_OPEN)
-		return
-	if(href_list["showresolved"])
-		showUI(usr, ADMIN_TICKET_RESOLVED)
-		return
-	if(href_list["showclosed"])
-		showUI(usr, ADMIN_TICKET_CLOSED)
-		return
-
-	if(href_list["details"])
-		var/indexNum = text2num(href_list["details"])
-		showDetailUI(usr, indexNum)
-		return
-
-	if(href_list["resolve"])
-		var/indexNum = text2num(href_list["resolve"])
-		if(globAdminTicketHolder.resolveTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your admin ticket has now been resolved.</span>")
-			showUI(usr)
-
-	if(href_list["detailresolve"])
-		var/indexNum = text2num(href_list["detailresolve"])
-		if(globAdminTicketHolder.resolveTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your admin ticket has now been resolved.</span>")
-			showDetailUI(usr, indexNum)
-
-	if(href_list["detailclose"])
-		var/indexNum = text2num(href_list["detailclose"])
-		if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes")
-			return
-		if(globAdminTicketHolder.closeTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) closed admin ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
-			to_chat(returnClient(indexNum), "<span class='boldmessage'>Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.</span>")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your ticket has now been closed.</span>")
-			showDetailUI(usr, indexNum)
-
-	if(href_list["detailreopen"])
-		var/indexNum = text2num(href_list["detailreopen"])
-		if(globAdminTicketHolder.openTicket(indexNum))
-			message_adminTicket("[usr.client] / ([usr]) re-opened admin ticket number [indexNum]")
-			showDetailUI(usr, indexNum)
-
-	if(href_list["assignadmin"])
-		var/indexNum = text2num(href_list["assignadmin"])
-		if(globAdminTicketHolder.assignAdminToTicket(usr.client, indexNum))
-			message_adminTicket("[usr.client] / ([usr]) has taken ticket number [indexNum]")
-			to_chat(returnClient(indexNum), "<span class='adminticket'>Your ticket is being handled by [usr.client].")
-		showDetailUI(usr, indexNum)

code/modules/admin/tickets/adminticketsverbs.dm

@@ -1,51 +1,33 @@
 //Verbs
 
-/client/proc/startadmintickets()
-	set name = "Restart Admin Ticket System"
-	set category = "Debug"
-
-	if(!holder && !check_rights(R_DEBUG))
-		return
-
-	if(!globAdminTicketHolder)
-		var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
-	else
-		if(alert("Are you sure you want to reboot the admin ticket system?","Reboot Admin Tickets?","Yes","No") != "Yes")
-			return
-		message_admins("<span class='admintickets'>Restarting Admin Ticket System!</span>")
-		globAdminTicketHolder = new /datum/adminTicketHolder
-		message_admins("<span class='admintickets'>Admin Ticket System Restarted!</span>")
-
 /client/proc/openTicketUI()
 
 	set name = "Open Ticket Interface"
 	set category = "Admin"
 
-	if(!holder && !check_rights(R_ADMIN))
+	if(!holder || !check_rights(R_ADMIN))
 		return
 
-	globAdminTicketHolder.showUI(usr)
+	SStickets.showUI(usr)
 
 /client/proc/resolveAllTickets()
 	set name = "Resolve All Open Tickets"
 	set category = "Admin"
 
-	if(!holder && !check_rights(R_ADMIN))
+	if(!holder || !check_rights(R_ADMIN))
 		return
 
 	if(alert("Are you sure you want to resolve ALL open tickets?","Resolve all open tickets?","Yes","No") != "Yes")
 		return
 
-	globAdminTicketHolder.resolveAllOpenTickets()
-
-
+	SStickets.resolveAllOpenTickets()
 
 /client/proc/openUserUI()
 
 	set name = "My Tickets"
 	set category = "Admin"
 
-	if(!holder && !check_rights(R_ADMIN))
+	if(!holder || !check_rights(R_ADMIN))
 		return
 
-	globAdminTicketHolder.userDetailUI(usr)
+	SStickets.userDetailUI(usr)

code/modules/admin/topic.dm

@@ -30,7 +30,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 		var/ticketID = text2num(href_list["openadminticket"])
-		globAdminTicketHolder.showDetailUI(usr, ticketID)
+		SStickets.showDetailUI(usr, ticketID)
 
 	if(href_list["stickyban"])
 		stickyban(href_list["stickyban"],href_list)
@@ -274,22 +274,22 @@
 
 		switch(href_list["call_shuttle"])
 			if("1")
-				if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+				if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 					return
-				shuttle_master.emergency.request()
+				SSshuttle.emergency.request()
 				log_admin("[key_name(usr)] called the Emergency Shuttle")
 				message_admins("<span class='adminnotice'>[key_name_admin(usr)] called the Emergency Shuttle to the station</span>")
 
 			if("2")
-				if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+				if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 					return
-				switch(shuttle_master.emergency.mode)
+				switch(SSshuttle.emergency.mode)
 					if(SHUTTLE_CALL)
-						shuttle_master.emergency.cancel()
+						SSshuttle.emergency.cancel()
 						log_admin("[key_name(usr)] sent the Emergency Shuttle back")
 						message_admins("<span class='adminnotice'>[key_name_admin(usr)] sent the Emergency Shuttle back</span>")
 					else
-						shuttle_master.emergency.cancel()
+						SSshuttle.emergency.cancel()
 						log_admin("[key_name(usr)] called the Emergency Shuttle")
 						message_admins("<span class='adminnotice'>[key_name_admin(usr)] called the Emergency Shuttle to the station</span>")
 
@@ -299,10 +299,10 @@
 	else if(href_list["edit_shuttle_time"])
 		if(!check_rights(R_SERVER))	return
 
-		var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", shuttle_master.emergency.timeLeft() ) as num
-		shuttle_master.emergency.setTimer(timer*10)
+		var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", SSshuttle.emergency.timeLeft() ) as num
+		SSshuttle.emergency.setTimer(timer*10)
 		log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds")
-		minor_announcement.Announce("The emergency shuttle will reach its destination in [round(shuttle_master.emergency.timeLeft(600))] minutes.")
+		minor_announcement.Announce("The emergency shuttle will reach its destination in [round(SSshuttle.emergency.timeLeft(600))] minutes.")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds</span>")
 		href_list["secrets"] = "check_antagonist"
 
@@ -1988,7 +1988,7 @@
 		P.name = "Central Command - paper"
 		var/stypes = list("Handle it yourselves!","Illegible fax","Fax not signed","Not Right Now","You are wasting our time", "Keep up the good work", "ERT Instructions")
 		var/stype = input(src.owner, "Which type of standard reply do you wish to send to [H]?","Choose your paperwork", "") as null|anything in stypes
-		var/tmsg = "<font face='Verdana' color='black'><center><img src = 'ntlogo.png'><BR><BR><BR><font size='4'><B>Nanotrasen Science Station Cyberiad</B></font><BR><BR><BR><font size='4'>NAS Trurl Communications Department Report</font></center><BR><BR>"
+		var/tmsg = "<font face='Verdana' color='black'><center><img src = 'ntlogo.png'><BR><BR><BR><font size='4'><B>Nanotrasen Science Station [using_map.station_short]</B></font><BR><BR><BR><font size='4'>NAS Trurl Communications Department Report</font></center><BR><BR>"
 		if(stype == "Handle it yourselves!")
 			tmsg += "Greetings, esteemed crewmember. Your fax has been <B><I>DECLINED</I></B> automatically by NAS Trurl Fax Registration.<BR><BR>Please proceed in accordance with Standard Operating Procedure and/or Space Law. You are fully trained to handle this situation without Central Command intervention.<BR><BR><i><small>This is an automatic message.</small>"
 		else if(stype == "Illegible fax")
@@ -2859,21 +2859,21 @@
 			if("moveminingshuttle")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","ShM")
-				if(!shuttle_master.toggleShuttle("mining","mining_home","mining_away"))
+				if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away"))
 					message_admins("[key_name_admin(usr)] moved mining shuttle")
 					log_admin("[key_name(usr)] moved the mining shuttle")
 
 			if("movelaborshuttle")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","ShL")
-				if(!shuttle_master.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
+				if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
 					message_admins("[key_name_admin(usr)] moved labor shuttle")
 					log_admin("[key_name(usr)] moved the labor shuttle")
 
 			if("moveferry")
 				feedback_inc("admin_secrets_fun_used",1)
 				feedback_add_details("admin_secrets_fun_used","ShF")
-				if(!shuttle_master.toggleShuttle("ferry","ferry_home","ferry_away"))
+				if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
 					message_admins("[key_name_admin(usr)] moved the centcom ferry")
 					log_admin("[key_name(usr)] moved the centcom ferry")
 

code/modules/admin/verbs/adminhelp.dm

@@ -117,15 +117,15 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		if("Adminhelp")
 			var/ticketNum // Holder for the ticket number
 			var/prunedmsg ="[usr.client]: [msg]" // Message without links
-			if(globAdminTicketHolder.checkForOpenTicket(usr.client)) // If user already has an open ticket
-				var/datum/admin_ticket/T = globAdminTicketHolder.checkForOpenTicket(usr.client) // Make T equal to the ticket they have open
+			if(SStickets.checkForOpenTicket(usr)) // If user already has an open ticket
+				var/datum/admin_ticket/T = SStickets.checkForOpenTicket(usr) // Make T equal to the ticket they have open
 				ticketNum = T.ticketNum // ticketNum is the number of their ticket.
 				T.addResponse(usr.client, msg)
 			else
-				ticketNum = globAdminTicketHolder.getTicketCounter() // ticketNum is the ticket ready to be assigned.
+				ticketNum = SStickets.getTicketCounter() // ticketNum is the ticket ready to be assigned.
 			msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, TRUE, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;openadminticket=[ticketNum]'>TICKET</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""](<A HREF='?_src_=holder;take_question=[mob.UID()]'>TAKE</A>) :</span> <span class='adminhelp'>[msg]</span>"
 			//Open a new adminticket and inform the user.
-			globAdminTicketHolder.newTicket(src, prunedmsg, msg)
+			SStickets.newTicket(src, prunedmsg, msg)
 			for(var/client/X in modholders + adminholders)
 				if(X.prefs.sound & SOUND_ADMINHELP)
 					X << 'sound/effects/adminhelp.ogg'

code/modules/admin/verbs/adminpm.dm

@@ -187,15 +187,15 @@
 		return
 	//Check if the mob being PM'd has any open admin tickets.
 	var/tickets = list()
-	tickets = globAdminTicketHolder.checkForTicket(C)
+	tickets = SStickets.checkForTicket(C)
 	if(tickets)
 		for(var/datum/admin_ticket/i in tickets)
 			i.addResponse(src, msg) // Add this response to their open tickets.
 		return
 
-	tickets = globAdminTicketHolder.checkForTicket(src)
+	tickets = SStickets.checkForTicket(C)
 	if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets
-		tickets = globAdminTicketHolder.checkForTicket(src)
+		tickets = SStickets.checkForTicket(C)
 		if(tickets)
 			for(var/datum/admin_ticket/i in tickets)
 				i.addResponse(src, msg)

code/modules/admin/verbs/randomverbs.dm

@@ -796,7 +796,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Admin"
 	set name = "Call Shuttle"
 
-	if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+	if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 		return
 
 	if(!check_rights(R_ADMIN))
@@ -806,11 +806,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(confirm != "Yes") return
 
 	if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes")
-		shuttle_master.emergency.canRecall = TRUE
+		SSshuttle.emergency.canRecall = TRUE
 	else
-		shuttle_master.emergency.canRecall = FALSE
+		SSshuttle.emergency.canRecall = FALSE
 
-	shuttle_master.emergency.request()
+	SSshuttle.emergency.request()
 
 	feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-called the emergency shuttle.")
@@ -825,20 +825,20 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return
 
-	if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+	if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
 		return
 
-	if(shuttle_master.emergency.canRecall == FALSE)
+	if(SSshuttle.emergency.canRecall == FALSE)
 		if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes")
 			return
 		else
 			var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability
-			shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work
-			shuttle_master.emergency.cancel()
+			SSshuttle.emergency.canRecall = TRUE // must be true for cancel proc to work
+			SSshuttle.emergency.cancel()
 			if(keepStatus)
-				shuttle_master.emergency.canRecall = FALSE // restores original status
+				SSshuttle.emergency.canRecall = FALSE // restores original status
 	else
-		shuttle_master.emergency.cancel()
+		SSshuttle.emergency.cancel()
 
 	feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
@@ -855,11 +855,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!check_rights(R_ADMIN))
 		return
 
-	if(shuttle_master)
-		shuttle_master.emergencyNoEscape = !shuttle_master.emergencyNoEscape
+	if(SSshuttle)
+		SSshuttle.emergencyNoEscape = !SSshuttle.emergencyNoEscape
 
-	log_admin("[key_name(src)] has [shuttle_master.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
-	message_admins("[key_name_admin(usr)] has [shuttle_master.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
+	log_admin("[key_name(src)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
+	message_admins("[key_name_admin(usr)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
 
 /client/proc/cmd_admin_attack_log(mob/M as mob in mob_list)
 	set category = "Admin"