Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

modular_citadel/code/modules/mentor/mentorpm.dm

@@ -9,7 +9,7 @@
 	for(var/client/T)
 		targets["[T]"] = T
 
-	var/list/sorted = sortList(targets)
+	var/list/sorted = sort_list(targets)
 	var/target = input(src,"To whom shall we send a message?","Mentor PM",null) in sorted|null
 	cmd_mentor_pm(targets[target],null)
 	SSblackbox.record_feedback("tally", "Mentor_verb", 1, "APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!