Merge pull request #2848 from VOREStation/aro-exploration

Exploration Update

code/_helpers/icons.dm

@@ -817,6 +817,11 @@ proc // Creates a single icon from a given /atom or /image.  Only the first argu
 	qdel(west)
 	return full
 
+/proc/downloadImage(atom/A, dir)
+	var/icon/this_icon = getFlatIcon(A,defdir=dir||A.dir,always_use_defdir=1)
+
+	usr << ftp(this_icon,"[A.name].png")
+
 /mob/proc/AddCamoOverlay(atom/A)//A is the atom which we are using as the overlay.
 	var/icon/opacity_icon = new(A.icon, A.icon_state)//Don't really care for overlays/underlays.
 	//Now we need to culculate overlays+underlays and add them together to form an image for a mask.

code/_helpers/sorts/comparators.dm

@@ -28,3 +28,11 @@
 		. = B.failures - A.failures
 	if (!.)
 		. = B.qdels - A.qdels
+
+// Sorts jobs by department, and then by flag within department
+/proc/cmp_job_datums(var/datum/job/a, var/datum/job/b)
+	. = sorttext(b.department, a.department)
+	if (. == 0) //Same department, push up if they're a head
+		. = b.head_position - a.head_position
+	if (. == 0) //Already in head/nothead spot, sort by name
+		. = sorttext(b.title, a.title)

code/_helpers/unsorted.dm

@@ -792,6 +792,7 @@ proc/GaussRandRound(var/sigma,var/roundto)
 						var/old_icon1 = T.icon
 						var/old_overlays = T.overlays.Copy()
 						var/old_underlays = T.underlays.Copy()
+						var/old_decals = T.decals ? T.decals.Copy() : null
 
 						X = B.ChangeTurf(T.type)
 						X.set_dir(old_dir1)
@@ -799,6 +800,9 @@ proc/GaussRandRound(var/sigma,var/roundto)
 						X.icon = old_icon1
 						X.overlays = old_overlays
 						X.underlays = old_underlays
+						X.decals = old_decals
+						if(old_decals)
+							X.apply_decals()
 
 					//Move the air from source to dest
 					var/turf/simulated/ST = T
@@ -824,9 +828,11 @@ proc/GaussRandRound(var/sigma,var/roundto)
 
 					else if(turftoleave)
 						T.ChangeTurf(turftoleave)
+						T.apply_decals()
 
 					else
 						T.ChangeTurf(get_base_turf_by_area(T))
+						T.apply_decals()
 
 					refined_src -= T
 					refined_trg -= B