Merge remote-tracking branch 'origin/master' into hardsync-1.5

code/__HELPERS/_lists.dm

@@ -66,7 +66,7 @@
 	} while(FALSE)
 
 //Returns a list in plain english as a string
-/proc/english_list(list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "" )
+/proc/english_list(list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "")
 	var/total = length(input)
 	switch(total)
 		if (0)
@@ -87,6 +87,34 @@
 
 			return "[output][and_text][input[index]]"
 
+/**
+ * English_list but associative supporting. Higher overhead.
+ */
+/proc/english_list_assoc(list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "")
+	var/total = length(input)
+	switch(total)
+		if (0)
+			return "[nothing_text]"
+		if (1)
+			var/assoc = input[input[1]] == null? "" : " = [input[input[1]]]"
+			return "[input[1]][assoc]"
+		if (2)
+			var/assoc = input[input[1]] == null? "" : " = [input[input[1]]]"
+			var/assoc2 = input[input[2]] == null? "" : " = [input[input[2]]]"
+			return "[input[1]][assoc][and_text][input[2]][assoc2]"
+		else
+			var/output = ""
+			var/index = 1
+			var/assoc
+			while (index < total)
+				if (index == total - 1)
+					comma_text = final_comma_text
+				assoc = input[input[index]] == null? "" : " = [input[input[index]]]"
+				output += "[input[index]][assoc][comma_text]"
+				++index
+			assoc = input[input[index]] == null? "" : " = [input[input[index]]]"
+			return "[output][and_text][input[index]]"
+
 //Returns list element or null. Should prevent "index out of bounds" error.
 /proc/listgetindex(list/L, index)
 	if(LAZYLEN(L))

code/__HELPERS/_logging.dm

@@ -231,10 +231,10 @@
 		src_object = window.locked_by.src_object
 	// Insert src_object info
 	if(src_object)
-		entry += "\nUsing: [src_object.type] [REF(src_object)]"
+		entry += "Using: [src_object.type] [REF(src_object)]"
 	// Insert message
 	if(message)
-		entry += "\n[message]"
+		entry += "[message]"
 	WRITE_LOG(GLOB.tgui_log, entry)
 
 /* Close open log handles. This should be called as late as possible, and no logging should hapen after. */