diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index a493aa9d08..af77addeab 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -195,32 +195,10 @@ proc/checkhtml(var/t)
* Text modification
*/
/proc/replacetext(text, find, replacement)
- var/find_len = length(find)
- if(find_len < 1) return text
- . = ""
- var/last_found = 1
- while(1)
- var/found = findtext(text, find, last_found, 0)
- . += copytext(text, last_found, found)
- if(found)
- . += replacement
- last_found = found + find_len
- continue
- return .
+ return list2text(text2list(text, find), replacement)
/proc/replacetextEx(text, find, replacement)
- var/find_len = length(find)
- if(find_len < 1) return text
- . = ""
- var/last_found = 1
- while(1)
- var/found = findtextEx(text, find, last_found, 0)
- . += copytext(text, last_found, found)
- if(found)
- . += replacement
- last_found = found + find_len
- continue
- return .
+ return list2text(text2listEx(text, find), replacement)
//Adds 'u' number of zeros ahead of the text 't'
/proc/add_zero(t, u)
@@ -287,27 +265,6 @@ proc/checkhtml(var/t)
return message
return copytext(message, 1, length + 1)
-/*
- * Misc
- */
-
-/proc/stringsplit(txt, character)
- var/cur_text = txt
- var/last_found = 1
- var/found_char = findtext(cur_text,character)
- var/list/list = list()
- if(found_char)
- var/fs = copytext(cur_text,last_found,found_char)
- list += fs
- last_found = found_char+length(character)
- found_char = findtext(cur_text,character,last_found)
- while(found_char)
- var/found_string = copytext(cur_text,last_found,found_char)
- last_found = found_char+length(character)
- list += found_string
- found_char = findtext(cur_text,character,last_found)
- list += copytext(cur_text,last_found,length(cur_text)+1)
- return list
/proc/stringmerge(var/text,var/compare,replace = "*")
//This proc fills in all spaces with the "replace" var (* by default) with whatever
@@ -346,4 +303,4 @@ proc/checkhtml(var/t)
var/new_text = ""
for(var/i = length(text); i > 0; i--)
new_text += copytext(text, i, i+1)
- return new_text
\ No newline at end of file
+ return new_text
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 261e8c6d75..4e6287a5d2 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -83,22 +83,94 @@
return hex
-//Attaches each element of a list to a single string seperated by 'seperator'.
-/proc/dd_list2text(var/list/the_list, separator)
- var/total = the_list.len
- if(!total)
- return
- var/count = 2
- var/newText = "[the_list[1]]"
- while(count <= total)
- if(separator)
- newText += separator
- newText += "[the_list[count]]"
- count++
- return newText
+// Concatenates a list of strings into a single string. A seperator may optionally be provided.
+/proc/list2text(list/ls, sep)
+ if(ls.len <= 1) // Early-out code for empty or singleton lists.
+ return ls.len ? ls[1] : ""
+
+ var/l = ls.len // Made local for sanic speed.
+ var/i = 0 // Incremented every time a list index is accessed.
+
+ if(sep <> null)
+ // Macros expand to long argument lists like so: sep, ls[++i], sep, ls[++i], sep, ls[++i], etc...
+ #define S1 sep, ls[++i]
+ #define S4 S1, S1, S1, S1
+ #define S16 S4, S4, S4, S4
+ #define S64 S16, S16, S16, S16
+
+ . = "[ls[++i]]" // Make sure the initial element is converted to text.
+
+ // Having the small concatenations come before the large ones boosted speed by an average of at least 5%.
+ if(l-1 & 0x01) // 'i' will always be 1 here.
+ . = text("[][][]", ., S1) // Append 1 element if the remaining elements are not a multiple of 2.
+ if(l-i & 0x02)
+ . = text("[][][][][]", ., S1, S1) // Append 2 elements if the remaining elements are not a multiple of 4.
+ if(l-i & 0x04)
+ . = text("[][][][][][][][][]", ., S4) // And so on....
+ if(l-i & 0x08)
+ . = text("[][][][][][][][][][][][][][][][][]", ., S4, S4)
+ if(l-i & 0x10)
+ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16)
+ if(l-i & 0x20)
+ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16)
+ if(l-i & 0x40)
+ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64)
+ while(l > i) // Chomp through the rest of the list, 128 elements at a time.
+ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64)
+
+ #undef S64
+ #undef S16
+ #undef S4
+ #undef S1
+
+ else
+ // Macros expand to long argument lists like so: ls[++i], ls[++i], ls[++i], etc...
+ #define S1 ls[++i]
+ #define S4 S1, S1, S1, S1
+ #define S16 S4, S4, S4, S4
+ #define S64 S16, S16, S16, S16
+
+ . = "[ls[++i]]" // Make sure the initial element is converted to text.
+
+ if(l-1 & 0x01) // 'i' will always be 1 here.
+ . += S1 // Append 1 element if the remaining elements are not a multiple of 2.
+ if(l-i & 0x02)
+ . = text("[][][]", ., S1, S1) // Append 2 elements if the remaining elements are not a multiple of 4.
+ if(l-i & 0x04)
+ . = text("[][][][][]", ., S4) // And so on...
+ if(l-i & 0x08)
+ . = text("[][][][][][][][][]", ., S4, S4)
+ if(l-i & 0x10)
+ . = text("[][][][][][][][][][][][][][][][][]", ., S16)
+ if(l-i & 0x20)
+ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16)
+ if(l-i & 0x40)
+ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64)
+ while(l > i) // Chomp through the rest of the list, 128 elements at a time.
+ . = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
+ [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64)
+
+ #undef S64
+ #undef S16
+ #undef S4
+ #undef S1
-//slower then dd_list2text, but correctly processes associative lists.
+//slower then list2text, but correctly processes associative lists.
proc/tg_list2text(list/list, glue=",")
if(!istype(list) || !list.len)
return
@@ -108,56 +180,31 @@ proc/tg_list2text(list/list, glue=",")
return output
-//Converts a text string into a list by splitting the string at each seperator found in text (discarding the seperator)
-//Returns an empty list if the text cannot be split, or the split text in a list.
-//Not giving a "" seperator will cause the text to be broken into a list of single letters.
-/proc/text2list(text, seperator="\n")
+//Converts a string into a list by splitting the string at each delimiter found. (discarding the seperator)
+/proc/text2list(text, delimiter="\n")
+ var/delim_len = length(delimiter)
+ if(delim_len < 1) return list(text)
. = list()
+ var/last_found = 1
+ var/found
+ do
+ found = findtext(text, delimiter, last_found, 0)
+ . += copytext(text, last_found, found)
+ last_found = found + delim_len
+ while(found)
- var/text_len = length(text) //length of the input text
- var/seperator_len = length(seperator) //length of the seperator text
-
- if(text_len >= seperator_len)
- var/i
- var/last_i = 1
-
- for(i=1,i<=(text_len+1-seperator_len),i++)
- if( cmptext(copytext(text,i,i+seperator_len), seperator) )
- if(i != last_i)
- . += copytext(text,last_i,i)
- last_i = i + seperator_len
-
- if(last_i <= text_len)
- . += copytext(text, last_i, 0)
- else
- . += text
- return .
-
-//Converts a text string into a list by splitting the string at each seperator found in text (discarding the seperator)
-//Returns an empty list if the text cannot be split, or the split text in a list.
-//Not giving a "" seperator will cause the text to be broken into a list of single letters.
//Case Sensitive!
-/proc/text2listEx(text, seperator="\n")
+/proc/text2listEx(text, delimiter="\n")
+ var/delim_len = length(delimiter)
+ if(delim_len < 1) return list(text)
. = list()
-
- var/text_len = length(text) //length of the input text
- var/seperator_len = length(seperator) //length of the seperator text
-
- if(text_len >= seperator_len)
- var/i
- var/last_i = 1
-
- for(i=1,i<=(text_len+1-seperator_len),i++)
- if( cmptextEx(copytext(text,i,i+seperator_len), seperator) )
- if(i != last_i)
- . += copytext(text,last_i,i)
- last_i = i + seperator_len
-
- if(last_i <= text_len)
- . += copytext(text, last_i, 0)
- else
- . += text
- return .
+ var/last_found = 1
+ var/found
+ do
+ found = findtextEx(text, delimiter, last_found, 0)
+ . += copytext(text, last_found, found)
+ last_found = found + delim_len
+ while(found)
//Splits the text of a file at seperator and returns them in a list.
/proc/file2list(filename, seperator="\n")
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 5f11d9f623..a86061aac6 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -184,7 +184,7 @@
if(type == "config")
switch (name)
if ("resource_urls")
- config.resource_urls = stringsplit(value, " ")
+ config.resource_urls = text2list(value, " ")
if ("admin_legacy_system")
config.admin_legacy_system = 1
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 95adc92dcc..376df93678 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -297,7 +297,7 @@ var/list/advance_cures = list(
for(var/datum/symptom/S in symptoms)
L += S.id
L = sortList(L) // Sort the list so it doesn't matter which order the symptoms are in.
- var/result = dd_list2text(L, ":")
+ var/result = list2text(L, ":")
id = result
return result
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 7dca0ae01f..61784e98c3 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -262,7 +262,7 @@
if(locked)
user << "\red Circuit controls are locked."
return
- var/existing_networks = dd_list2text(network,",")
+ var/existing_networks = list2text(network,",")
var/input = strip_html(input(usr, "Which networks would you like to connect this camera console circuit to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Multitool-Circuitboard interface", existing_networks))
if(!input)
usr << "No input found please hang up and try your call again."
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 4e7ae4d648..5c5b1b6fd8 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -1,6 +1,6 @@
/obj/item/blueprints
name = "station blueprints"
- desc = "Blueprints of the station. There's stamp \"Classified\" and several coffee stains on it."
+ desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it."
icon = 'icons/obj/items.dmi'
icon_state = "blueprints"
attack_verb = list("attacked", "bapped", "hit")
@@ -21,7 +21,7 @@
/obj/item/blueprints/attack_self(mob/M as mob)
if (!istype(M,/mob/living/carbon/human))
- M << "This is stack of useless pieces of harsh paper." //monkeys cannot into projecting
+ M << "This stack of blue paper means nothing to you." //monkeys cannot into projecting
return
interact()
return
@@ -53,18 +53,18 @@
switch (get_area_type())
if (AREA_SPACE)
text += {"
-According this blueprints you are in open space now.
+According the blueprints, you are now in outer space. Hold your breath.
Mark this place as new area.
"}
if (AREA_STATION)
text += {"
-According this blueprints you are in [A.name] now.
+According the blueprints, you are now in \"[A.name]\".
You may
move an amendment to the drawing.
"}
if (AREA_SPECIAL)
text += {"
-This place isn't noted on these blueprints.
+This place isn't noted on the blueprint.
"}
else
return
@@ -105,20 +105,20 @@ move an amendment to the drawing.
if(!istype(res,/list))
switch(res)
if(ROOM_ERR_SPACE)
- usr << "\red New area must be complete airtight!"
+ usr << "\red The new area must be completely airtight!"
return
if(ROOM_ERR_TOOLARGE)
- usr << "\red New area too large!"
+ usr << "\red The new area too large!"
return
else
usr << "\red Error! Please notify administration!"
return
var/list/turf/turfs = res
- var/str = trim(stripped_input(usr,"New area title","Blueprints editing", "", MAX_NAME_LEN))
+ var/str = trim(stripped_input(usr,"New area name:","Blueprint Editing", "", MAX_NAME_LEN))
if(!str || !length(str)) //cancel
return
if(length(str) > 50)
- usr << "\red Text too long."
+ usr << "\red Name too long."
return
var/area/A = new
A.name = str
@@ -153,8 +153,8 @@ move an amendment to the drawing.
/obj/item/blueprints/proc/edit_area()
var/area/A = get_area()
//world << "DEBUG: edit_area"
- var/prevname = A.name
- var/str = trim(stripped_input(usr,"New area title","Blueprints editing", prevname, MAX_NAME_LEN))
+ var/prevname = "[A.name]"
+ var/str = trim(stripped_input(usr,"New area name:","Blueprint Editing", prevname, MAX_NAME_LEN))
if(!str || !length(str) || str==prevname) //cancel
return
if(length(str) > 50)
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 8f6fd0f632..b02fc79891 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -35,7 +35,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/uplink/proc/generate_nanoui_items()
var/items_nano[0]
for(var/D in ItemList)
- var/list/O = stringsplit(D, ":")
+ var/list/O = text2list(D, ":")
if(O.len != 3) //If it is not an actual item, make a break in the menu.
if(O.len == 1) //If there is one item, it's probably a title
items_nano[++items_nano.len] = list("Category" = "[O[1]]", "items" = list())
@@ -53,7 +53,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
else
var/itemname = O[3]
items_nano[items_nano.len]["items"] += list(list("Name" = itemname, "Cost" = cost, "obj_path" = path_text))
-
+
return items_nano
@@ -62,7 +62,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
//Halfassed fix for href exploit ~Z
for(var/D in ItemList)
- var/list/O = stringsplit(D, ":")
+ var/list/O = text2list(D, ":")
if(O.len>0)
valid_items += O[1]
@@ -83,7 +83,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
var/category_items = 1 //To prevent stupid :P
for(var/D in ItemList)
- var/list/O = stringsplit(D, ":")
+ var/list/O = text2list(D, ":")
if(O.len != 3) //If it is not an actual item, make a break in the menu.
if(O.len == 1) //If there is one item, it's probably a title
dat += "[O[1]]
"
@@ -273,7 +273,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/uplink/Topic(href, href_list)
if (href_list["buy_item"])
-
+
if(href_list["buy_item"] == "random")
var/boughtItem = chooseRandomItem()
if(boughtItem)
@@ -347,19 +347,19 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
var/title = "Syndicate Uplink"
var/data[0]
-
+
data["crystals"] = uses
data["nano_items"] = nanoui_items
data["welcome"] = welcome
-
+
// update the ui if it exists, returns null if no ui is passed/found
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
if (!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
ui = new(user, src, ui_key, "uplink.tmpl", title, 450, 600)
// when the ui is first opened this is the data it will use
- ui.set_initial_data(data)
+ ui.set_initial_data(data)
// open the new ui window
ui.open()
@@ -381,7 +381,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
usr.set_machine(src)
if(href_list["lock"])
toggle()
- ui.close()
+ ui.close()
return 1
if(..(href, href_list) == 1)
diff --git a/code/game/objects/structures/transit_tubes.dm b/code/game/objects/structures/transit_tubes.dm
index d1435d383d..8126296a15 100644
--- a/code/game/objects/structures/transit_tubes.dm
+++ b/code/game/objects/structures/transit_tubes.dm
@@ -571,7 +571,7 @@ obj/structure/ex_act(severity)
if(text in direction_table)
return direction_table[text]
- var/list/split_text = stringsplit(text, "-")
+ var/list/split_text = text2list(text, "-")
// If the first token is D, the icon_state represents
// a purely decorative tube, and doesn't actually
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index 6e642d8aca..a723fe3795 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -2,7 +2,7 @@
/datum/admins/proc/create_mob(var/mob/user)
if (!create_mob_html)
var/mobjs = null
- mobjs = dd_list2text(typesof(/mob), ";")
+ mobjs = list2text(typesof(/mob), ";")
create_mob_html = file2text('html/create_object.html')
create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index 73e7cef919..5b5f926e4b 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -3,7 +3,7 @@
/datum/admins/proc/create_object(var/mob/user)
if (!create_object_html)
var/objectjs = null
- objectjs = dd_list2text(typesof(/obj), ";")
+ objectjs = list2text(typesof(/obj), ";")
create_object_html = file2text('html/create_object.html')
create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
@@ -21,7 +21,7 @@
if (!quick_create_object_html)
var/objectjs = null
- objectjs = dd_list2text(typesof(path), ";")
+ objectjs = list2text(typesof(path), ";")
quick_create_object_html = file2text('html/create_object.html')
quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"")
diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm
index 56f719b47d..0938b7bd33 100644
--- a/code/modules/admin/create_turf.dm
+++ b/code/modules/admin/create_turf.dm
@@ -2,7 +2,7 @@
/datum/admins/proc/create_turf(var/mob/user)
if (!create_turf_html)
var/turfjs = null
- turfjs = dd_list2text(typesof(/turf), ";")
+ turfjs = list2text(typesof(/turf), ";")
create_turf_html = file2text('html/create_object.html')
create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index b09712350c..e5a8c3ae86 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1606,7 +1606,7 @@
alert("Select fewer object types, (max 5)")
return
else if(length(removed_paths))
- alert("Removed:\n" + dd_list2text(removed_paths, "\n"))
+ alert("Removed:\n" + list2text(removed_paths, "\n"))
var/list/offset = text2list(href_list["offset"],",")
var/number = dd_range(1, 100, text2num(href_list["object_count"]))
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 0659622f6a..241c34d5d8 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -975,14 +975,14 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs", "Clients"))
if("Players")
- usr << dd_list2text(player_list,",")
+ usr << list2text(player_list,",")
if("Admins")
- usr << dd_list2text(admins,",")
+ usr << list2text(admins,",")
if("Mobs")
- usr << dd_list2text(mob_list,",")
+ usr << list2text(mob_list,",")
if("Living Mobs")
- usr << dd_list2text(living_mob_list,",")
+ usr << list2text(living_mob_list,",")
if("Dead Mobs")
- usr << dd_list2text(dead_mob_list,",")
+ usr << list2text(dead_mob_list,",")
if("Clients")
- usr << dd_list2text(clients,",")
+ usr << list2text(clients,",")
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index d898495697..8ab4da0414 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -178,4 +178,4 @@
sum_list[3] = A.blood_DNA ? A.blood_DNA.Copy() : null
sum_list[4] = "\The [A] in \the [get_area(A)]"
stored["\ref [A]"] = sum_list
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
index 6c6578bb86..44cc91a8e4 100644
--- a/code/modules/flufftext/TextFilters.dm
+++ b/code/modules/flufftext/TextFilters.dm
@@ -57,7 +57,7 @@ proc/NewStutter(phrase,stunned)
split_phrase[index] = word
- return sanitize(dd_list2text(split_phrase," "))
+ return sanitize(list2text(split_phrase," "))
proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness.
step(M, pick(d,turn(d,90),turn(d,-90)))
@@ -78,6 +78,6 @@ proc/Ellipsis(original_msg, chance = 50)
else
new_words += w
- new_msg = dd_list2text(new_words," ")
+ new_msg = list2text(new_words," ")
return new_msg
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index ba6733010b..f284a5fda8 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -12,7 +12,7 @@
if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
temp_message[H] = ninjaspeak(temp_message[H])
pick_list -= H
- message = dd_list2text(temp_message, " ")
+ message = list2text(temp_message, " ")
message = replacetext(message, "o", "¤")
message = replacetext(message, "p", "þ")
message = replacetext(message, "l", "£")
@@ -71,4 +71,3 @@
/mob/living/carbon/human/proc/GetSpecialVoice()
return special_voice
-
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index 53320e3c52..7f7f977b70 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -52,7 +52,7 @@
if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
temp_message[H] = ninjaspeak(temp_message[H])
pick_list -= H
- message = dd_list2text(temp_message, " ")
+ message = list2text(temp_message, " ")
message = replacetext(message, "o", "¤")
message = replacetext(message, "p", "þ")
message = replacetext(message, "l", "£")
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 5788047148..3267f222c7 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -61,7 +61,7 @@ var/const/VOX_PATH = "sound/vox/"
if(!message || announcing_vox > world.time)
return
- var/list/words = stringsplit(trim(message), " ")
+ var/list/words = text2list(trim(message), " ")
var/list/incorrect_words = list()
if(words.len > 30)
@@ -127,4 +127,4 @@ var/const/VOX_PATH = "sound/vox/"
for(var/file in vox_files)
// src << "Downloading [file]"
var/sound/S = sound("[VOX_PATH][file]")
- src << browse_rsc(S)
\ No newline at end of file
+ src << browse_rsc(S)
diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
index 46f78087e6..f518030075 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
@@ -30,7 +30,7 @@
/*var/l = lentext(msg)
if(findtext(msg," ",l,l+1)==0)
msg+=" "*/
- seperate = stringsplit(msg, " ")
+ seperate = text2list(msg, " ")
for(var/Xa = 1,Xa