Merge remote-tracking branch 'upstream/dev' into CanTrack

Conflicts:
	code/game/machinery/camera/tracking.dm

code/WorkInProgress/computer3/computers/camera.dm

@@ -141,14 +141,14 @@
 		if (!computer || computer.z > 6)
 			return null
 
+		cameranet.process_sort()
+
 		var/list/L = list()
 		for(var/obj/machinery/camera/C in cameranet.cameras)
 			var/list/temp = C.network & key.networks
 			if(temp.len)
 				L.Add(C)
 
-		camera_sort(L)
-
 		return L
 	verify_machine(var/obj/machinery/camera/C,var/datum/file/camnet_key/key = null)
 		if(!istype(C) || !C.can_use())

code/WorkInProgress/computer3/computers/crew.dm

@@ -35,7 +35,7 @@
 					var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
 					var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
 
-					log += "<tr><td width='40%'>[H.get_id_name()]</td>"
+					log += "<tr><td width='40%'>[H.get_authentification_name()] ([H.get_assignment()])</td>"
 
 					switch(C.sensor_mode)
 						if(1)