diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 5f11d9f6230..a86061aac66 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/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 7dca0ae01fb..61784e98c3e 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/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 8f6fd0f632c..b02fc79891e 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/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index fea11184776..241c34d5d89 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -986,5 +986,3 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
usr << list2text(dead_mob_list,",")
if("Clients")
usr << list2text(clients,",")
- if("Joined Clients")
- usr << list2text(joined_player_list,",")
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index d0684048ff0..f284a5fda85 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", "£")
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index 53320e3c525..7f7f977b70b 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 e36ded044df..3267f222c72 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)
diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
index 46f78087e69..f5180300758 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