Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync

Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme

code/_helpers/logging.dm

@@ -93,3 +93,60 @@
 	if(dir & DOWN) comps += "DOWN"
 	
 	return english_list(comps, nothing_text="0", and_text="|", comma_text="|")
+
+//more or less a logging utility
+/proc/key_name(var/whom, var/include_link = null, var/include_name = 1, var/highlight_special_characters = 1)
+	var/mob/M
+	var/client/C
+	var/key
+
+	if(!whom)	return "*null*"
+	if(istype(whom, /client))
+		C = whom
+		M = C.mob
+		key = C.key
+	else if(ismob(whom))
+		M = whom
+		C = M.client
+		key = M.key
+	else if(istype(whom, /datum))
+		var/datum/D = whom
+		return "*invalid:[D.type]*"
+	else
+		return "*invalid*"
+
+	. = ""
+
+	if(key)
+		if(include_link && C)
+			. += "<a href='?priv_msg=\ref[C]'>"
+
+		if(C && C.holder && C.holder.fakekey && !include_name)
+			. += "Administrator"
+		else
+			. += key
+
+		if(include_link)
+			if(C)	. += "</a>"
+			else	. += " (DC)"
+	else
+		. += "*no key*"
+
+	if(include_name && M)
+		var/name
+
+		if(M.real_name)
+			name = M.real_name
+		else if(M.name)
+			name = M.name
+
+
+		if(include_link && is_special_character(M) && highlight_special_characters)
+			. += "/(<font color='#FFA500'>[name]</font>)" //Orange
+		else
+			. += "/([name])"
+
+	return .
+
+/proc/key_name_admin(var/whom, var/include_name = 1)
+	return key_name(whom, 1, include_name)

code/_helpers/matrices.dm

@@ -0,0 +1,17 @@
+/matrix/proc/TurnTo(old_angle, new_angle)
+	. = new_angle - old_angle
+	Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
+
+
+/atom/proc/SpinAnimation(speed = 10, loops = -1)
+	var/matrix/m120 = matrix(transform)
+	m120.Turn(120)
+	var/matrix/m240 = matrix(transform)
+	m240.Turn(240)
+	var/matrix/m360 = matrix(transform)
+	speed /= 3      //Gives us 3 equal time segments for our three turns.
+	                //Why not one turn? Because byond will see that the start and finish are the same place and do nothing
+	                //Why not two turns? Because byond will do a flip instead of a turn
+	animate(src, transform = m120, time = speed, loops)
+	animate(transform = m240, time = speed)
+	animate(transform = m360, time = speed)

code/_helpers/unsorted.dm

@@ -479,64 +479,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	if(M < 0)
 		return -M
 
-
-/proc/key_name(var/whom, var/include_link = null, var/include_name = 1, var/highlight_special_characters = 1)
-	var/mob/M
-	var/client/C
-	var/key
-
-	if(!whom)	return "*null*"
-	if(istype(whom, /client))
-		C = whom
-		M = C.mob
-		key = C.key
-	else if(ismob(whom))
-		M = whom
-		C = M.client
-		key = M.key
-	else if(istype(whom, /datum))
-		var/datum/D = whom
-		return "*invalid:[D.type]*"
-	else
-		return "*invalid*"
-
-	. = ""
-
-	if(key)
-		if(include_link && C)
-			. += "<a href='?priv_msg=\ref[C]'>"
-
-		if(C && C.holder && C.holder.fakekey && !include_name)
-			. += "Administrator"
-		else
-			. += key
-
-		if(include_link)
-			if(C)	. += "</a>"
-			else	. += " (DC)"
-	else
-		. += "*no key*"
-
-	if(include_name && M)
-		var/name
-
-		if(M.real_name)
-			name = M.real_name
-		else if(M.name)
-			name = M.name
-
-
-		if(include_link && is_special_character(M) && highlight_special_characters)
-			. += "/(<font color='#FFA500'>[name]</font>)" //Orange
-		else
-			. += "/([name])"
-
-	return .
-
-/proc/key_name_admin(var/whom, var/include_name = 1)
-	return key_name(whom, 1, include_name)
-
-
 // returns the turf located at the map edge in the specified direction relative to A
 // used for mass driver
 /proc/get_edge_target_turf(var/atom/A, var/direction)