modified process scheduler, 510 compatibility, explosions moved to process

this is all very alpha please don't hate me too much if i fucked it up
This commit is contained in:
drsingh
2016-03-12 16:36:00 -08:00
parent d8a2d60915
commit dc4217b498
125 changed files with 767 additions and 820 deletions
+36 -36
View File
@@ -17,25 +17,25 @@ var/global/noir = 0
continue
if (M.client.player_mode)
if (asay && M.client.player_mode_asay)
boutput(M, dd_replaceText(rendered, "%admin_ref%", "\ref[M.client.holder]"))
boutput(M, replacetext(rendered, "%admin_ref%", "\ref[M.client.holder]"))
else
continue
else
boutput(M, dd_replaceText(rendered, "%admin_ref%", "\ref[M.client.holder]")) //this doesnt fail if the placeholder doesnt exist ok dont worry
boutput(M, replacetext(rendered, "%admin_ref%", "\ref[M.client.holder]")) //this doesnt fail if the placeholder doesnt exist ok dont worry
sleep(-1)
/proc/message_coders(var/text) //Shamelessly adapted from message_admins
var/rendered = "<span class=\"admin\"><span class=\"prefix\">CODER LOG:</span> <span class=\"message\">[text]</span></span>"
for (var/mob/M in mobs)
if (M && M.client && M.client.holder && rank_to_level(M.client.holder.rank) >= LEVEL_CODER) //This is for edge cases where a coder needs a goddamn notification when it happens
boutput(M, dd_replaceText(rendered, "%admin_ref%", "\ref[M.client.holder]"))
boutput(M, replacetext(rendered, "%admin_ref%", "\ref[M.client.holder]"))
sleep(-1)
/proc/message_attack(var/text) //Sends a message to folks when an attack goes down
var/rendered = "<span class=\"admin\"><span class=\"prefix\">ATTACK LOG:</span> <span class=\"message\">[text]</span></span>"
for (var/mob/M in mobs)
if (M && M.client && M.client.holder && rank_to_level(M.client.holder.rank) >= LEVEL_MOD && M.client.holder.attacktoggle && !M.client.player_mode)
boutput(M, dd_replaceText(rendered, "%admin_ref%", "\ref[M.client.holder]"))
boutput(M, replacetext(rendered, "%admin_ref%", "\ref[M.client.holder]"))
sleep(-1)
/proc/rank_to_level(var/rank)
@@ -350,9 +350,9 @@ var/global/noir = 0
if(job in list("Tourist","Mining Supervisor","Atmospheric Technician","Vice Officer"))
continue
if(jobban_isbanned(M, job))
jobs += "<a href='?src=\ref[src];action=jobban;type=[job];target=\ref[M]'><font color=red>[dd_replacetext(job, " ", "&nbsp")]</font></a> "
jobs += "<a href='?src=\ref[src];action=jobban;type=[job];target=\ref[M]'><font color=red>[replacetext(job, " ", "&nbsp")]</font></a> "
else
jobs += "<a href='?src=\ref[src];action=jobban;type=[job];target=\ref[M]'>[dd_replacetext(job, " ", "&nbsp")]</a> " //why doesn't this work the stupid cunt
jobs += "<a href='?src=\ref[src];action=jobban;type=[job];target=\ref[M]'>[replacetext(job, " ", "&nbsp")]</a> " //why doesn't this work the stupid cunt
if(jobban_isbanned(M, "Captain"))
jobs += "<a href='?src=\ref[src];action=jobban;type=Captain;target=\ref[M]'><font color=red>Captain</font></a> "
@@ -365,39 +365,39 @@ var/global/noir = 0
jobs += "<a href='?src=\ref[src];action=jobban;type=Head of Security;target=\ref[M]'>Head of Security</a> "
if(jobban_isbanned(M, "Syndicate"))
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Syndicate;target=\ref[M]'><font color=red>[dd_replacetext("Syndicate", " ", "&nbsp")]</font></a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Syndicate;target=\ref[M]'><font color=red>[replacetext("Syndicate", " ", "&nbsp")]</font></a> "
else
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Syndicate;target=\ref[M]'>[dd_replacetext("Syndicate", " ", "&nbsp")]</a> " //why doesn't this work the stupid cunt
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Syndicate;target=\ref[M]'>[replacetext("Syndicate", " ", "&nbsp")]</a> " //why doesn't this work the stupid cunt
if(jobban_isbanned(M, "Special Respawn"))
jobs += " <a href='?src=\ref[src];action=jobban;type=Special Respawn;target=\ref[M]'><font color=red>[dd_replacetext("Special Respawn", " ", "&nbsp")]</font></a> "
jobs += " <a href='?src=\ref[src];action=jobban;type=Special Respawn;target=\ref[M]'><font color=red>[replacetext("Special Respawn", " ", "&nbsp")]</font></a> "
else
jobs += " <a href='?src=\ref[src];action=jobban;type=Special Respawn;target=\ref[M]'>[dd_replacetext("Special Respawn", " ", "&nbsp")]</a> "
jobs += " <a href='?src=\ref[src];action=jobban;type=Special Respawn;target=\ref[M]'>[replacetext("Special Respawn", " ", "&nbsp")]</a> "
if(jobban_isbanned(M, "Engineering Department"))
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Engineering Department;target=\ref[M]'><font color=red>[dd_replacetext("Engineering Department", " ", "&nbsp")]</font></a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Engineering Department;target=\ref[M]'><font color=red>[replacetext("Engineering Department", " ", "&nbsp")]</font></a> "
else
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Engineering Department;target=\ref[M]'>[dd_replacetext("Engineering Department", " ", "&nbsp")]</a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Engineering Department;target=\ref[M]'>[replacetext("Engineering Department", " ", "&nbsp")]</a> "
if(jobban_isbanned(M, "Security Department"))
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Security Department;target=\ref[M]'><font color=red>[dd_replacetext("Security Department", " ", "&nbsp")]</font></a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Security Department;target=\ref[M]'><font color=red>[replacetext("Security Department", " ", "&nbsp")]</font></a> "
else
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Security Department;target=\ref[M]'>[dd_replacetext("Security Department", " ", "&nbsp")]</a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Security Department;target=\ref[M]'>[replacetext("Security Department", " ", "&nbsp")]</a> "
if(jobban_isbanned(M, "Heads of Staff"))
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Heads of Staff;target=\ref[M]'><font color=red>[dd_replacetext("Heads of Staff", " ", "&nbsp")]</font></a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Heads of Staff;target=\ref[M]'><font color=red>[replacetext("Heads of Staff", " ", "&nbsp")]</font></a> "
else
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Heads of Staff;target=\ref[M]'>[dd_replacetext("Heads of Staff", " ", "&nbsp")]</a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Heads of Staff;target=\ref[M]'>[replacetext("Heads of Staff", " ", "&nbsp")]</a> "
if(jobban_isbanned(M, "Everything Except Assistant"))
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Everything Except Assistant;target=\ref[M]'><font color=red>[dd_replacetext("Everything Except Assistant", " ", "&nbsp")]</font></a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Everything Except Assistant;target=\ref[M]'><font color=red>[replacetext("Everything Except Assistant", " ", "&nbsp")]</font></a> "
else
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Everything Except Assistant;target=\ref[M]'>[dd_replacetext("Everything Except Assistant", " ", "&nbsp")]</a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Everything Except Assistant;target=\ref[M]'>[replacetext("Everything Except Assistant", " ", "&nbsp")]</a> "
if(jobban_isbanned(M, "Custom Names"))
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Custom Names;target=\ref[M]'><font color=red>[dd_replacetext("Having a Custom Name", " ", "&nbsp")]</font></a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Custom Names;target=\ref[M]'><font color=red>[replacetext("Having a Custom Name", " ", "&nbsp")]</font></a> "
else
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Custom Names;target=\ref[M]'>[dd_replacetext("Having a Custom Name", " ", "&nbsp")]</a> "
jobs += "<BR><a href='?src=\ref[src];action=jobban;type=Custom Names;target=\ref[M]'>[replacetext("Having a Custom Name", " ", "&nbsp")]</a> "
body = "<br>[jobs]<br><br>"
@@ -1100,7 +1100,7 @@ var/global/noir = 0
if ("jumptocoords")
if(src.level >= LEVEL_SA)
var/list/coords = dd_text2list(href_list["target"], ",")
var/list/coords = splittext(href_list["target"], ",")
if (coords.len < 3) return
usr.client.jumptocoord(text2num(coords[1]), text2num(coords[2]), text2num(coords[3]))
else
@@ -1524,7 +1524,7 @@ var/global/noir = 0
if (newname)
if (length(newname) >= 26) newname = copytext(newname, 1, 26)
newname = dd_replacetext(newname, ">", "'") + " the Blob"
newname = replacetext(newname, ">", "'") + " the Blob"
B.real_name = newname
B.name = newname
@@ -1812,10 +1812,10 @@ var/global/noir = 0
alert("Select five or less object types only, you colossal ass!")
return
else if (length(removed_paths))
alert("Spawning of these objects is blocked:\n" + dd_list2text(removed_paths, "\n"))
alert("Spawning of these objects is blocked:\n" + jointext(removed_paths, "\n"))
return
var/list/offset = dd_text2list(href_list["offset"],",")
var/list/offset = splittext(href_list["offset"],",")
var/number = dd_range(1, 100, text2num(href_list["object_count"]))
var/X = offset.len > 0 ? text2num(offset[1]) : 0
var/Y = offset.len > 1 ? text2num(offset[2]) : 0
@@ -2829,15 +2829,15 @@ var/global/noir = 0
else if (preSearch)
gettxt = preSearch
logType = dd_replaceText(logType, "_string", "")
logType = dd_replaceText(logType, "_log", "")
var/prettyLogName = dd_replaceText(logType, "_", " ")
logType = replacetext(logType, "_string", "")
logType = replacetext(logType, "_log", "")
var/prettyLogName = replacetext(logType, "_", " ")
if (prettyLogName == "alls") prettyLogName = "all"
var/foundCount = 0
if (logType == "alls")
for (var/log in logs)
var/list/logList = logs[log]
prettyLogName = dd_replaceText(log, "_", " ")
prettyLogName = replacetext(log, "_", " ")
var/searchData
var/found
for (var/l in logList)
@@ -2865,9 +2865,9 @@ var/global/noir = 0
dat += "</table>"
dat = "<tr><td colspan='3' class='header text-normal [logType]'><b>Logs</b>[gettxt ? " (Searched for '[gettxt]')" : ""]. Found <b>[foundCount]</b> results.</td></tr>" + dat
dat = dd_replaceText(dat, "%admin_ref%", "\ref[src]")
dat = replacetext(dat, "%admin_ref%", "\ref[src]")
var/adminLogHtml = grabResource("html/admin/admin_log.html")
adminLogHtml = dd_replacetext(adminLogHtml, "<!-- TABLE GOES HERE -->", "[dat]")
adminLogHtml = replacetext(adminLogHtml, "<!-- TABLE GOES HERE -->", "[dat]")
usr << browse(adminLogHtml, "window=[logType]_log;size=750x500")
else
alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
@@ -2895,9 +2895,9 @@ var/global/noir = 0
dat += "</table>"
dat = "<tr><td colspan='3' class='header text-normal [logType]'><b>Logs</b>[gettxt ? " (Searched for '[gettxt]')" : ""]. Found <b>[foundCount]</b> results.</td></tr>" + dat
dat = dd_replaceText(dat, "%admin_ref%", "\ref[src]")
dat = replacetext(dat, "%admin_ref%", "\ref[src]")
var/adminLogHtml = grabResource("html/admin/admin_log.html")
adminLogHtml = dd_replacetext(adminLogHtml, "<!-- TABLE GOES HERE -->", "[dat]")
adminLogHtml = replacetext(adminLogHtml, "<!-- TABLE GOES HERE -->", "[dat]")
usr << browse(adminLogHtml, "window=[logType]_log;size=750x500")
if ("s_rez")
@@ -3087,8 +3087,8 @@ var/global/noir = 0
return
if (alert("Fix a corrupted local panel or force a complete rebuild of the server's panel?","Select Rebuild Type","Local Fix","Server Rebuild") == "Local Fix")
var/jobban_dialog_text = dd_replacetext(grabResource("html/admin/jobbans_list.html"), "null /* raw_bans */", "\"[global_jobban_cache]\"");
usr << browse(dd_replacetext(jobban_dialog_text, "null /* ref_src */", "\"\ref[src]\""),"file=jobbans.html;display=0")
var/jobban_dialog_text = replacetext(grabResource("html/admin/jobbans_list.html"), "null /* raw_bans */", "\"[global_jobban_cache]\"");
usr << browse(replacetext(jobban_dialog_text, "null /* ref_src */", "\"\ref[src]\""),"file=jobbans.html;display=0")
current_jobbans_rev = global_jobban_cache_rev
jobbans_last_cached = world.timeofday
boutput(usr, "Refresh complete, your panel now matches the server's. If you need to edit a ban that was created after the build time shown please do a server rebuild.")
@@ -3117,8 +3117,8 @@ var/global/noir = 0
set background = 1
if (src.level >= LEVEL_CODER)
if (current_jobbans_rev == 0 || current_jobbans_rev < global_jobban_cache_rev) // the cache is newer than our panel
var/jobban_dialog_text = dd_replacetext(grabResource("html/admin/jobbans_list.html"), "null /* raw_bans */", "\"[global_jobban_cache]\"");
usr << browse(dd_replacetext(jobban_dialog_text, "null /* ref_src */", "\"\ref[src]\""),"file=jobbans.html;display=0")
var/jobban_dialog_text = replacetext(grabResource("html/admin/jobbans_list.html"), "null /* raw_bans */", "\"[global_jobban_cache]\"");
usr << browse(replacetext(jobban_dialog_text, "null /* ref_src */", "\"\ref[src]\""),"file=jobbans.html;display=0")
current_jobbans_rev = global_jobban_cache_rev
jobbans_last_cached = world.timeofday
+1 -1
View File
@@ -1170,5 +1170,5 @@ var/list/fun_images = list()
else
var/changelogHtml = grabResource("html/changelog.html")
var/data = admin_changelog:html
changelogHtml = dd_replacetext(changelogHtml, "<!-- HTML GOES HERE -->", "[data]")
changelogHtml = replacetext(changelogHtml, "<!-- HTML GOES HERE -->", "[data]")
src.Browse(changelogHtml, "window=adminchanges;size=500x650;title=Admin+Changelog;")
+12 -12
View File
@@ -559,11 +559,11 @@
var/CMinutes = (world.realtime / 10) / 60
var/bansHtml = grabResource("html/admin/banPanel.html")
var/windowName = "banPanel"
bansHtml = dd_replacetext(bansHtml, "null /* window_name */", "\'[windowName]\'")
bansHtml = dd_replacetext(bansHtml, "null /* ref_src */", "\'\ref[src]\'")
bansHtml = dd_replacetext(bansHtml, "null /* cminutes */", "[CMinutes]")
bansHtml = replacetext(bansHtml, "null /* window_name */", "\'[windowName]\'")
bansHtml = replacetext(bansHtml, "null /* ref_src */", "\'\ref[src]\'")
bansHtml = replacetext(bansHtml, "null /* cminutes */", "[CMinutes]")
if (centralConn)
bansHtml = dd_replacetext(bansHtml, "null /* api_key */", "\'[md5(config.extserver_web_token)]\'")
bansHtml = replacetext(bansHtml, "null /* api_key */", "\'[md5(config.extserver_web_token)]\'")
usr << browse(bansHtml,"window=[windowName];size=1080x500")
@@ -607,11 +607,11 @@
var/list/log = dd_file2list(banLog)
var/lastIndex = (log.len > 1 ? log.len - 1 : 1)
var/lastRow = log[lastIndex]
var/list/rowDetails = dd_text2list(lastRow, ":")
var/list/rowDetails = splittext(lastRow, ":")
lastID = text2num(rowDetails[1])
var/newID = lastID + 1
var/append = list2json(data)
var/append = json_encode(data)
var/logFile = file(banLog)
boutput(logFile, "[newID]:[append]")
@@ -652,7 +652,7 @@
var/logID = row
if (!row) break
logTheThing("debug", null, null, "UPDATE LOCAL DEBUG: logID: [logID]")
var/list/details = json2list(row[logID])
var/list/details = json_decode(row[logID])
logTheThing("debug", null, null, "UPDATE LOCAL DEBUG: details: [list2params(details)]")
var/type = details["type"]
details.Remove(details["type"])
@@ -678,7 +678,7 @@
for (var/e = 1, e <= data.len, e++) //each ban
var/logID = data[e]
logTheThing("debug", null, null, "UPDATE LOCAL DEBUG: logID: [logID]")
var/list/details = json2list(data[logID])
var/list/details = json_decode(data[logID])
logTheThing("debug", null, null, "UPDATE LOCAL DEBUG: details: [list2params(details)]")
var/type = details["type"]
details.Remove(details["type"])
@@ -721,7 +721,7 @@
for (var/i = 1, i <= log.len, i++)
var/row = log[i]
logTheThing("debug", null, null, "UPDATE REMOTE DEBUG: row: [row]")
var/list/rowDetails = dd_text2list(row, ":")
var/list/rowDetails = splittext(row, ":")
logTheThing("debug", null, null, "UPDATE REMOTE DEBUG: rowDetails: [list2params(rowDetails)]")
var/logID = rowDetails[1]
logID = text2num(logID)
@@ -732,11 +732,11 @@
logTheThing("debug", null, null, "UPDATE REMOTE DEBUG: details: [details]")
parsedLog["[logID]"] = details
logTheThing("debug", null, null, "UPDATE REMOTE DEBUG: parsedLog: [list2json(parsedLog)]")
logTheThing("debug", null, null, "UPDATE REMOTE DEBUG: parsedLog: [json_encode(parsedLog)]")
//Send it to the remote so it can update
var/query[] = new()
query["bans"] = list2json(parsedLog)
query["bans"] = json_encode(parsedLog)
queryAPI("bans/updateRemote", query)
return 1
@@ -759,7 +759,7 @@
var/list/log = dd_file2list(banLog)
var/lastIndex = (log.len > 1 ? log.len - 1 : 1)
var/lastRow = log[lastIndex]
log = dd_text2list(lastRow, ":")
log = splittext(lastRow, ":")
latestLocalID = log[1]
//Get the latest logID from the API
+9 -9
View File
@@ -3,30 +3,30 @@
set background = 1
if (!create_mob_html)
var/mobjs = null
mobjs = dd_list2text(typesof(/mob), ";")
mobjs = jointext(typesof(/mob), ";")
create_mob_html = grabResource("html/admin/create_object.html")
create_mob_html = dd_replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
if (user) user << browse(dd_replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "window=create_mob;size=530x490")
if (user) user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "window=create_mob;size=530x490")
/var/create_object_html = null
/datum/admins/proc/create_object(var/mob/user)
set background = 1
if (!create_object_html)
var/objectjs = null
objectjs = dd_list2text(typesof(/obj), ";")
objectjs = jointext(typesof(/obj), ";")
create_object_html = grabResource("html/admin/create_object.html")
create_object_html = dd_replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
if (user) user << browse(dd_replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=530x490")
if (user) user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=530x490")
/var/create_turf_html = null
/datum/admins/proc/create_turf(var/mob/user)
set background = 1
if (!create_turf_html)
var/turfjs = null
turfjs = dd_list2text(typesof(/turf), ";")
turfjs = jointext(typesof(/turf), ";")
create_turf_html = grabResource("html/admin/create_object.html")
create_turf_html = dd_replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")
create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")
if (user) user << browse(dd_replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=530x490")
if (user) user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=530x490")
+34 -6
View File
@@ -252,6 +252,7 @@
if (listargs == null) return
for (var/atom/theinstance in world)
LAGCHECK(80)
if (!istype(theinstance, thetype))
continue
counter++
@@ -422,19 +423,46 @@
for(var/V in blocked)
if(V == hsbitem)
boutput(usr, "Can't delete that you jerk!")
return
return
if(hsbitem)
src.delete_state = DELETE_RUNNING
src.verbs += /client/proc/cmd_debug_del_all_cancel
src.verbs += /client/proc/cmd_debug_del_all_check
boutput(usr, "Deleting [hsbitem]...")
var/numdeleted = 0
for(var/atom/O in world)
if(istype(O, hsbitem))
qdel(O)
del(O)
numdeleted ++
LAGCHECK(80)
if (src.delete_state == DELETE_STOP)
break
else if (src.delete_state == DELETE_CHECK)
boutput(usr, "Deleted [numdeleted] instances of [hsbitem] so far.")
src.delete_state = DELETE_RUNNING
if(numdeleted == 0) boutput(usr, "No instances of [hsbitem] found!")
else boutput(usr, "Deleted [numdeleted] instances of [hsbitem]!")
logTheThing("admin", src, null, "has deleted all instances of [hsbitem].")
logTheThing("diary", src, null, "has deleted all instances of [hsbitem].", "admin")
message_admins("[key_name(src)] has deleted all instances of [hsbitem].")
logTheThing("admin", src, null, "has deleted [numdeleted] instances of [hsbitem].")
logTheThing("diary", src, null, "has deleted [numdeleted] instances of [hsbitem].", "admin")
message_admins("[key_name(src)] has deleted [numdeleted] instances of [hsbitem].")
src.verbs -= /client/proc/cmd_debug_del_all_cancel
src.verbs -= /client/proc/cmd_debug_del_all_check
src.delete_state = DELETE_STOP
// cancels your del_all in process, if one is running
/client/proc/cmd_debug_del_all_cancel()
set category = "Debug"
set name = "Del-All Cancel"
src.delete_state = DELETE_STOP
// makes del_all print how much is currently deleted
/client/proc/cmd_debug_del_all_check()
set category = "Debug"
set name = "Del-All Progress"
src.delete_state = DELETE_CHECK
// fuck this
// fuck
@@ -651,7 +679,7 @@ body
usr.show_text("\The [O] does not have a reagent holder or is empty.", "red")
/client/proc/showMyCoords(var/x, var/y, var/z)
return dd_replaceText(showCoords(x,y,z), "%admin_ref%", "\ref[src.holder]")
return replacetext(showCoords(x,y,z), "%admin_ref%", "\ref[src.holder]")
/client/proc/print_instance(var/atom/theinstance)
if (isarea(theinstance))
+11 -15
View File
@@ -5,12 +5,11 @@
alert("UM, EXCUSE ME?? YOU AREN'T AN ADMIN, GET DOWN FROM THERE!")
usr << sound('sound/misc/poo2.ogg')
return
var/dat = text("")
dat += text("")
var/query = text("")
var/dat = ""
dat += ""
var/query = ""
query += config.player_notes_baseurl
query += "playernotes.php?action=getnotes&ckey="
query += text("[player]")
query += "playernotes.php?action=getnotes&ckey=[player]"
var/http[] = world.Export(url_encode(query,1))
if(!http)
@@ -29,16 +28,13 @@
usr << browse(dat, "window=notesp;size=875x400")
return
var/content = text("")
var/content = ""
content += file2text(http["CONTENT"])
var/deletelinkpre = text("<A href='?src=\ref[src];action=notes2;target=[player];type=del;id=")
var/deletelinkpost = text("'>(DEL)")
var/regex/R = new("/!!ID(\\d+)/[deletelinkpre]$1[deletelinkpost]/")
var/deletelinkpre = "<A href='?src=\ref[src];action=notes2;target=[player];type=del;id="
var/deletelinkpost = "'>(DEL)"
var/newcontent = R.Replace(content)
while(newcontent)
content = newcontent
newcontent = R.ReplaceNext(content)
var/regex/R = new("!!ID(\\d+)", "g")
content = R.Replace(content, "[deletelinkpre]$1[deletelinkpost]")
dat += content
dat = "<h1>Player Notes for <b>[player]</b></h1><HR></FONT><br><A href='?src=\ref[src];action=notes2;target=[player];type=add'>Add Note</A><br><HR>[dat]"
@@ -57,8 +53,8 @@
else
server = "server"
notetext = dd_replacetext(notetext, "'", " ")
notetext = dd_replacetext(notetext, "\"", " ")
notetext = replacetext(notetext, "'", " ")
notetext = replacetext(notetext, "\"", " ")
var/note = notetext
var/query = text("")
+1 -1
View File
@@ -915,7 +915,7 @@
var/new_name = input(usr, "Please select a name:", "Polymorph Menu") as null|text
var/list/bad_characters = list("_", "'", "\"", "<", ">", ";", "[", "]", "{", "}", "|", "\\")
for(var/c in bad_characters)
new_name = dd_replacetext(new_name, c, "")
new_name = replacetext(new_name, c, "")
if(new_name)
if(length(new_name) >= 26)