Merge conflict fix

code/modules/admin/tickets/adminticketsUI.dm

@@ -44,14 +44,14 @@
 
 	return dat
 
-/datum/adminTicketHolder/proc/showUI(var/client/user, var/tab)
+/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(var/client/user, var/ticketID)
+/datum/adminTicketHolder/proc/showDetailUI(mob/user, var/ticketID)
 	var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[ticketID]
 	var/status = "[T.state2text()]"
 
@@ -91,9 +91,9 @@
 	popup.set_content(dat)
 	popup.open()
 
-/datum/adminTicketHolder/proc/userDetailUI(var/client/user)
+/datum/adminTicketHolder/proc/userDetailUI(mob/user)
 //dat
-	var/tickets = checkForTicket(user)
+	var/tickets = checkForTicket(user.client)
 	var/dat
 	dat += "<h1>Your open tickets</h1>"
 	dat += "<table>"
@@ -130,7 +130,7 @@
 
 	if(href_list["details"])
 		var/indexNum = text2num(href_list["details"])
-		showDetailUI(usr.client, indexNum)
+		showDetailUI(usr, indexNum)
 		return
 
 	if(href_list["resolve"])
@@ -169,4 +169,4 @@
 		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)
+		showDetailUI(usr, indexNum)

code/modules/admin/tickets/adminticketsverbs.dm

@@ -48,4 +48,4 @@
 	if(!holder && !check_rights(R_ADMIN))
 		return
 
-	globAdminTicketHolder.userDetailUI(usr.client)
+	globAdminTicketHolder.userDetailUI(usr)

code/modules/admin/verbs/pray.dm

@@ -28,6 +28,7 @@
 		prayer_type = "CULTIST PRAYER"
 		deity = ticker.cultdat.entity_name
 
+	log_say("(PRAYER) [msg]", usr)
 	msg = "<span class='notice'>[bicon(cross)]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""]:</font>[key_name(src, 1)] ([ADMIN_QUE(src,"?")]) ([ADMIN_PP(src,"PP")]) ([ADMIN_VV(src,"VV")]) ([ADMIN_SM(src,"SM")]) ([admin_jump_link(src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_SC(src,"SC")]) (<A HREF='?_src_=holder;Bless=[UID()]'>BLESS</A>) (<A HREF='?_src_=holder;Smite=[UID()]'>SMITE</A>):</b> [msg]</span>"
 
 	for(var/client/X in admins)
@@ -36,7 +37,6 @@
 	to_chat(usr, "Your prayers have been received by the gods.")
 
 	feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	//log_admin("HELP: [key_name(src)]: [msg]")
 
 /proc/Centcomm_announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))