Merge branch 'master' into hook-kill-v10-final-ultimate-final

code/modules/admin/sql_notes.dm

@@ -187,12 +187,12 @@
 			log_game("SQL ERROR obtaining ckey from notes table. Error : \[[err]\]\n")
 			return
 		to_chat(usr, "<span class='notice'>Started regex note search for [search]. Please wait for results...</span>")
-		message_admins("[usr] has started a note search with regex [search]. CPU usage may be higher.")
+		message_admins("[usr.ckey] has started a note search with the following regex: [search] | CPU usage may be higher.")
 		while(query_list_notes.NextRow())
 			index_ckey = query_list_notes.item[1]
 			output += "<a href='?_src_=holder;shownoteckey=[index_ckey]'>[index_ckey]</a><br>"
 			CHECK_TICK
-		message_admins("The note search started by [usr] has complete. CPU should return to normal.")
+		message_admins("The note search started by [usr.ckey] has complete. CPU should return to normal.")
 	else
 		output += "<center><a href='?_src_=holder;addnoteempty=1'>\[Add Note\]</a></center>"
 		output += ruler

code/modules/admin/verbs/onlyoneteam.dm

@@ -73,9 +73,11 @@
 	..()
 	if((ishuman(hit_atom)))
 		var/mob/living/carbon/human/H = hit_atom
-		if(H.r_hand == src) return
-		if(H.l_hand == src) return
-		var/mob/A = H.LAssailant
+		if(H.r_hand == src)
+			return
+		if(H.l_hand == src)
+			return
+		var/mob/A = thrownby
 		if((H in GLOB.team_alpha) && (A in GLOB.team_alpha))
 			to_chat(A, "<span class='warning'>He's on your team!</span>")
 			return
@@ -89,4 +91,3 @@
 			playsound(src, 'sound/items/dodgeball.ogg', 50, 1)
 			visible_message("<span class='danger'>[H] HAS BEEN ELIMINATED!</span>")
 			H.melt()
-			return