Fix previous commit for BS12.

Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2014-01-08 11:49:15 +00:00
parent 68ae21fac3
commit 794be2b31e
8 changed files with 17 additions and 19 deletions

View File

@@ -184,7 +184,7 @@
if(type == "config") if(type == "config")
switch (name) switch (name)
if ("resource_urls") if ("resource_urls")
config.resource_urls = stringsplit(value, " ") config.resource_urls = text2list(value, " ")
if ("admin_legacy_system") if ("admin_legacy_system")
config.admin_legacy_system = 1 config.admin_legacy_system = 1

View File

@@ -262,7 +262,7 @@
if(locked) if(locked)
user << "\red Circuit controls are locked." user << "\red Circuit controls are locked."
return 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)) 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) if(!input)
usr << "No input found please hang up and try your call again." usr << "No input found please hang up and try your call again."

View File

@@ -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() /obj/item/device/uplink/proc/generate_nanoui_items()
var/items_nano[0] var/items_nano[0]
for(var/D in ItemList) 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 != 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 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()) 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 else
var/itemname = O[3] var/itemname = O[3]
items_nano[items_nano.len]["items"] += list(list("Name" = itemname, "Cost" = cost, "obj_path" = path_text)) items_nano[items_nano.len]["items"] += list(list("Name" = itemname, "Cost" = cost, "obj_path" = path_text))
return items_nano 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 //Halfassed fix for href exploit ~Z
for(var/D in ItemList) for(var/D in ItemList)
var/list/O = stringsplit(D, ":") var/list/O = text2list(D, ":")
if(O.len>0) if(O.len>0)
valid_items += O[1] 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 var/category_items = 1 //To prevent stupid :P
for(var/D in ItemList) 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 != 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 if(O.len == 1) //If there is one item, it's probably a title
dat += "<b>[O[1]]</b><br>" dat += "<b>[O[1]]</b><br>"
@@ -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) /obj/item/device/uplink/Topic(href, href_list)
if (href_list["buy_item"]) if (href_list["buy_item"])
if(href_list["buy_item"] == "random") if(href_list["buy_item"] == "random")
var/boughtItem = chooseRandomItem() var/boughtItem = chooseRandomItem()
if(boughtItem) 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) /obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
var/title = "Syndicate Uplink" var/title = "Syndicate Uplink"
var/data[0] var/data[0]
data["crystals"] = uses data["crystals"] = uses
data["nano_items"] = nanoui_items data["nano_items"] = nanoui_items
data["welcome"] = welcome data["welcome"] = welcome
// update the ui if it exists, returns null if no ui is passed/found // 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) if (!ui)
// the ui does not exist, so we'll create a new() one // 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 // 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) ui = new(user, src, ui_key, "uplink.tmpl", title, 450, 600)
// when the ui is first opened this is the data it will use // 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 // open the new ui window
ui.open() 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) usr.set_machine(src)
if(href_list["lock"]) if(href_list["lock"])
toggle() toggle()
ui.close() ui.close()
return 1 return 1
if(..(href, href_list) == 1) if(..(href, href_list) == 1)

View File

@@ -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,",") usr << list2text(dead_mob_list,",")
if("Clients") if("Clients")
usr << list2text(clients,",") usr << list2text(clients,",")
if("Joined Clients")
usr << list2text(joined_player_list,",")

View File

@@ -12,7 +12,7 @@
if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
temp_message[H] = ninjaspeak(temp_message[H]) temp_message[H] = ninjaspeak(temp_message[H])
pick_list -= H pick_list -= H
message = dd_list2text(temp_message, " ") message = list2text(temp_message, " ")
message = replacetext(message, "o", "<22>") message = replacetext(message, "o", "<22>")
message = replacetext(message, "p", "<22>") message = replacetext(message, "p", "<22>")
message = replacetext(message, "l", "<22>") message = replacetext(message, "l", "<22>")

View File

@@ -52,7 +52,7 @@
if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
temp_message[H] = ninjaspeak(temp_message[H]) temp_message[H] = ninjaspeak(temp_message[H])
pick_list -= H pick_list -= H
message = dd_list2text(temp_message, " ") message = list2text(temp_message, " ")
message = replacetext(message, "o", "<22>") message = replacetext(message, "o", "<22>")
message = replacetext(message, "p", "<22>") message = replacetext(message, "p", "<22>")
message = replacetext(message, "l", "<22>") message = replacetext(message, "l", "<22>")

View File

@@ -61,7 +61,7 @@ var/const/VOX_PATH = "sound/vox/"
if(!message || announcing_vox > world.time) if(!message || announcing_vox > world.time)
return return
var/list/words = stringsplit(trim(message), " ") var/list/words = text2list(trim(message), " ")
var/list/incorrect_words = list() var/list/incorrect_words = list()
if(words.len > 30) if(words.len > 30)

View File

@@ -30,7 +30,7 @@
/*var/l = lentext(msg) /*var/l = lentext(msg)
if(findtext(msg," ",l,l+1)==0) if(findtext(msg," ",l,l+1)==0)
msg+=" "*/ msg+=" "*/
seperate = stringsplit(msg, " ") seperate = text2list(msg, " ")
for(var/Xa = 1,Xa<seperate.len,Xa++) for(var/Xa = 1,Xa<seperate.len,Xa++)
var/next = Xa + 1 var/next = Xa + 1
@@ -65,7 +65,7 @@
if(!word) if(!word)
text = "[pick(heard_words)]" text = "[pick(heard_words)]"
else else
text = pick(stringsplit(word, " ")) text = pick(text2list(word, " "))
if(lentext(text)==1) if(lentext(text)==1)
text=uppertext(text) text=uppertext(text)
else else