Merge branch 'upstream-merge-26509' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26509

2017-04-25 02:09:52 -05:00
parent 496107120f 9df952873b
commit 172380af2b
1 changed files with 1 additions and 1 deletions
@@ -537,4 +537,4 @@
 /proc/color_matrix2color_hex(list/the_matrix)
 	if(!istype(the_matrix) || the_matrix.len != 20)
 		return "#ffffffff"
-	return rgb(the_matrix[1]*255, the_matrix[6]*255, the_matrix[11]*255, the_matrix[16]*255)
+	return rgb(the_matrix[1]*255, the_matrix[6]*255, the_matrix[11]*255, the_matrix[16]*255)