Merge upstream

code/modules/admin/admin.dm

@@ -83,7 +83,8 @@ var/global/BSACooldown = 0
 	body += "<A href='?_src_=holder;traitor=\ref[M]'>Traitor panel</A> | "
 	body += "<A href='?_src_=holder;narrateto=\ref[M]'>Narrate to</A> | "
 	body += "<A href='?_src_=holder;subtlemessage=\ref[M]'>Subtle message</A> | "
-	body += "<A href='?_src_=holder;individuallog=\ref[M]'>Individual Round Logs</A>"
+	body += "<A href='?_src_=holder;individuallog=\ref[M]'>Individual Round Logs</A> | "
+	body += "<A href='?_src_=holder;languagemenu=\ref[M]'>Language Menu</A>"
 
 	if (M.client)
 		if(!isnewplayer(M))
@@ -823,4 +824,4 @@ var/global/BSACooldown = 0
 			string = pick(
 				"Admin login: [key_name(src)]")
 		if(string)
-			message_admins("[string]")
+			message_admins("[string]")

code/modules/admin/admin_verbs.dm

@@ -622,10 +622,7 @@ var/list/admin_verbs_hideable = list(
 	var/message = input(usr, "What do you want the message to be?", "Make Sound") as text | null
 	if(!message)
 		return
-	var/templanguages = O.languages_spoken
-	O.languages_spoken |= ALL
 	O.say(message)
-	O.languages_spoken = templanguages
 	log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z] say \"[message]\"")
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. say \"[message]\"</span>")
 	feedback_add_details("admin_verb","OS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/topic.dm

@@ -1814,6 +1814,16 @@
 			return
 
 		show_individual_logging_panel(M, href_list["log_type"])
+	else if(href_list["languagemenu"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		var/mob/living/L = locate(href_list["languagemenu"]) in mob_list
+		if(!isliving(L))
+			to_chat(usr, "This can only be used on instances of type /mob/living.")
+			return
+
+		L.open_language_menu(usr)
 
 	else if(href_list["traitor"])
 		if(!check_rights(R_ADMIN))