"
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 18efe723f0..944cdc552a 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -106,7 +106,7 @@ var/savefile/Banlist
Banlist.cd = "/base"
if ( Banlist.dir.Find("[ckey][computerid]") )
- usr << text("Ban already exists.")
+ to_chat(usr, "Ban already exists.")
return 0
else
Banlist.dir.Add("[ckey][computerid]")
@@ -208,17 +208,17 @@ var/savefile/Banlist
Banlist.cd = "/base"
Banlist.dir.Add("trash[i]trashid[i]")
Banlist.cd = "/base/trash[i]trashid[i]"
- Banlist["key"] << "trash[i]"
+ to_chat(Banlist["key"], "trash[i]")
else
Banlist.cd = "/base"
Banlist.dir.Add("[last]trashid[i]")
Banlist.cd = "/base/[last]trashid[i]"
Banlist["key"] << last
- Banlist["id"] << "trashid[i]"
- Banlist["reason"] << "Trashban[i]."
+ to_chat(Banlist["id"], "trashid[i]")
+ to_chat(Banlist["reason"], "Trashban[i].")
Banlist["temp"] << a
Banlist["minutes"] << CMinutes + rand(1,2000)
- Banlist["bannedby"] << "trashmin"
+ to_chat(Banlist["bannedby"], "trashmin")
last = "trash[i]"
Banlist.cd = "/base"
diff --git a/code/modules/admin/ToRban.dm b/code/modules/admin/ToRban.dm
index f4ddd3e3f2..1e2d5ef49c 100644
--- a/code/modules/admin/ToRban.dm
+++ b/code/modules/admin/ToRban.dm
@@ -37,7 +37,8 @@
F[cleaned] << 1
F["last_update"] << world.realtime
log_misc("ToR data updated!")
- if(usr) usr << "ToRban updated."
+ if(usr)
+ to_chat(usr, "ToRban updated.")
return 1
log_misc("ToR data update aborted: no data.")
return 0
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 500bc42633..c9e1546a63 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -10,7 +10,7 @@ var/global/floorIsLava = 0
for(var/client/C in admins)
if((R_ADMIN|R_MOD) & C.holder.rights)
- C << msg
+ to_chat(C,msg)
/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
var/rendered = "ATTACK: [text]"
@@ -18,12 +18,12 @@ var/global/floorIsLava = 0
if((R_ADMIN|R_MOD) & C.holder.rights)
if(C.is_preference_enabled(/datum/client_preference/mod/show_attack_logs))
var/msg = rendered
- C << msg
+ to_chat(C,msg)
proc/admin_notice(var/message, var/rights)
for(var/mob/M in mob_list)
if(check_rights(rights, 0, M))
- M << message
+ to_chat(M,message)
///////////////////////////////////////////////////////////////////////////////////////////////Panels
@@ -33,12 +33,12 @@ proc/admin_notice(var/message, var/rights)
set desc="Edit player (respawn, ban, heal, etc)"
if(!M)
- usr << "You seem to be selecting a mob that doesn't exist anymore."
+ to_chat(usr, "You seem to be selecting a mob that doesn't exist anymore.")
return
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
var/body = "Options for [M.key]"
@@ -222,7 +222,7 @@ proc/admin_notice(var/message, var/rights)
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
PlayerNotesPage(1)
@@ -280,7 +280,7 @@ proc/admin_notice(var/message, var/rights)
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
var/dat = "Info on [key]"
dat += ""
@@ -330,7 +330,7 @@ proc/admin_notice(var/message, var/rights)
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
var/dat
dat = text("Admin NewscasterAdmin Newscaster Unit
")
@@ -561,8 +561,8 @@ proc/admin_notice(var/message, var/rights)
else
dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
- //world << "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]"
- //world << "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]"
+ //to_world("Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]")
+ //to_world("Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]")
usr << browse(dat, "window=admincaster_main;size=400x600")
onclose(usr, "admincaster_main")
@@ -645,7 +645,7 @@ proc/admin_notice(var/message, var/rights)
if(confirm == "Cancel")
return
if(confirm == "Yes")
- world << "Restarting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!"
+ to_world("Restarting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!")
log_admin("[key_name(usr)] initiated a reboot.")
feedback_set_details("end_error","admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]")
@@ -669,7 +669,7 @@ proc/admin_notice(var/message, var/rights)
if(!check_rights(R_SERVER,0))
message = sanitize(message, 500, extra = 0)
message = replacetext(message, "\n", "
") // required since we're putting it in a tag
- world << "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:[message]
"
+ to_world("[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:[message]
")
log_admin("Announce: [key_name(usr)] : [message]")
feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -710,7 +710,7 @@ var/datum/announcement/minor/admin_min_announcer = new
if(!channel) //They picked a channel
return
- to_chat(usr,"Intercom Convo Directions
Start the conversation with the sender, a pipe (|), and then the message on one line. Then hit enter to \
+ to_chat(usr, "Intercom Convo Directions
Start the conversation with the sender, a pipe (|), and then the message on one line. Then hit enter to \
add another line, and type a (whole) number of seconds to pause between that message, and the next message, then repeat the message syntax up to 20 times. For example:
\
--- --- ---
\
Some Guy|Hello guys, what's up?
\
@@ -734,12 +734,12 @@ var/datum/announcement/minor/admin_min_announcer = new
//Time to find how they screwed up.
//Wasn't the right length
if((decomposed.len) % 3) //+1 to accomidate the lack of a wait time for the last message
- to_chat(usr,"You passed [decomposed.len] segments (senders+messages+pauses). You must pass a multiple of 3, minus 1 (no pause after the last message). That means a sender and message on every other line (starting on the first), separated by a pipe character (|), and a number every other line that is a pause in seconds.")
+ to_chat(usr, "You passed [decomposed.len] segments (senders+messages+pauses). You must pass a multiple of 3, minus 1 (no pause after the last message). That means a sender and message on every other line (starting on the first), separated by a pipe character (|), and a number every other line that is a pause in seconds.")
return
//Too long a conversation
if((decomposed.len / 3) > 20)
- to_chat(usr,"This conversation is too long! 20 messages maximum, please.")
+ to_chat(usr, "This conversation is too long! 20 messages maximum, please.")
return
//Missed some sleeps, or sanitized to nothing.
@@ -748,24 +748,24 @@ var/datum/announcement/minor/admin_min_announcer = new
//Sanitize sender
var/clean_sender = sanitize(decomposed[i])
if(!clean_sender)
- to_chat(usr,"One part of your conversation was not able to be sanitized. It was the sender of the [(i+2)/3]\th message.")
+ to_chat(usr, "One part of your conversation was not able to be sanitized. It was the sender of the [(i+2)/3]\th message.")
return
decomposed[i] = clean_sender
//Sanitize message
var/clean_message = sanitize(decomposed[++i])
if(!clean_message)
- to_chat(usr,"One part of your conversation was not able to be sanitized. It was the body of the [(i+2)/3]\th message.")
+ to_chat(usr, "One part of your conversation was not able to be sanitized. It was the body of the [(i+2)/3]\th message.")
return
decomposed[i] = clean_message
//Sanitize wait time
var/clean_time = text2num(decomposed[++i])
if(!isnum(clean_time))
- to_chat(usr,"One part of your conversation was not able to be sanitized. It was the wait time after the [(i+2)/3]\th message.")
+ to_chat(usr, "One part of your conversation was not able to be sanitized. It was the wait time after the [(i+2)/3]\th message.")
return
if(clean_time > 60)
- to_chat(usr,"Max 60 second wait time between messages for sanity's sake please.")
+ to_chat(usr, "Max 60 second wait time between messages for sanity's sake please.")
return
decomposed[i] = clean_time
@@ -791,9 +791,9 @@ var/datum/announcement/minor/admin_min_announcer = new
config.ooc_allowed = !(config.ooc_allowed)
if (config.ooc_allowed)
- world << "The OOC channel has been globally enabled!"
+ to_world("The OOC channel has been globally enabled!")
else
- world << "The OOC channel has been globally disabled!"
+ to_world("The OOC channel has been globally disabled!")
log_and_message_admins("toggled OOC.")
feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -807,9 +807,9 @@ var/datum/announcement/minor/admin_min_announcer = new
config.looc_allowed = !(config.looc_allowed)
if (config.looc_allowed)
- world << "The LOOC channel has been globally enabled!"
+ to_world("The LOOC channel has been globally enabled!")
else
- world << "The LOOC channel has been globally disabled!"
+ to_world("The LOOC channel has been globally disabled!")
log_and_message_admins("toggled LOOC.")
feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -824,9 +824,9 @@ var/datum/announcement/minor/admin_min_announcer = new
config.dsay_allowed = !(config.dsay_allowed)
if (config.dsay_allowed)
- world << "Deadchat has been globally enabled!"
+ to_world("Deadchat has been globally enabled!")
else
- world << "Deadchat has been globally disabled!"
+ to_world("Deadchat has been globally disabled!")
log_admin("[key_name(usr)] toggled deadchat.")
message_admins("[key_name_admin(usr)] toggled deadchat.", 1)
feedback_add_details("admin_verb","TDSAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc
@@ -881,7 +881,7 @@ var/datum/announcement/minor/admin_min_announcer = new
feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return 1
else
- usr << "Error: Start Now: Game has already started."
+ to_chat(usr, "Error: Start Now: Game has already started.")
return 0
/datum/admins/proc/toggleenter()
@@ -890,9 +890,9 @@ var/datum/announcement/minor/admin_min_announcer = new
set name="Toggle Entering"
config.enter_allowed = !(config.enter_allowed)
if (!(config.enter_allowed))
- world << "New players may no longer enter the game."
+ to_world("New players may no longer enter the game.")
else
- world << "New players may now enter the game."
+ to_world("New players may now enter the game.")
log_admin("[key_name(usr)] toggled new player game entering.")
message_admins("[key_name_admin(usr)] toggled new player game entering.", 1)
world.update_status()
@@ -904,9 +904,9 @@ var/datum/announcement/minor/admin_min_announcer = new
set name="Toggle AI"
config.allow_ai = !( config.allow_ai )
if (!( config.allow_ai ))
- world << "The AI job is no longer chooseable."
+ to_world("The AI job is no longer chooseable.")
else
- world << "The AI job is chooseable now."
+ to_world("The AI job is chooseable now.")
log_admin("[key_name(usr)] toggled AI allowed.")
world.update_status()
feedback_add_details("admin_verb","TAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -917,9 +917,9 @@ var/datum/announcement/minor/admin_min_announcer = new
set name="Toggle Respawn"
config.abandon_allowed = !(config.abandon_allowed)
if(config.abandon_allowed)
- world << "You may now respawn."
+ to_world("You may now respawn.")
else
- world << "You may no longer respawn :("
+ to_world("You may no longer respawn :(")
message_admins("[key_name_admin(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].", 1)
log_admin("[key_name(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].")
world.update_status()
@@ -956,10 +956,10 @@ var/datum/announcement/minor/admin_min_announcer = new
return //alert("Round end delayed", null, null, null, null, null)
round_progressing = !round_progressing
if (!round_progressing)
- world << "The game start has been delayed."
+ to_world("The game start has been delayed.")
log_admin("[key_name(usr)] delayed the game.")
else
- world << "The game will start soon."
+ to_world("The game will start soon.")
log_admin("[key_name(usr)] removed the delay.")
feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -994,7 +994,7 @@ var/datum/announcement/minor/admin_min_announcer = new
if(!usr.client.holder) return
if( alert("Reboot server?",,"Yes","No") == "No")
return
- world << "Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!"
+ to_world("Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!")
log_admin("[key_name(usr)] initiated an immediate reboot.")
feedback_set_details("end_error","immediate admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]")
@@ -1088,18 +1088,18 @@ var/datum/announcement/minor/admin_min_announcer = new
if(!check_rights(R_SPAWN)) return
if(!custom_items)
- usr << "Custom item list is null."
+ to_chat(usr, "Custom item list is null.")
return
if(!custom_items.len)
- usr << "Custom item list not populated."
+ to_chat(usr, "Custom item list not populated.")
return
for(var/assoc_key in custom_items)
- usr << "[assoc_key] has:"
+ to_chat(usr, "[assoc_key] has:")
var/list/current_items = custom_items[assoc_key]
for(var/datum/custom_item/item in current_items)
- usr << "- name: [item.name] icon: [item.item_icon] path: [item.item_path] desc: [item.item_desc]"
+ to_chat(usr, "- name: [item.name] icon: [item.item_icon] path: [item.item_path] desc: [item.item_desc]")
/datum/admins/proc/spawn_plant(seedtype in plant_controller.seeds)
set category = "Debug"
@@ -1154,10 +1154,10 @@ var/datum/announcement/minor/admin_min_announcer = new
set name = "Show Traitor Panel"
if(!istype(M))
- usr << "This can only be used on instances of type /mob"
+ to_chat(usr, "This can only be used on instances of type /mob")
return
if(!M.mind)
- usr << "This mob has no mind!"
+ to_chat(usr, "This mob has no mind!")
return
M.mind.edit_memory()
@@ -1243,9 +1243,9 @@ var/datum/announcement/minor/admin_min_announcer = new
set name="Toggle tinted welding helmets."
config.welder_vision = !( config.welder_vision )
if (config.welder_vision)
- world << "Reduced welder vision has been enabled!"
+ to_world("Reduced welder vision has been enabled!")
else
- world << "Reduced welder vision has been disabled!"
+ to_world("Reduced welder vision has been disabled!")
log_admin("[key_name(usr)] toggled welder vision.")
message_admins("[key_name_admin(usr)] toggled welder vision.", 1)
feedback_add_details("admin_verb","TTWH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -1256,9 +1256,9 @@ var/datum/announcement/minor/admin_min_announcer = new
set name="Toggle guests"
config.guests_allowed = !(config.guests_allowed)
if (!(config.guests_allowed))
- world << "Guests may no longer enter the game."
+ to_world("Guests may no longer enter the game.")
else
- world << "Guests may now enter the game."
+ to_world("Guests may now enter the game.")
log_admin("[key_name(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.")
message_admins("[key_name_admin(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.", 1)
feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -1268,21 +1268,21 @@ var/datum/announcement/minor/admin_min_announcer = new
for(var/mob/living/silicon/S in mob_list)
ai_number++
if(isAI(S))
- usr << "AI [key_name(S, usr)]'s laws:"
+ to_chat(usr, "AI [key_name(S, usr)]'s laws:")
else if(isrobot(S))
var/mob/living/silicon/robot/R = S
- usr << "CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"]: laws:"
+ to_chat(usr, "CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"]: laws:")
else if (ispAI(S))
- usr << "pAI [key_name(S, usr)]'s laws:"
+ to_chat(usr, "pAI [key_name(S, usr)]'s laws:")
else
- usr << "SOMETHING SILICON [key_name(S, usr)]'s laws:"
+ to_chat(usr, "SOMETHING SILICON [key_name(S, usr)]'s laws:")
if (S.laws == null)
- usr << "[key_name(S, usr)]'s laws are null?? Contact a coder."
+ to_chat(usr, "[key_name(S, usr)]'s laws are null?? Contact a coder.")
else
S.laws.show_laws(usr)
if(!ai_number)
- usr << "No AIs located" //Just so you know the thing is actually working and not just ignoring you.
+ to_chat(usr, "No AIs located") //Just so you know the thing is actually working and not just ignoring you.
/datum/admins/proc/show_skills()
set category = "Admin"
@@ -1291,7 +1291,7 @@ var/datum/announcement/minor/admin_min_announcer = new
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
var/mob/living/carbon/human/M = input("Select mob.", "Select mob.") as null|anything in human_mob_list
@@ -1403,16 +1403,16 @@ var/datum/announcement/minor/admin_min_announcer = new
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
if(!ticker || !ticker.mode)
- usr << "Mode has not started."
+ to_chat(usr, "Mode has not started.")
return
var/antag_type = input("Choose a template.","Force Latespawn") as null|anything in all_antag_types
if(!antag_type || !all_antag_types[antag_type])
- usr << "Aborting."
+ to_chat(usr, "Aborting.")
return
var/datum/antagonist/antag = all_antag_types[antag_type]
@@ -1427,11 +1427,11 @@ var/datum/announcement/minor/admin_min_announcer = new
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins) || !check_rights(R_ADMIN))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
if(!ticker || !ticker.mode)
- usr << "Mode has not started."
+ to_chat(usr, "Mode has not started.")
return
log_and_message_admins("attempting to force mode autospawn.")
@@ -1469,7 +1469,7 @@ var/datum/announcement/minor/admin_min_announcer = new
var/msg = "[key_name(usr)] has modified [H.ckey]'s telecrystals to [crystals]."
message_admins(msg)
else
- usr << "You do not have access to this command."
+ to_chat(usr, "You do not have access to this command.")
/datum/admins/proc/add_tcrystals(mob/living/carbon/human/H as mob)
set category = "Debug"
@@ -1485,7 +1485,7 @@ var/datum/announcement/minor/admin_min_announcer = new
var/msg = "[key_name(usr)] has added [crystals] to [H.ckey]'s telecrystals."
message_admins(msg)
else
- usr << "You do not have access to this command."
+ to_chat(usr, "You do not have access to this command.")
/datum/admins/proc/sendFax()
@@ -1499,7 +1499,7 @@ var/datum/announcement/minor/admin_min_announcer = new
if (!istype(src,/datum/admins))
src = usr.client.holder
if (!istype(src,/datum/admins))
- usr << "Error: you are not an admin!"
+ to_chat(usr, "Error: you are not an admin!")
return
var/replyorigin = input(src.owner, "Please specify who the fax is coming from", "Origin") as text|null
@@ -1557,20 +1557,20 @@ datum/admins/var/obj/item/weapon/paper/admin/faxreply // var to hold fax replies
if(destination.receivefax(P))
- src.owner << "Message reply to transmitted successfully."
+ to_chat(src.owner, "Message reply to transmitted successfully.")
if(P.sender) // sent as a reply
log_admin("[key_name(src.owner)] replied to a fax message from [key_name(P.sender)]")
for(var/client/C in admins)
if((R_ADMIN | R_MOD) & C.holder.rights)
- C << "FAX LOG:[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(P.sender)] (VIEW)"
+ to_chat(C, "FAX LOG:[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(P.sender)] (VIEW)")
else
log_admin("[key_name(src.owner)] has sent a fax message to [destination.department]")
for(var/client/C in admins)
if((R_ADMIN | R_MOD) & C.holder.rights)
- C << "FAX LOG:[key_name_admin(src.owner)] has sent a fax message to [destination.department] (VIEW)"
+ to_chat(C, "FAX LOG:[key_name_admin(src.owner)] has sent a fax message to [destination.department] (VIEW)")
else
- src.owner << "Message reply failed."
+ to_chat(src.owner, "Message reply failed.")
spawn(100)
qdel(P)
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index 12a84346b3..8dc1e9de74 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -23,7 +23,7 @@
if(!message) return
var/F = investigate_subject2file(subject)
if(!F) return
- F << "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
"
+ to_chat(F, "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
")
//ADMINVERBS
/client/proc/investigate_show( subject in list("hrefs","notes","singulo","telesci") )
diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm
index 24ecba7c01..007ca49ba5 100644
--- a/code/modules/admin/admin_memo.dm
+++ b/code/modules/admin/admin_memo.dm
@@ -26,7 +26,7 @@
return
if( findtext(memo,"