510 + btime mostly removed + screen overlays overhaul + Paradise sched improvements

This commit is contained in:
Sood
2016-02-02 17:44:19 +01:00
parent 978fa98885
commit 31ac9f6a5b
153 changed files with 829 additions and 3044 deletions

View File

@@ -14,7 +14,7 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
if(!length(line)) continue
if(copytext(line,1,2) == "#") continue
var/list/List = text2list(line,"+")
var/list/List = splittext(line,"+")
if(!List.len) continue
var/rank = ckeyEx(List[1])
@@ -74,7 +74,7 @@ var/list/admin_ranks = list() //list of all ranks with associated rights
if(copytext(line,1,2) == "#") continue
//Split the line at every "-"
var/list/List = text2list(line, "-")
var/list/List = splittext(line, "-")
if(!List.len) continue
//ckey is before the first "-"

View File

@@ -2,7 +2,7 @@
/datum/admins/proc/create_mob(var/mob/user)
if (!create_mob_html)
var/mobjs = null
mobjs = list2text(typesof(/mob), ";")
mobjs = jointext(typesof(/mob), ";")
create_mob_html = file2text('html/create_object.html')
create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")

View File

@@ -3,7 +3,7 @@
/datum/admins/proc/create_object(var/mob/user)
if (!create_object_html)
var/objectjs = null
objectjs = list2text(typesof(/obj), ";")
objectjs = jointext(typesof(/obj), ";")
create_object_html = file2text('html/create_object.html')
create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
@@ -22,7 +22,7 @@
if (!quick_create_object_html)
var/objectjs = null
objectjs = list2text(typesof(path), ";")
objectjs = jointext(typesof(path), ";")
quick_create_object_html = file2text('html/create_object.html')
quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"")

View File

@@ -2,7 +2,7 @@
/datum/admins/proc/create_turf(var/mob/user)
if (!create_turf_html)
var/turfjs = null
turfjs = list2text(typesof(/turf), ";")
turfjs = jointext(typesof(/turf), ";")
create_turf_html = file2text('html/create_object.html')
create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")

View File

@@ -1102,7 +1102,7 @@
message_admins("<span class='notice'>[key_name_admin(usr)] removed [t]</span>", 1)
jobban_remove(t)
href_list["ban"] = 1 // lets it fall through and refresh
var/t_split = text2list(t, " - ")
var/t_split = splittext(t, " - ")
var/key = t_split[1]
var/job = t_split[2]
DB_ban_unban(ckey(key), BANTYPE_JOB_PERMA, job)
@@ -2203,9 +2203,9 @@
alert("Select fewer object types, (max 5)")
return
else if(length(removed_paths))
alert("Removed:\n" + list2text(removed_paths, "\n"))
alert("Removed:\n" + jointext(removed_paths, "\n"))
var/list/offset = text2list(href_list["offset"],",")
var/list/offset = splittext(href_list["offset"],",")
var/number = Clamp(text2num(href_list["object_count"]), 1, 100)
var/X = offset.len > 0 ? text2num(offset[1]) : 0
var/Y = offset.len > 1 ? text2num(offset[2]) : 0

View File

@@ -32,7 +32,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
var/original_msg = msg
//explode the input msg into a list
var/list/msglist = text2list(msg, " ")
var/list/msglist = splittext(msg, " ")
//generate keywords lookup
var/list/surnames = list()
@@ -43,7 +43,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
if(M.mind) indexing += M.mind.name
for(var/string in indexing)
var/list/L = text2list(string, " ")
var/list/L = splittext(string, " ")
var/surname_found = 0
//surnames
for(var/i=L.len, i>=1, i--)

View File

@@ -40,11 +40,11 @@ var/inactive_keys = "None<br>"
var/list/ckeys_with_customitems = list()
var/file = file2text("config/custom_items.txt")
var/lines = text2list(file, "\n")
var/lines = splittext(file, "\n")
for(var/line in lines)
// split & clean up
var/list/Entry = text2list(line, ":")
var/list/Entry = splittext(line, ":")
for(var/i = 1 to Entry.len)
Entry[i] = trim(Entry[i])

View File

@@ -1203,17 +1203,17 @@ Pressure: [env.return_pressure()]"}
switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs", "Clients"))
if("Players")
to_chat(usr, list2text(player_list,","))
to_chat(usr, jointext(player_list,","))
if("Admins")
to_chat(usr, list2text(admins,","))
to_chat(usr, jointext(admins,","))
if("Mobs")
to_chat(usr, list2text(mob_list,","))
to_chat(usr, jointext(mob_list,","))
if("Living Mobs")
to_chat(usr, list2text(living_mob_list,","))
to_chat(usr, jointext(living_mob_list,","))
if("Dead Mobs")
to_chat(usr, list2text(dead_mob_list,","))
to_chat(usr, jointext(dead_mob_list,","))
if("Clients")
to_chat(usr, list2text(clients,","))
to_chat(usr, jointext(clients,","))
/client/proc/cmd_admin_toggle_block(var/mob/M,var/block)

View File

@@ -153,7 +153,7 @@
return
var/datum/browser/clean/popup = new (usr, "\ref[M]_admin_log_viewer", "Attack logs of [M]", 300, 300)
popup.set_content(list2text(M.attack_log, "<br/>"))
popup.set_content(jointext(M.attack_log, "<br/>"))
popup.open()
feedback_add_details("admin_verb","VMAL")

View File

@@ -309,7 +309,7 @@ var/intercom_range_display_status = 0
var/oldcolor = initial(T.color)
var/newcolor = oldcolor
if(badtiles.len>0)
message_admins("Tile [formatJumpTo(T)] (BT: [basetype]) is next to: [list2text(badtiles,", ")]")
message_admins("Tile [formatJumpTo(T)] (BT: [basetype]) is next to: [jointext(badtiles,", ")]")
newcolor="#ff0000"
if(newcolor!=oldcolor)
T.color=newcolor