From 0d14487cdcffb3b735f882f9f288c049cfeca689 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 16 May 2020 17:06:21 -0400 Subject: [PATCH] Add serial comma --- code/_helpers/_lists.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_helpers/_lists.dm b/code/_helpers/_lists.dm index d844d61b5c0..124f69f45e3 100644 --- a/code/_helpers/_lists.dm +++ b/code/_helpers/_lists.dm @@ -16,7 +16,7 @@ */ //Returns a list in plain english as a string -/proc/english_list(var/list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = "") +/proc/english_list(var/list/input, nothing_text = "nothing", and_text = " and ", comma_text = ", ", final_comma_text = ",") // this proc cannot be merged with counting_english_list to maintain compatibility // with shoddy use of this proc for code logic and for cases that require original order switch(input.len) @@ -26,7 +26,7 @@ else return "[jointext(input, comma_text, 1, -1)][final_comma_text][and_text][input[input.len]]" //Returns a newline-separated list that counts equal-ish items, outputting count and item names, optionally with icons and specific determiners -/proc/counting_english_list(var/list/input, output_icons = TRUE, determiners = DET_NONE, nothing_text = "nothing", line_prefix = "\t", first_item_prefix = "\n", last_item_suffix = "\n", and_text = "\n", comma_text = "\n", final_comma_text = "") +/proc/counting_english_list(var/list/input, output_icons = TRUE, determiners = DET_NONE, nothing_text = "nothing", line_prefix = "\t", first_item_prefix = "\n", last_item_suffix = "\n", and_text = "\n", comma_text = "\n", final_comma_text = ",") var/list/counts = list() // counted input items var/list/items = list() // actual objects for later reference (for icons and formatting)