Merge resolution with master.

code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm

@@ -281,8 +281,6 @@
 /obj/machinery/shield_gen/proc/get_shielded_turfs()
 	var/list/out = list()
 	for(var/turf/T in range(field_radius, src))
-		world << "turf dist:[get_dist(src,T)]"
 		if(get_dist(src,T) == field_radius)
 			out.Add(T)
-			world << "	added"
 	return out

code/WorkInProgress/kilakk/fax.dm

@@ -136,7 +136,9 @@ var/list/alldepartments = list("Central Command")
 		authenticated = 0
 
 	if(href_list["dept"])
+		var/lastdpt = dpt
 		dpt = input(usr, "Which department?", "Choose a department", "") as null|anything in alldepartments
+		if(!dpt) dpt = lastdpt
 
 	if(href_list["auth"])
 		if ( (!( authenticated ) && (scan)) )