Goes through and fixes more savefiles.

This commit is contained in:
PJB3005
2015-12-20 21:27:43 +01:00
parent 53b0e23ac1
commit ab6b3706cb
10 changed files with 55 additions and 61 deletions

View File

@@ -110,14 +110,14 @@ var/savefile/Banlist
else else
Banlist.dir.Add("[ckey][computerid]") Banlist.dir.Add("[ckey][computerid]")
Banlist.cd = "/base/[ckey][computerid]" Banlist.cd = "/base/[ckey][computerid]"
to_chat(Banlist["key"], ckey) Banlist["key"] << ckey
to_chat(Banlist["id"], computerid) Banlist["id"] << computerid
to_chat(Banlist["ip"], address) Banlist["ip"] << address
to_chat(Banlist["reason"], reason) Banlist["reason"] << reason
to_chat(Banlist["bannedby"], bannedby) Banlist["bannedby"] << bannedby
to_chat(Banlist["temp"], temp) Banlist["temp"] << temp
if (temp) if (temp)
to_chat(Banlist["minutes"], bantimestamp) Banlist["minutes"] << bantimestamp
return 1 return 1
/proc/RemoveBan(foldername) /proc/RemoveBan(foldername)
@@ -211,17 +211,17 @@ var/savefile/Banlist
Banlist.cd = "/base" Banlist.cd = "/base"
Banlist.dir.Add("trash[i]trashid[i]") Banlist.dir.Add("trash[i]trashid[i]")
Banlist.cd = "/base/trash[i]trashid[i]" Banlist.cd = "/base/trash[i]trashid[i]"
to_chat(Banlist["key"], "trash[i]") Banlist["key"] << "trash[i]"
else else
Banlist.cd = "/base" Banlist.cd = "/base"
Banlist.dir.Add("[last]trashid[i]") Banlist.dir.Add("[last]trashid[i]")
Banlist.cd = "/base/[last]trashid[i]" Banlist.cd = "/base/[last]trashid[i]"
to_chat(Banlist["key"], last) Banlist["key"] << last
to_chat(Banlist["id"], "trashid[i]") Banlist["id"] << "trashid[i]"
to_chat(Banlist["reason"], "Trashban[i].") Banlist["reason"] << "Trashban[i]."
to_chat(Banlist["temp"], a) Banlist["temp"] << a
to_chat(Banlist["minutes"], CMinutes + rand(1,2000)) Banlist["minutes"] << CMinutes + rand(1,2000)
to_chat(Banlist["bannedby"], "trashmin") Banlist["bannedby"] << "trashmin"
last = "trash[i]" last = "trash[i]"
Banlist.cd = "/base" Banlist.cd = "/base"

View File

@@ -35,7 +35,7 @@
var/cleaned = copytext(line,13,length(line)-19) var/cleaned = copytext(line,13,length(line)-19)
if(!cleaned) continue if(!cleaned) continue
F[cleaned] << 1 F[cleaned] << 1
to_chat(F["last_update"], world.realtime) F["last_update"] << world.realtime
diary << "ToR data updated!" diary << "ToR data updated!"
if(usr) to_chat(usr, "ToRban updated.") if(usr) to_chat(usr, "ToRban updated.")
return 1 return 1

View File

@@ -365,11 +365,9 @@ var/global/floorIsLava = 0
to_chat(usr, "Error: you are not an admin!") to_chat(usr, "Error: you are not an admin!")
return return
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\\documents\\\projects\vgstation13\code\\modules\admin\admin.dm:247: var/dat = "<html><head><title>Info on [key]</title></head>"
var/dat = {"<html><head><title>Info on [key]</title></head> var/dat = {"<html><head><title>Info on [key]</title></head>
<body>"} <body>"}
// END AUTOFIX
var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav") var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
var/list/infos var/list/infos
info >> infos info >> infos
@@ -390,19 +388,15 @@ var/global/floorIsLava = 0
if(I.author == usr.key || check_rights(R_PERMISSIONS, show_msg = 0)) if(I.author == usr.key || check_rights(R_PERMISSIONS, show_msg = 0))
dat += "<A href='?src=\ref[src];remove_player_info=[key];remove_index=[i]'>Remove</A>" dat += "<A href='?src=\ref[src];remove_player_info=[key];remove_index=[i]'>Remove</A>"
dat += "<br><br>" dat += "<br><br>"
if(update_file) to_chat(info, infos) if(update_file)
info << infos
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\\documents\\\projects\vgstation13\code\\modules\admin\admin.dm:265: dat += "<br>"
dat += {"<br> dat += {"<br>
<A href='?src=\ref[src];add_player_info=[key]'>Add Comment</A><br> <A href='?src=\ref[src];add_player_info=[key]'>Add Comment</A><br>
</body></html>"} </body></html>"}
// END AUTOFIX
usr << browse(dat, "window=adminplayerinfo;size=480x480") usr << browse(dat, "window=adminplayerinfo;size=480x480")
/datum/admins/proc/access_news_network() //MARKER /datum/admins/proc/access_news_network() //MARKER
set category = "Fun" set category = "Fun"
set name = "Access Newscaster Network" set name = "Access Newscaster Network"

View File

@@ -70,7 +70,7 @@ DEBUG
/proc/appearance_savebanfile() /proc/appearance_savebanfile()
var/savefile/S=new("data/appearance_full.ban") var/savefile/S=new("data/appearance_full.ban")
to_chat(S["keys[0]"], appearance_keylist) S["keys[0]"] << appearance_keylist
/proc/appearance_unban(mob/M) /proc/appearance_unban(mob/M)
appearance_remove("[M.ckey]") appearance_remove("[M.ckey]")
@@ -107,4 +107,4 @@ proc/DB_ban_isappearancebanned(var/playerckey)
while(query.NextRow()) while(query.NextRow())
return 1 return 1
return 0 return 0
*/ */

View File

@@ -87,8 +87,8 @@ DEBUG
jobban_keylist.Add("[ckey] - [job]") jobban_keylist.Add("[ckey] - [job]")
/proc/jobban_savebanfile() /proc/jobban_savebanfile()
var/savefile/S=new("data/job_full.ban") var/savefile/S = new("data/job_full.ban")
to_chat(S["keys[0]"], jobban_keylist) S["keys[0]"] << jobban_keylist
/proc/jobban_unban(mob/M, rank) /proc/jobban_unban(mob/M, rank)
jobban_remove("[M.ckey] - [rank]") jobban_remove("[M.ckey] - [rank]")

View File

@@ -147,14 +147,14 @@ var/savefile/Banlistjob
else else
Banlistjob.dir.Add("[ckey][computerid][rank]") Banlistjob.dir.Add("[ckey][computerid][rank]")
Banlistjob.cd = "/base/[ckey][computerid][rank]" Banlistjob.cd = "/base/[ckey][computerid][rank]"
to_chat(Banlistjob["key"], ckey) Banlistjob["key"] << ckey
to_chat(Banlistjob["id"], computerid) Banlistjob["id"] << computerid
to_chat(Banlistjob["rank"], rank) Banlistjob["rank"] << rank
to_chat(Banlistjob["reason"], reason) Banlistjob["reason"] << reason
to_chat(Banlistjob["bannedby"], bannedby) Banlistjob["bannedby"] << bannedby
to_chat(Banlistjob["temp"], temp) Banlistjob["temp"] << temp
if (temp) if (temp)
to_chat(Banlistjob["minutes"], bantimestamp) Banlistjob["minutes"] << bantimestamp
return 1 return 1
@@ -163,8 +163,8 @@ var/savefile/Banlistjob
var/id var/id
var/rank var/rank
Banlistjob.cd = "/base/[foldername]" Banlistjob.cd = "/base/[foldername]"
Banlistjob["key"] >> key Banlistjob["key"] >> key
Banlistjob["id"] >> id Banlistjob["id"] >> id
Banlistjob["rank"] >> rank Banlistjob["rank"] >> rank
Banlistjob.cd = "/base" Banlistjob.cd = "/base"
@@ -259,17 +259,17 @@ var/savefile/Banlistjob
Banlistjob.cd = "/base" Banlistjob.cd = "/base"
Banlistjob.dir.Add("trash[i]trashid[i]") Banlistjob.dir.Add("trash[i]trashid[i]")
Banlistjob.cd = "/base/trash[i]trashid[i]" Banlistjob.cd = "/base/trash[i]trashid[i]"
to_chat(Banlistjob["key"], "trash[i]") Banlistjob["key"] << "trash[i]"
else else
Banlistjob.cd = "/base" Banlistjob.cd = "/base"
Banlistjob.dir.Add("[last]trashid[i]") Banlistjob.dir.Add("[last]trashid[i]")
Banlistjob.cd = "/base/[last]trashid[i]" Banlistjob.cd = "/base/[last]trashid[i]"
to_chat(Banlistjob["key"], last) Banlistjob["key"] << last
to_chat(Banlistjob["id"], "trashid[i]") Banlistjob["id"] << "trashid[i]"
to_chat(Banlistjob["reason"], "Trashban[i].") Banlistjob["reason"] << "Trashban[i]."
to_chat(Banlistjob["temp"], a) Banlistjob["temp"] << a
to_chat(Banlistjob["minutes"], CMinutes + rand(1,2000)) Banlistjob["minutes"] << CMinutes + rand(1,2000)
to_chat(Banlistjob["bannedby"], "trashmin") Banlistjob["bannedby"] << "trashmin"
last = "trash[i]" last = "trash[i]"
Banlistjob.cd = "/base" Banlistjob.cd = "/base"

View File

@@ -121,7 +121,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
P.timestamp = "[copytext(full_date,1,day_loc)][day_string][copytext(full_date,day_loc+2)]" P.timestamp = "[copytext(full_date,1,day_loc)][day_string][copytext(full_date,day_loc+2)]"
infos += P infos += P
to_chat(info, infos) info << infos
message_admins("<span class='notice'>[key_name_admin(usr)] has edited [key]'s notes.</span>") message_admins("<span class='notice'>[key_name_admin(usr)] has edited [key]'s notes.</span>")
log_admin("[key_name(usr)] has edited [key]'s notes.") log_admin("[key_name(usr)] has edited [key]'s notes.")
@@ -134,7 +134,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
note_list >> note_keys note_list >> note_keys
if(!note_keys) note_keys = list() if(!note_keys) note_keys = list()
if(!note_keys.Find(key)) note_keys += key if(!note_keys.Find(key)) note_keys += key
to_chat(note_list, note_keys) note_list << note_keys
del note_list del note_list
@@ -146,7 +146,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
var/datum/player_info/item = infos[index] var/datum/player_info/item = infos[index]
infos.Remove(item) infos.Remove(item)
to_chat(info, infos) info << infos
message_admins("<span class='notice'>[key_name_admin(usr)] deleted one of [key]'s notes.</span>") message_admins("<span class='notice'>[key_name_admin(usr)] deleted one of [key]'s notes.</span>")
log_admin("[key_name(usr)] deleted one of [key]'s notes.") log_admin("[key_name(usr)] deleted one of [key]'s notes.")

View File

@@ -219,11 +219,11 @@ swapmap
areas-=defarea areas-=defarea
InitializeSwapMaps() InitializeSwapMaps()
locked=1 locked=1
to_chat(S["id"], id) S["id"] << id
to_chat(S["z"], z2-z1+1) S["z"] << z2 - z1 + 1
to_chat(S["y"], y2-y1+1) S["y"] << y2 - y1 + 1
to_chat(S["x"], x2-x1+1) S["x"] << x2 - x1 + 1
to_chat(S["areas"], areas) S["areas"] << areas
for(n in 1 to areas.len) areas[areas[n]]=n for(n in 1 to areas.len) areas[areas[n]]=n
var/oldcd=S.cd var/oldcd=S.cd
for(z=z1,z<=z2,++z) for(z=z1,z<=z2,++z)
@@ -233,7 +233,7 @@ swapmap
for(x=x1,x<=x2,++x) for(x=x1,x<=x2,++x)
S.cd="[x-x1+1]" S.cd="[x-x1+1]"
var/turf/T=locate(x,y,z) var/turf/T=locate(x,y,z)
to_chat(S["type"], T.type) S["type"] << T.type
if(T.loc!=defarea) S["AREA"] << areas[T.loc] if(T.loc!=defarea) S["AREA"] << areas[T.loc]
T.Write(S) T.Write(S)
S.cd=".." S.cd=".."
@@ -382,7 +382,7 @@ swapmap
proc/Save() proc/Save()
if(id==src) return 0 if(id==src) return 0
var/savefile/S=mode?(new):new("map_[id].sav") var/savefile/S=mode?(new):new("map_[id].sav")
to_chat(S, src) S << src
while(locked) sleep(1) while(locked) sleep(1)
if(mode) if(mode)
fdel("map_[id].txt") fdel("map_[id].txt")

View File

@@ -130,7 +130,7 @@ var/const/ALLOW_CENTCOMM = FALSE
if (F["/[tile.y]/[tile.x]"] && F["/[tile.y]/[tile.x]"] != temp) if (F["/[tile.y]/[tile.x]"] && F["/[tile.y]/[tile.x]"] != temp)
CRASH("Mismatch: [tile.type] at [tile.x],[tile.y],[tile.z] ([tile.icon], [tile.icon_state], [tile.dir])") CRASH("Mismatch: [tile.type] at [tile.x],[tile.y],[tile.z] ([tile.icon], [tile.icon_state], [tile.dir])")
else else
to_chat(F["/[tile.y]/[tile.x]"], temp) F["/[tile.y]/[tile.x]"] << temp
#endif #endif
hash = md5("[hash][temp]") hash = md5("[hash][temp]")

View File

@@ -17,12 +17,12 @@
var/savefile/F = new /savefile(src.savefile_path(user)) var/savefile/F = new /savefile(src.savefile_path(user))
to_chat(F["name"], src.name) F["name"] << src.name
to_chat(F["description"], src.description) F["description"] << src.description
to_chat(F["role"], src.role) F["role"] << src.role
to_chat(F["comments"], src.comments) F["comments"] << src.comments
F["version"] << 1 F["version"] << 1
return 1 return 1