Merge pull request #2519 from Citadel-Station-13/upstream-merge-30228

[MIRROR] file2list passes the file thru trim()
2017-08-28 08:57:19 -05:00
parent 03a26e6468 7d15048221
commit 4b1887ce12
1 changed files with 4 additions and 2 deletions
@@ -72,7 +72,9 @@
 	return .

 //Splits the text of a file at seperator and returns them in a list.
-/world/proc/file2list(filename, seperator="\n")
+/world/proc/file2list(filename, seperator="\n", trim = TRUE)
+	if (trim)
+		return splittext(trim(file2text(filename)),seperator)
 	return splittext(file2text(filename),seperator)

 //Turns a direction into text
@@ -551,4 +553,4 @@
 				return /atom
 			else
 				return /datum
-	return text2path(copytext(string_type, 1, last_slash))
+	return text2path(copytext(string_type, 1, last_slash))