diff --git a/aurorastation.dme b/aurorastation.dme
index 132bfb66bed..d2651d24395 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -113,7 +113,6 @@
#include "code\__DEFINES\ruin_tags.dm"
#include "code\__DEFINES\rust_bapi.dm"
#include "code\__DEFINES\rust_g.dm"
-#include "code\__DEFINES\rust_g_debug.dm"
#include "code\__DEFINES\rust_g_overrides.dm"
#include "code\__DEFINES\ship_weapons.dm"
#include "code\__DEFINES\shuttle.dm"
@@ -3664,7 +3663,6 @@
#include "code\modules\turbolift\turbolift_floor.dm"
#include "code\modules\turbolift\turbolift_map.dm"
#include "code\modules\turbolift\turbolift_turfs.dm"
-#include "code\modules\udp\ship_udp.dm"
#include "code\modules\vehicles\animal.dm"
#include "code\modules\vehicles\bike.dm"
#include "code\modules\vehicles\cargo_train.dm"
diff --git a/code/__DEFINES/rust_g_debug.dm b/code/__DEFINES/rust_g_debug.dm
deleted file mode 100644
index 1847ab42759..00000000000
--- a/code/__DEFINES/rust_g_debug.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Debug verb for our custom UDP module, generally used for gelf logging
- */
-/client/proc/rustg_send_udp()
- set name = "RUSTG Send UDP"
- set category = "Debug"
- set desc = "Sends an UDP text packet using our rust_g custom module."
- var/destination = input(usr, "Address in ip:port format.", "Address", null)
- var/message = input(usr, "Message to send.", "Message", null)
-
- if(destination && message)
- rustg_udp_send(destination, message)
diff --git a/code/__HELPERS/logging/_logging.dm b/code/__HELPERS/logging/_logging.dm
index 6b21d330925..c9768310b7e 100644
--- a/code/__HELPERS/logging/_logging.dm
+++ b/code/__HELPERS/logging/_logging.dm
@@ -42,9 +42,7 @@
#ifdef TESTING
#define testing(msg) log_world("## TESTING: [msg]"); to_chat(world, "## TESTING: [msg]")
-//When we port GLOB ...
-//GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
-
+GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
// we don't really check if a word or name is used twice, be aware of that
#define testing_profile_start(NAME, LIST) LIST[NAME] = world.timeofday
#define testing_profile_current(NAME, LIST) round((world.timeofday - LIST[NAME])/10,0.1)
@@ -58,76 +56,37 @@
#define testing_profile_output_all(LIST)
#endif
+#define testing_profile_global_start(NAME) testing_profile_start(NAME,GLOB.testing_global_profiler)
+#define testing_profile_global_current(NAME) testing_profile_current(NAME, GLOB.testing_global_profiler)
+#define testing_profile_global_output(NAME) testing_profile_output(NAME, GLOB.testing_global_profiler)
+#define testing_profile_global_output_all testing_profile_output_all(GLOB.testing_global_profiler)
+
+#define testing_profile_local_init(PROFILE_NAME) var/list/_timer_system = list( "_PROFILE_NAME" = PROFILE_NAME, "_start_of_proc" = world.timeofday )
+#define testing_profile_local_start(NAME) testing_profile_start(NAME, _timer_system)
+#define testing_profile_local_current(NAME) testing_profile_current(NAME, _timer_system)
+#define testing_profile_local_output(NAME) testing_profile_output(NAME, _timer_system)
+#define testing_profile_local_output_all testing_profile_output_all(_timer_system)
+
/proc/game_log(category, text)
WRITE_LOG(GLOB.diary, "[GLOB.round_id] [category]: [text][log_end]")
-/proc/log_admin(text,level=SEVERITY_NOTICE,ckey="",admin_key="",ckey_target="")
- _log_admin(text)
- send_gelf_log(short_message=text, long_message="[time_stamp()]: [text]",level=level,category="ADMIN",additional_data=list("_ckey"=html_encode(ckey),"_admin_key"=html_encode(admin_key),"_ckey_target"=html_encode(ckey_target)))
-
/proc/log_signal(var/text)
if(length(GLOB.signal_log) >= 100)
GLOB.signal_log.Cut(1, 2)
GLOB.signal_log.Add("|[time_stamp()]| [text]")
_log_signal(text)
- send_gelf_log(short_message=text, long_message="[time_stamp()]: [text]",level=SEVERITY_NOTICE,category="SIGNALER")
-/proc/log_game(text, level = SEVERITY_NOTICE, ckey = "", admin_key = "", ckey_target = "")
- _log_game(text)
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = level, category = "GAME", additional_data = list("_ckey" = html_encode(ckey), "_admin_key" = html_encode(admin_key), "_target" = html_encode(ckey_target)))
-
-/proc/log_vote(text)
- _log_vote(text)
- send_gelf_log(short_message=text, long_message="[time_stamp()]: [text]",level=5,category="VOTE")
-
-/proc/log_access(text, level = SEVERITY_NOTICE,ckey="")
- _log_access(text)
- send_gelf_log(short_message=text, long_message="[time_stamp()]: [text]",level=level,category="ACCESS",additional_data=list("_ckey"=html_encode(ckey)))
-
-/proc/log_say(text, level = SEVERITY_NOTICE, ckey = "")
- _log_say(text)
- send_gelf_log(short_message=text, long_message="[time_stamp()]: [text]",level=level,category="SAY",additional_data=list("_ckey"=html_encode(ckey)))
-
-/proc/log_ooc(text, level = SEVERITY_NOTICE, ckey = "")
- _log_ooc(text)
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = level, category = "OOC", additional_data = list("_ckey" = html_encode(ckey)))
-
-/proc/log_whisper(text, level = SEVERITY_NOTICE, ckey = "")
- _log_whisper(text)
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = level, category = "WHISPER", additional_data = list("_ckey" = html_encode(ckey)))
-
-/proc/log_emote(text, level = SEVERITY_NOTICE, ckey = "")
- _log_emote(text)
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]",level = level,category = "EMOTE", additional_data = list("_ckey" = html_encode(ckey)))
-
-/proc/log_attack(text, level = SEVERITY_NOTICE, ckey = "", ckey_target = "")
- _log_attack(text)
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = level, category="ATTACK", additional_data = list("_ckey" = html_encode(ckey), "_ckey_target" = html_encode(ckey_target)))
-
-/proc/log_adminsay(text)
- _log_adminsay(text)
/proc/log_ntirc(text, level = SEVERITY_NOTICE, ckey = "", conversation = "")
log_chat(text)
- send_gelf_log(short_message = text, long_message="[time_stamp()]: [text]", level = level, category = "NTIRC", additional_data = list("_ckey" = html_encode(ckey), "_ntirc_conversation" = html_encode(conversation)))
-
-
-/proc/log_to_dd(text)
- world.log << text //this comes before the config check because it can't possibly runtime
- if(GLOB.config.log_world_output)
- log_world("DD_OUTPUT", text)
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = SEVERITY_NOTICE, category = "DD_OUTPUT")
/proc/log_misc(text)
log_world("MISC", text)
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = SEVERITY_NOTICE, category="MISC")
/proc/log_tgs(text, severity = SEVERITY_INFO)
log_world("TGS[SEVERITY_INFO]: [text]")
- send_gelf_log(short_message = text, long_message="[time_stamp()]: [text]", level = severity, category = "TGS")
/proc/log_ntsl(text, severity = SEVERITY_NOTICE, ckey = "")
log_world("NTSL: [text]")
- send_gelf_log(text, "[time_stamp()]: [text]", severity, "NTSL", additional_data = list("_ckey" = ckey))
/proc/log_exception(exception/e)
if (isnull(GLOB.config) || GLOB.config.logsettings["log_runtime"])
@@ -138,7 +97,7 @@
log_runtime("VAR [k] = [e.vars[k]]")
log_runtime("========= END OF RUNTIME DUMP =========")
- send_gelf_log(short_message = "runtime error:[e.name]", long_message = "[e.desc]", level = SEVERITY_WARNING, category = "RUNTIME")
+
//pretty print a direction bitflag, can be useful for debugging.
/proc/print_dir(var/dir)
diff --git a/code/__HELPERS/logging/admin.dm b/code/__HELPERS/logging/admin.dm
index 71270e8ad2e..69471327dfc 100644
--- a/code/__HELPERS/logging/admin.dm
+++ b/code/__HELPERS/logging/admin.dm
@@ -1,7 +1,7 @@
/* Items with ADMINPRIVATE prefixed are stripped from public logs. */
/// General logging for admin actions
-/proc/_log_admin(text)
+/proc/log_admin(text)
GLOB.admin_log.Add(text)
if (GLOB.config.logsettings["log_admin"])
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "ADMIN: [text]")
@@ -19,7 +19,7 @@
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "ADMINPRIVATE: [text]")
/// Logging for AdminSay (ASAY) messages
-/proc/_log_adminsay(text)
+/proc/log_adminsay(text)
GLOB.admin_log.Add(text)
if (GLOB.config.logsettings["log_adminchat"])
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "ADMINPRIVATE: ASAY: [text]")
diff --git a/code/__HELPERS/logging/attack.dm b/code/__HELPERS/logging/attack.dm
index 703a020050d..372804fd9b3 100644
--- a/code/__HELPERS/logging/attack.dm
+++ b/code/__HELPERS/logging/attack.dm
@@ -1,5 +1,5 @@
/// Generic attack logging
-/proc/_log_attack(text)
+/proc/log_attack(text)
if (GLOB.config.logsettings["log_attack"])
WRITE_LOG(GLOB.config.logfiles["world_attack_log"], "ATTACK: [text]")
diff --git a/code/__HELPERS/logging/debug.dm b/code/__HELPERS/logging/debug.dm
index 4bf14961d16..44ce5274dc5 100644
--- a/code/__HELPERS/logging/debug.dm
+++ b/code/__HELPERS/logging/debug.dm
@@ -15,7 +15,6 @@
return
if(C.prefs.toggles & CHAT_DEBUGLOGS)
to_chat(C, "DEBUG: [text]")
- send_gelf_log(short_message = text, long_message = "[time_stamp()]: [text]", level = level, category = "DEBUG")
/// Logging for loading and caching assets
/proc/log_asset(text)
diff --git a/code/__HELPERS/logging/game.dm b/code/__HELPERS/logging/game.dm
index 4f06eba66a8..64372fe369b 100644
--- a/code/__HELPERS/logging/game.dm
+++ b/code/__HELPERS/logging/game.dm
@@ -1,5 +1,5 @@
/// Logging for generic/unsorted game messages
-/proc/_log_game(text)
+/proc/log_game(text)
if (GLOB.config.logsettings["log_game"])
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "GAME: [text]")
@@ -13,7 +13,7 @@
#endif
/// Logging for emotes
-/proc/_log_emote(text)
+/proc/log_emote(text)
#if defined(UNIT_TEST)
LOG_GITHUB_DEBUG("EMOTE: [text]")
#else
@@ -27,7 +27,7 @@
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "RADIOEMOTE: [text]")
/// Logging for messages sent in OOC
-/proc/_log_ooc(text)
+/proc/log_ooc(text)
if (GLOB.config.logsettings["log_ooc"])
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "OOC: [text]")
@@ -37,12 +37,12 @@
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "PRAY: [text]")
/// Logging for logging in & out of the game, with error messages.
-/proc/_log_access(text)
+/proc/log_access(text)
if (GLOB.config.logsettings["log_access"])
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "ACCESS: [text]")
/// Logging for OOC votes
-/proc/_log_vote(text)
+/proc/log_vote(text)
if (GLOB.config.logsettings["log_vote"])
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "VOTE: [text]")
diff --git a/code/__HELPERS/logging/subsystems/_subsystems.dm b/code/__HELPERS/logging/subsystems/_subsystems.dm
index 21a0aee0e2d..9d9c7d71e20 100644
--- a/code/__HELPERS/logging/subsystems/_subsystems.dm
+++ b/code/__HELPERS/logging/subsystems/_subsystems.dm
@@ -1,9 +1,3 @@
-/proc/log_subsystem_mastercontroller(text)
- if (GLOB.config?.logsettings["log_subsystems"])
- WRITE_LOG(GLOB.config.logfiles["world_subsystems_log"], "SUBSYSTEM MASTERCONTROLLER: [text]")
-
- send_gelf_log(text, "[time_stamp()]: [text]", SEVERITY_INFO, "MASTER")
-
/proc/log_subsystem(subsystem, text, log_world = TRUE, severity = SEVERITY_DEBUG)
if (!subsystem)
subsystem = "UNKNOWN"
@@ -11,8 +5,6 @@
if (GLOB.config?.logsettings["log_subsystems"])
WRITE_LOG(GLOB.config.logfiles["world_subsystems_log"], "SUBSYSTEM: [msg]")
-
- send_gelf_log(msg, "[time_stamp()]: [msg]", severity, "SUBSYSTEM", additional_data = list("_subsystem" = subsystem))
// if (log_world)
// world.log << "SS[subsystem]: [text]"
@@ -22,13 +14,9 @@
#else
if (GLOB.config?.logsettings["log_subsystems"])
WRITE_LOG(GLOB.config.logfiles["world_subsystems_log"], "SUBSYSTEM INIT: [text]")
-
- send_gelf_log(text, "[time_stamp()]: [text]", SEVERITY_INFO, "SS Init")
#endif
// Generally only used when something has gone very wrong.
/proc/log_failsafe(text)
if (GLOB.config?.logsettings["log_subsystems"])
WRITE_LOG(GLOB.config.logfiles["world_subsystems_log"], "SUBSYSTEM FAILSAFE: [text]")
-
- send_gelf_log(text, "[time_stamp()]: [text]", SEVERITY_ALERT, "FAILSAFE")
diff --git a/code/__HELPERS/logging/subsystems/garbage.dm b/code/__HELPERS/logging/subsystems/garbage.dm
index 8ec6fc1d1c7..9c60f7e5221 100644
--- a/code/__HELPERS/logging/subsystems/garbage.dm
+++ b/code/__HELPERS/logging/subsystems/garbage.dm
@@ -4,7 +4,6 @@
LOG_GITHUB_DEBUG("SSGarbage: [text]")
#else
WRITE_LOG(GLOB.config.logfiles["garbage_collector_log"], "SSGarbage [text]")
- send_gelf_log(text, "[time_stamp()]: [text]", high_severity ? SEVERITY_WARNING : SEVERITY_DEBUG, "GARBAGE", additional_data = list("_type" = "[type]"))
#endif
/proc/log_subsystem_garbage_warning(text, type, high_severity = FALSE)
@@ -12,7 +11,6 @@
LOG_GITHUB_WARNING("SSGarbage: [text]")
#else
WRITE_LOG(GLOB.config.logfiles["garbage_collector_log"], "SSGarbage [text]")
- send_gelf_log(text, "[time_stamp()]: [text]", high_severity ? SEVERITY_WARNING : SEVERITY_DEBUG, "GARBAGE", additional_data = list("_type" = "[type]"))
#endif
/proc/log_subsystem_garbage_error(text, type, high_severity = FALSE)
@@ -20,7 +18,6 @@
LOG_GITHUB_ERROR("SSGarbage: [text]")
#else
WRITE_LOG(GLOB.config.logfiles["garbage_collector_log"], "SSGarbage [text]")
- send_gelf_log(text, "[time_stamp()]: [text]", high_severity ? SEVERITY_WARNING : SEVERITY_DEBUG, "GARBAGE", additional_data = list("_type" = "[type]"))
#endif
/proc/log_subsystem_garbage_harddel(text)
diff --git a/code/__HELPERS/logging/talk.dm b/code/__HELPERS/logging/talk.dm
index 6762c661b74..cfa7ed224f4 100644
--- a/code/__HELPERS/logging/talk.dm
+++ b/code/__HELPERS/logging/talk.dm
@@ -17,7 +17,7 @@
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "[prefix][custom_say_emote ? "*[custom_say_emote]*, " : ""]\"[message]\"[suffix] - [message_type]")
/// Logging for generic spoken messages
-/proc/_log_say(text)
+/proc/log_say(text)
#if defined(UNIT_TEST)
LOG_GITHUB_DEBUG("SAY: [text]")
#else
@@ -26,7 +26,7 @@
#endif
/// Logging for whispered messages
-/proc/_log_whisper(text)
+/proc/log_whisper(text)
if (GLOB.config.logsettings["log_whisper"])
WRITE_LOG(GLOB.config.logfiles["world_game_log"], "WHISPER: [text]")
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 856ed84328b..00a1ca2d281 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -186,7 +186,7 @@ Proc for attack log creation, because really why not
if(target && ismob(target))
target.attack_log += text("\[[time_stamp()]\] Has been [what_done] by [user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]")
if(admin)
- log_attack(SPAN_WARNING("[user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"] [what_done] [target ? "[target.name][(ismob(target) && target.ckey)? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]"),ckey=key_name(user),ckey_target=key_name(target))
+ log_attack(SPAN_WARNING("[user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"] [what_done] [target ? "[target.name][(ismob(target) && target.ckey)? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]"))
//checks whether this item is a module of the robot or exosuit it is located in. This is mainly to ensure that things do not get embedded or fed into autolathes if attached to a bot or exosuit
/proc/is_robot_module(var/obj/item/thing)
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 843d3eed489..dad3a686977 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -25,7 +25,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
/obj/item/proc/resolve_attackby(atom/A, mob/user, var/click_parameters)
pre_attack(A, user)
add_fingerprint(user)
- _log_attack("[A] at [A?.loc]/[A.x]-[A.y]-[A.z] got ITEM attacked by [usr]/[usr?.ckey] on INTENT [usr?.a_intent] with [src]")
+ log_attack("[A] at [A?.loc]/[A.x]-[A.y]-[A.z] got ITEM attacked by [usr]/[usr?.ckey] on INTENT [usr?.a_intent] with [src]")
return A.attackby(src, user, click_parameters)
// attackby should return TRUE if all desired actions are resolved from that attack, within attackby. This prevents afterattack being called.
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 7476dbd6acf..2cd675b4cb5 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -398,10 +398,6 @@ GLOBAL_LIST_EMPTY(gamemode_cache)
// Master Controller settings.
var/fastboot = FALSE // If true, take some shortcuts during boot to speed it up for testing. Probably should not be used on production servers.
- //UDP GELF Logging
- var/log_gelf_enabled = 0
- var/log_gelf_addr = ""
-
//IP Intel vars
var/ipintel_email
var/ipintel_rating_bad = 1
diff --git a/code/controllers/subsystems/responseteam.dm b/code/controllers/subsystems/responseteam.dm
index 1d722b78181..bbca5fd9052 100644
--- a/code/controllers/subsystems/responseteam.dm
+++ b/code/controllers/subsystems/responseteam.dm
@@ -156,7 +156,7 @@ SUBSYSTEM_DEF(distress)
return
message_admins("[key_name_admin(usr)] is dispatching a Response Team: [choice].", 1)
- log_admin("[key_name(usr)] used Dispatch Response Team: [choice].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] used Dispatch Response Team: [choice].")
SSdistress.trigger_armed_response_team(choice)
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index e39acab1014..f77c55b7c48 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -196,7 +196,7 @@
var/datum/antagonist/antag = GLOB.all_antag_types[href_list["add_antagonist"]]
if(antag)
if(antag.add_antagonist(src, 1, 1, 0, 1, 1)) // Ignore equipment and role type for this.
- log_admin("[key_name_admin(usr)] made [key_name(src, highlight_special = 1)] into a [antag.role_text].",admin_key=key_name(usr),ckey=key_name(src))
+ log_admin("[key_name_admin(usr)] made [key_name(src, highlight_special = 1)] into a [antag.role_text].")
else
to_chat(usr, SPAN_WARNING("[src] could not be made into a [antag.role_text]!"))
@@ -377,11 +377,11 @@
qdel(I)
break
to_chat(H, SPAN_NOTICE("Your loyalty implant has been deactivated."))
- log_admin("[key_name_admin(usr)] has de-loyalty implanted [current].",admin_key=key_name(usr),ckey=key_name(usr))
+ log_admin("[key_name_admin(usr)] has de-loyalty implanted [current].")
if("add")
to_chat(H, SPAN_DANGER("You somehow have become the recipient of a loyalty transplant, and it just activated!"))
H.implant_loyalty(H, override = TRUE)
- log_admin("[key_name_admin(usr)] has loyalty implanted [current].",admin_key=key_name(usr),ckey=key_name(usr))
+ log_admin("[key_name_admin(usr)] has loyalty implanted [current].")
else if (href_list["silicon"])
BITSET(current.hud_updateflag, SPECIALROLE_HUD)
@@ -402,7 +402,7 @@
else if(R.module_state_3 == R.module.emag)
R.module_state_3 = null
R.contents -= R.module.emag
- log_admin("[key_name_admin(usr)] has unemagged [R].",admin_key=key_name(usr),ckey_target=key_name(R))
+ log_admin("[key_name_admin(usr)] has unemagged [R].")
if("unemagcyborgs")
if (istype(current, /mob/living/silicon/ai))
@@ -421,7 +421,7 @@
else if(R.module_state_3 == R.module.emag)
R.module_state_3 = null
R.contents -= R.module.emag
- log_admin("[key_name_admin(usr)] has unemagged [ai]'s Cyborgs.",admin_key=key_name(usr),ckey_target=key_name(ai))
+ log_admin("[key_name_admin(usr)] has unemagged [ai]'s Cyborgs.")
else if (href_list["common"])
switch(href_list["common"])
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 0033957f9d9..6467248d251 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -91,7 +91,7 @@
/datum/announcement/proc/Log(message as text, message_title as text)
if(log)
- log_say("[key_name(usr)] has made \a [announcement_type]: [message_title] - [message] - [announcer]",ckey=key_name(usr))
+ log_say("[key_name(usr)] has made \a [announcement_type]: [message_title] - [message] - [announcer]")
message_admins("[key_name_admin(usr)] has made \a [announcement_type].", 1)
/proc/GetNameAndAssignmentFromId(var/obj/item/card/id/I)
diff --git a/code/game/antagonist/antagonist_factions.dm b/code/game/antagonist/antagonist_factions.dm
index 18141bf5890..3700d38ccf3 100644
--- a/code/game/antagonist/antagonist_factions.dm
+++ b/code/game/antagonist/antagonist_factions.dm
@@ -41,7 +41,7 @@
return
to_chat(antag, SPAN_DANGER("You are attempting to convert \the [player.current]..."))
- log_admin("[antag.mob]([antag.ckey]) attempted to convert [player.current].",ckey=antag.ckey,ckey_target=key_name(player.current))
+ log_admin("[antag.mob]([antag.ckey]) attempted to convert [player.current].")
message_admins(SPAN_DANGER("[antag.mob]([antag.ckey]) attempted to convert [player.current]."))
player.rev_cooldown = world.time+100
diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm
index 0ddad390e30..df59546b84b 100644
--- a/code/game/antagonist/station/highlander.dm
+++ b/code/game/antagonist/station/highlander.dm
@@ -59,4 +59,4 @@ var/datum/antagonist/highlander/highlanders
highlanders.add_antagonist(H.mind)
message_admins(SPAN_NOTICE("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!"), 1)
- log_admin("[key_name(usr)] used there can be only one.", admin_key=key_name(usr))
+ log_admin("[key_name(usr)] used there can be only one.")
diff --git a/code/game/base_turf.dm b/code/game/base_turf.dm
index 952496a41a3..1bb4ea173c2 100644
--- a/code/game/base_turf.dm
+++ b/code/game/base_turf.dm
@@ -31,4 +31,4 @@
new_base_path = /turf/space
SSatlas.current_map.base_turf_by_z["[choice]"] = new_base_path
message_admins("[key_name_admin(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].")
- log_admin("[key_name(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has set the base turf for z-level [choice] to [get_base_turf(choice)].")
diff --git a/code/game/gamemodes/changeling/implements/hivemind.dm b/code/game/gamemodes/changeling/implements/hivemind.dm
index 6ab4df8b210..430c36f4714 100644
--- a/code/game/gamemodes/changeling/implements/hivemind.dm
+++ b/code/game/gamemodes/changeling/implements/hivemind.dm
@@ -45,7 +45,7 @@
if(!message)
return
- log_say("[changeling_mob] Hivemind/[src.key] : [message]", ckey=key_name(src))
+ log_say("[changeling_mob] Hivemind/[src.key] : [message]")
if(src.client?.prefs.muted & (MUTE_DEADCHAT|MUTE_IC))
to_chat(src, SPAN_WARNING("You cannot talk. (Admin Muted)"))
diff --git a/code/game/gamemodes/events/holidays/holidays.dm b/code/game/gamemodes/events/holidays/holidays.dm
index 071244a6006..6ffdf842ba4 100644
--- a/code/game/gamemodes/events/holidays/holidays.dm
+++ b/code/game/gamemodes/events/holidays/holidays.dm
@@ -166,7 +166,7 @@ var/global/Holiday = null
else if (T == "None")
Holiday = null
message_admins(SPAN_NOTICE("ADMIN: Event: [key_name(src)] unset today's Holiday."))
- log_admin("[key_name(src)] unset today's Holiday",admin_key=key_name(src))
+ log_admin("[key_name(src)] unset today's Holiday")
return TRUE
Holiday = T
@@ -174,7 +174,7 @@ var/global/Holiday = null
Holiday_Game_Start()
message_admins(SPAN_NOTICE("ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\""))
- log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"",admin_key=key_name(src))
+ log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"")
return TRUE
//Run at the start of a round
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index a1e2f8528bd..6cf1f6996e8 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -208,7 +208,7 @@
if (!user && usr)
user = usr
- log_admin("[user] ([user.ckey]) opened '[src.name]' containing [gases].", ckey=key_name(user))
+ log_admin("[user] ([user.ckey]) opened '[src.name]' containing [gases].")
message_admins("[key_name_admin(user)] opened '[src.name]' containing [gases]. (JMP)")
/obj/machinery/portable_atmospherics/proc/log_open_userless(var/cause)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 596c986fd12..01fe08ae8c0 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -185,7 +185,7 @@
new /obj/effect/spawner/newbomb/timer/syndicate(src.loc)
new /obj/item/clothing/head/collectable/petehat(src.loc)
message_admins("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.")
- log_game("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.",ckey=key_name(usr))
+ log_game("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.")
src.New()
emagged = 0
else
diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm
index d2827739f4c..b68571ef872 100644
--- a/code/game/machinery/computer/arcade_orion.dm
+++ b/code/game/machinery/computer/arcade_orion.dm
@@ -486,7 +486,7 @@
if(emagged)
new /obj/item/orion_ship(src.loc)
message_admins("[key_name_admin(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
- log_game("[key_name(usr)] made it to Orion on an emagged machine and got an explosive toy ship.",ckey=key_name(usr))
+ log_game("[key_name(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
else
prizevend()
event = null
@@ -510,7 +510,7 @@
if(active)
return
message_admins("[key_name_admin(usr)] primed an explosive Orion ship for detonation.")
- log_game("[key_name(usr)] primed an explosive Orion ship for detonation.",ckey=key_name(usr))
+ log_game("[key_name(usr)] primed an explosive Orion ship for detonation.")
to_chat(user, SPAN_WARNING("You flip the switch on the underside of [src]."))
active = 1
src.visible_message(SPAN_NOTICE("[src] softly beeps and whirs to life!"))
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index a29a67727bd..e74b20659fb 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -75,7 +75,7 @@
else
message_admins("[key_name_admin(usr)] detonated [target.name]!")
- log_game("[key_name(usr)] detonated [target.name]!",ckey=key_name(usr))
+ log_game("[key_name(usr)] detonated [target.name]!")
to_chat(target, SPAN_DANGER("Self-destruct command received."))
addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living/silicon/robot, self_destruct)), 1 SECONDS)
@@ -107,7 +107,7 @@
target.SetLockdown(!target.lock_charge) // Toggle.
message_admins("[key_name_admin(usr)] [target.lock_charge ? "locked down" : "released"] [target.name]!")
- log_game("[key_name(usr)] [target.lock_charge ? "locked down" : "released"] [target.name]!",ckey=key_name(usr))
+ log_game("[key_name(usr)] [target.lock_charge ? "locked down" : "released"] [target.name]!")
to_chat(target, (target.lock_charge ? "You have been locked down!" : "Your lockdown has been lifted!"))
// Changes borg's access
@@ -136,7 +136,7 @@
var/log_message = "[key_name_admin(usr)] changed [target.name] access to [target.module.all_access ? "all access" : "role specific"]."
message_admins(log_message)
- log_game(log_message, ckey = key_name(usr))
+ log_game(log_message)
to_chat(target, ("Your access was changed to: [target.module.all_access ? "all access" : "role specific"]."))
// Remotely hacks the cyborg. Only antag AIs can do this and only to linked cyborgs.
@@ -162,7 +162,7 @@
return
message_admins("[key_name_admin(usr)] emagged [target.name] using robotic console!")
- log_game("[key_name(usr)] emagged [target.name] using robotic console!",ckey=key_name(usr))
+ log_game("[key_name(usr)] emagged [target.name] using robotic console!")
target.emagged = 1
to_chat(target, SPAN_NOTICE("Failsafe protocols overriden. New tools available."))
@@ -185,7 +185,7 @@
return
message_admins("[key_name_admin(usr)] detonated all cyborgs!")
- log_game("[key_name(usr)] detonated all cyborgs!",ckey=key_name(usr))
+ log_game("[key_name(usr)] detonated all cyborgs!")
for(var/mob/living/silicon/robot/R in GLOB.mob_list)
if(istype(R, /mob/living/silicon/robot/drone))
diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm
index 2c385207213..505351cf223 100644
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -50,11 +50,11 @@
src.authorized += id.registered_name
if (src.auth_need - src.authorized.len > 0)
message_admins("[key_name_admin(user)] has authorized early shuttle launch")
- log_game("[key_name(user)] has authorized early shuttle launch",ckey=key_name(user))
+ log_game("[key_name(user)] has authorized early shuttle launch")
to_world(SPAN_NOTICE("Alert: [src.auth_need - src.authorized.len] authorizations needed until shuttle is launched early"))
else
message_admins("[key_name_admin(user)] has launched the shuttle")
- log_game("[key_name(user)] has launched the shuttle early",ckey=key_name(user))
+ log_game("[key_name(user)] has launched the shuttle early")
to_world(SPAN_NOTICE("Alert: Shuttle launch time shortened to 10 seconds!"))
evacuation_controller.set_launch_time(world.time+100)
//src.authorized = null
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 9cc95c14e9a..1e0177d8910 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -491,7 +491,7 @@ GLOBAL_LIST_EMPTY(frozen_crew)
// Book keeping!
var/turf/location = get_turf(src)
- log_admin("[key_name_admin(M)] has entered a [initial(src.name)].",ckey=key_name(M))
+ log_admin("[key_name_admin(M)] has entered a [initial(src.name)].")
message_admins(SPAN_NOTICE("[key_name_admin(M)] has entered a [initial(src.name)].(JMP)"))
//Despawning occurs when process() is called with an occupant without a client.
diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm
index d3f80493118..04f86c38076 100644
--- a/code/game/machinery/nuclear_bomb.dm
+++ b/code/game/machinery/nuclear_bomb.dm
@@ -251,7 +251,7 @@ var/bomb_set
if (text2num(lastentered) == null)
var/turf/LOC = get_turf(usr)
message_admins("[key_name_admin(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]! ([LOC ? "JMP" : "null"])", 0)
- log_admin("EXPLOIT: [key_name(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]!",ckey=key_name(usr))
+ log_admin("EXPLOIT: [key_name(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]!")
else
code += lastentered
if (length(code) > 5)
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index 540d41ce8d2..d9b6c8a0b2e 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -7,7 +7,7 @@
usr.set_machine(src)
if(!mapping) return
- log_game("[usr]([usr.key]) used station map L[z] in [src.loc.loc]",ckey=key_name(usr))
+ log_game("[usr]([usr.key]) used station map L[z] in [src.loc.loc]")
src.drawmap(usr)
diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm
index 8667c78b245..5dc70b5b4b7 100644
--- a/code/game/objects/effects/chem/chemsmoke.dm
+++ b/code/game/objects/effects/chem/chemsmoke.dm
@@ -145,7 +145,7 @@
if(M)
more = "(?)"
message_admins("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", 0, 1)
- log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].",ckey=key_name(M))
+ log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
else
message_admins("A chemical smoke reaction has taken place in ([whereLink]). No associated key.", 0, 1)
log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key.")
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 216e5d71df1..093536c40a0 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -30,7 +30,7 @@
user.drop_from_inventory(attacking_item,src)
to_chat(user, SPAN_NOTICE("You attach the tank to the transfer valve."))
message_admins("[key_name_admin(user)] attached both tanks to a transfer valve. (JMP)")
- log_game("[key_name_admin(user)] attached both tanks to a transfer valve.",ckey=key_name(user))
+ log_game("[key_name_admin(user)] attached both tanks to a transfer valve.")
update_icon()
update_static_data_for_all_viewers()
@@ -52,7 +52,7 @@
GLOB.bombers += "[key_name(user)] attached a [attacking_item] to a transfer valve."
message_admins("[key_name_admin(user)] attached a [attacking_item] to a transfer valve. (JMP)")
- log_game("[key_name_admin(user)] attached a [attacking_item] to a transfer valve.",ckey=key_name(user))
+ log_game("[key_name_admin(user)] attached a [attacking_item] to a transfer valve.")
attacher = user
update_static_data_for_all_viewers()
return
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index b82698ce283..3457fef2a7f 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -134,7 +134,7 @@
M.attack_log += text("\[[time_stamp()]\] Has been injected with [name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [name] to inject [M.name] ([M.ckey])")
- log_attack("[user.name] ([user.ckey]) used the [name] to inject [M.name] ([M.ckey])",ckey=key_name(user),ckey_target=key_name(M))
+ log_attack("[user.name] ([user.ckey]) used the [name] to inject [M.name] ([M.ckey])")
message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with \the [src][injected_with_monkey]")
// Apply the DNA shit.
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index c6c879711d1..b3e6a72e689 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -134,7 +134,7 @@
H.visible_message(s, SPAN_WARNING("You chew on your [O.name]!"))
message_admins("[key_name_admin(H)] is chewing on [H.get_pronoun("his")] restrained hand - (JMP)")
H.attack_log += text("\[[time_stamp()]\] [s] ([H.ckey])")
- log_attack("[s] ([H.ckey])",ckey=key_name(H))
+ log_attack("[s] ([H.ckey])")
if(O.take_damage(3, 0, damage_flags = DAMAGE_FLAG_SHARP|DAMAGE_FLAG_EDGE, used_weapon = "teeth marks"))
H:UpdateDamageIcon()
diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm
index 7a8312bda8a..0fc8ed6d00b 100644
--- a/code/game/objects/items/weapons/syndie.dm
+++ b/code/game/objects/items/weapons/syndie.dm
@@ -91,7 +91,7 @@
flick("c-4detonator_click", src)
if(src.bomb)
src.bomb.detonate()
- log_admin("[key_name(user)] has triggered [src.bomb] with [src].",ckey=key_name(user))
+ log_admin("[key_name(user)] has triggered [src.bomb] with [src].")
message_admins(SPAN_DANGER("[key_name_admin(user)] has triggered [src.bomb] with [src]."))
if("Close the lighter.")
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 87ed1c4ae20..b429c1779e3 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -38,11 +38,11 @@
return
if(findtext(msg, "byond://"))
to_chat(src, "Advertising other servers is not allowed.")
- log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]",ckey=key_name(src))
+ log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
return
- log_ooc("[mob.name]/[key] : [msg]",ckey=key_name(mob))
+ log_ooc("[mob.name]/[key] : [msg]")
var/ooc_style = "everyone"
if(holder && !holder.fakekey)
@@ -109,11 +109,11 @@
return
if(findtext(msg, "byond://"))
to_chat(src, "Advertising other servers is not allowed.")
- log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]",ckey=key_name(src))
+ log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
return
- log_ooc("(LOCAL) [mob.name]/[key] : [msg]",ckey=key_name(mob))
+ log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
var/mob/source = src.mob
var/list/messageturfs = list() //List of turfs we broadcast to.
diff --git a/code/modules/admin/DB ban/ban_mirroring.dm b/code/modules/admin/DB ban/ban_mirroring.dm
index ee2b59c5930..76fc409c3be 100644
--- a/code/modules/admin/DB ban/ban_mirroring.dm
+++ b/code/modules/admin/DB ban/ban_mirroring.dm
@@ -273,7 +273,7 @@
count++
if (GLOB.config.access_deny_vms && count >= GLOB.config.access_deny_vms)
- log_access("Failed Login: [C.ckey] [C.address] [C.computer_id] - Matching [count]/[GLOB.config.access_deny_vms] VM identifiers. IDs: [A].", ckey = C.ckey)
+ log_access("Failed Login: [C.ckey] [C.address] [C.computer_id] - Matching [count]/[GLOB.config.access_deny_vms] VM identifiers. IDs: [A].")
message_admins("Failed Login: [C.ckey] [C.address] [C.computer_id] - Matching [count]/[GLOB.config.access_deny_vms] VM identifiers. IDs: [A].")
spawn(20)
if (C)
@@ -281,7 +281,7 @@
return
if (GLOB.config.access_warn_vms && count >= GLOB.config.access_warn_vms)
- log_access("Notice: [key_name(C)] [C.address] [C.computer_id] - Matching [count] VM identifiers. IDs: [A].", ckey = C.ckey)
+ log_access("Notice: [key_name(C)] [C.address] [C.computer_id] - Matching [count] VM identifiers. IDs: [A].")
message_admins("Notice: [key_name(C)] [C.address] [C.computer_id] - Matching [count] VM identifiers. IDs: [A].")
var/list/conn_info = data_object["conn"]
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 5a871552e21..68028a616b1 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -54,7 +54,7 @@
//Guest Checking
if(!(GLOB.config.guests_allowed || GLOB.config.external_auth) && IsGuestKey(key))
- log_access("Failed Login: [key] - Guests not allowed",ckey=key_name(key))
+ log_access("Failed Login: [key] - Guests not allowed")
message_admins(SPAN_NOTICE("Failed Login: [key] - Guests not allowed"))
LOG_CLIENT_CONNECTION(ACCESS_STATUS_GUESTDENIED)
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
@@ -62,7 +62,7 @@
//Ban Checking
. = CheckBan(ckey, computer_id, address)
if(.)
- log_access("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]",ckey=key_name(key))
+ log_access("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]")
message_admins(SPAN_NOTICE("Failed Login: [key] id:[computer_id] ip:[address] - Banned [.["reason"]]"))
return .
@@ -70,13 +70,13 @@
else
if (!address)
- log_access("Failed Login: [key] null-[computer_id] - Denied access: No IP address broadcast.",ckey=key_name(key))
+ log_access("Failed Login: [key] null-[computer_id] - Denied access: No IP address broadcast.")
message_admins("[key] tried to connect without an IP address.")
LOG_CLIENT_CONNECTION(ACCESS_STATUS_NOIP)
return list("reason" = "Temporary ban", "desc" = "Your connection did not broadcast an IP address to check.")
if (!computer_id)
- log_access("Failed Login: [key] [address]-null - Denied access: No computer ID broadcast.",ckey=key_name(key))
+ log_access("Failed Login: [key] [address]-null - Denied access: No computer ID broadcast.")
message_admins("[key] tried to connect without a computer ID.")
LOG_CLIENT_CONNECTION(ACCESS_STATUS_NOCID)
return list("reason" = "Temporary ban", "desc" = "Your connection did not broadcast an computer ID to check.")
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 7f5325a5ba8..a6115dbca63 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -133,11 +133,11 @@ var/savefile/Banlist
if (!Banlist.dir.Remove(foldername)) return 0
if(!usr)
- log_admin("Ban Expired: [key]",ckey=key)
+ log_admin("Ban Expired: [key]")
message_admins("Ban Expired: [key]")
else
ban_unban_log_save("[key_name_admin(usr)] unbanned [key]")
- log_admin("[key_name_admin(usr)] unbanned [key]",admin_key=key_name(usr),ckey=key)
+ log_admin("[key_name_admin(usr)] unbanned [key]")
message_admins("[key_name_admin(usr)] unbanned: [key]")
feedback_inc("ban_unban",1)
DB_ban_unban( ckey(key), BANTYPE_ANY_FULLBAN)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index db7fb9f8186..c13cf8fdfe7 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -19,7 +19,7 @@ var/global/enabled_spooking = 0
to_chat(C, msg)
/proc/msg_admin_attack(var/text,var/ckey="",var/ckey_target="") //Toggleable Attack Messages
- log_attack(text,ckey=ckey,ckey_target=ckey_target)
+ log_attack(text)
var/rendered = "ATTACK: [text]"
for(var/s in GLOB.staff)
var/client/C = s
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 36b3c2f9f66..b266b1db523 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -232,7 +232,6 @@ var/list/admin_verbs_debug = list(
/turf/proc/view_chunk,
/turf/proc/update_chunk,
/client/proc/profiler_start,
- /client/proc/rustg_send_udp,
/datum/admins/proc/force_initialize_weather,
/datum/admins/proc/force_weather_state,
/datum/admins/proc/force_kill_weather
@@ -412,7 +411,6 @@ var/list/admin_verbs_hideable = list(
/proc/release,
/client/proc/force_away_mission,
/client/proc/profiler_start,
- /client/proc/rustg_send_udp
)
var/list/admin_verbs_mod = list(
/client/proc/cmd_admin_pm_context, // right-click adminPM interface,
@@ -484,7 +482,6 @@ var/list/admin_verbs_dev = list( //will need to be altered - Ryan784
/client/proc/cmd_generate_lag,
/client/proc/create_poll, //Allows to create polls
/client/proc/profiler_start,
- /client/proc/rustg_send_udp
)
var/list/admin_verbs_cciaa = list(
/client/proc/cmd_admin_pm_panel, /*admin-pm list*/
@@ -580,7 +577,7 @@ var/list/admin_verbs_cciaa = list(
var/mob/abstract/observer/ghost = mob
if(ghost.can_reenter_corpse)
ghost.reenter_corpse()
- log_admin("[src] reentered their corpose using aghost.",admin_key=key_name(src))
+ log_admin("[src] reentered their corpose using aghost.")
else
to_chat(ghost, SPAN_WARNING("Error: Aghost: Can't reenter corpse."))
return
@@ -599,7 +596,7 @@ var/list/admin_verbs_cciaa = list(
if(!body.key)
body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus
feedback_add_details("admin_verb","O") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[src] aghosted.",admin_key=key_name(src))
+ log_admin("[src] aghosted.")
/client/proc/invisimin()
set name = "Invisimin"
@@ -698,7 +695,7 @@ var/list/admin_verbs_cciaa = list(
if(length(new_key) >= 26)
new_key = copytext(new_key, 1, 26)
holder.fakekey = new_key
- log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]", admin_key=key_name(usr),ckey=holder.fakekey)
+ log_admin("[key_name(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]")
message_admins("[key_name_admin(usr)] has turned stealth mode [holder.fakekey ? "ON" : "OFF"]", 1)
feedback_add_details("admin_verb","SM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -738,7 +735,7 @@ var/list/admin_verbs_cciaa = list(
return
for (var/mob/V in hearers(O))
V.show_message(message, 2)
- log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound"), 1)
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -780,7 +777,7 @@ var/list/admin_verbs_cciaa = list(
SSair.can_fire = FALSE
to_chat(usr, "Disabled air processing.")
feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] used 'kill air'.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] used 'kill air'.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] used 'kill air'."), 1)
/client/proc/readmin_self()
@@ -789,7 +786,7 @@ var/list/admin_verbs_cciaa = list(
if(deadmin_holder)
deadmin_holder.reassociate()
- log_admin("[src] re-admined themself.",admin_key=key_name(src))
+ log_admin("[src] re-admined themself.")
message_admins("[src] re-admined themself.", 1)
to_chat(src, "You now have the keys to control the galaxy, or at least a small space ship")
remove_verb(src, /client/proc/readmin_self)
@@ -801,7 +798,7 @@ var/list/admin_verbs_cciaa = list(
if(holder)
if(alert("Confirm self-deadmin for the round? You can re-admin yourself at any time.",,"Yes","No") == "Yes")
- log_admin("[src] deadmined themself.",admin_key=key_name(src))
+ log_admin("[src] deadmined themself.")
message_admins("[src] deadmined themself.", 1)
deadmin()
to_chat(src, "You are now a normal player.")
@@ -908,7 +905,7 @@ var/list/admin_verbs_cciaa = list(
var/msg = tgui_alert(usr, "Switch from code [get_security_level()] to code [sec_level]?", "Security Level", list("Yes","No"))
if(msg == "Yes")
set_security_level(sec_level)
- log_admin("[key_name(usr)] changed the security level to code [sec_level].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] changed the security level to code [sec_level].")
//---- bs12 verbs ----
@@ -1078,7 +1075,7 @@ var/list/admin_verbs_cciaa = list(
to_chat(T, SPAN_NOTICE("Man up and deal with it."))
to_chat(T, SPAN_NOTICE("Move on."))
- log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.", admin_key=key_name(usr), ckey=key_name(T))
+ log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it."), 1)
/client/proc/global_man_up()
@@ -1090,7 +1087,7 @@ var/list/admin_verbs_cciaa = list(
to_chat(T, "
Man up.
Deal with it.
Move on.
")
sound_to(T, 'sound/voice/ManUp1.ogg')
- log_admin("[key_name(usr)] told everyone to man up and deal with it.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] told everyone to man up and deal with it.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] told everyone to man up and deal with it."), 1)
/client/proc/give_spell(mob/T as mob in GLOB.mob_list) // -- Urist
@@ -1101,7 +1098,7 @@ var/list/admin_verbs_cciaa = list(
if(!S) return
T.add_spell(new S)
feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].",admin_key=key_name(usr),ckey=key_name(T))
+ log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] gave [key_name(T)] the spell [S]."), 1)
/client/proc/toggle_recursive_explosions()
@@ -1305,7 +1302,7 @@ var/list/admin_verbs_cciaa = list(
if(!msg)
return
- log_ooc("(ADMIN LOCAL) [mob.name]/[key] : [msg]",ckey=key_name(mob))
+ log_ooc("(ADMIN LOCAL) [mob.name]/[key] : [msg]")
var/mob/source = src.mob
var/list/messageturfs = list() //List of turfs we broadcast to.
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index e8116fbca5e..6ec90d822db 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -739,7 +739,7 @@ var/list/jobban_keylist = list() // Global jobban list.
var/msg
for (var/R in notbannedlist)
ban_unban_log_save("[key_name(usr)] temp-jobbanned [ckey] from [R] for [mins] minutes. reason: [reason]")
- log_admin("[key_name(usr)] temp-jobbanned [ckey] from [R] for [mins] minutes",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] temp-jobbanned [ckey] from [R] for [mins] minutes")
feedback_inc("ban_job_tmp", 1)
feedback_add_details("ban_job_tmp","- [R]")
jobban_fullban(ckey, R, reason, mins)
@@ -768,7 +768,7 @@ var/list/jobban_keylist = list() // Global jobban list.
var/msg
for (var/R in notbannedlist)
ban_unban_log_save("[key_name(usr)] perma-jobbanned [ckey] from [R]. reason: [reason]")
- log_admin("[key_name(usr)] perma-banned [ckey] from [R]",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] perma-banned [ckey] from [R]")
feedback_inc("ban_job", 1)
feedback_add_details("ban_job", "- [R]")
jobban_fullban(ckey, R, reason, -1)
@@ -810,7 +810,7 @@ var/list/jobban_keylist = list() // Global jobban list.
switch (alert("Job: '[R]' Reason: '[reason]' Un-jobban?","Please Confirm","Yes","No"))
if ("Yes")
ban_unban_log_save("[key_name(usr)] unjobbanned [ckey] from [R]")
- log_admin("[key_name(usr)] unbanned [ckey] from [R]",admin_key=key_name(usr),ckey=ckey)
+ log_admin("[key_name(usr)] unbanned [ckey] from [R]")
jobban_unban(ckey, R) // Refer to the jobban API.
feedback_inc("ban_job_unban",1)
feedback_add_details("ban_job_unban","- [R]")
diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index 3f0069b1791..790065f4b35 100644
--- a/code/modules/admin/callproc/callproc.dm
+++ b/code/modules/admin/callproc/callproc.dm
@@ -151,7 +151,7 @@
if(!target)
to_chat(usr, "Your callproc target no longer exists.")
return
- log_admin("[key_name(src)] called [target]'s [procname]() with [arguments.len ? "the arguments [list2params(arguments)]" : "no arguments"].",admin_key=key_name(src))
+ log_admin("[key_name(src)] called [target]'s [procname]() with [arguments.len ? "the arguments [list2params(arguments)]" : "no arguments"].")
if(arguments.len)
returnval = call(target, procname)(arglist(arguments))
else
@@ -162,7 +162,7 @@
to_chat(usr, "Invalid proc path /proc/[procname].")
return
- log_admin("[key_name(src)] called [procname]() with [arguments.len ? "the arguments [list2params(arguments)]" : "no arguments"].",admin_key=key_name(src))
+ log_admin("[key_name(src)] called [procname]() with [arguments.len ? "the arguments [list2params(arguments)]" : "no arguments"].")
returnval = call(procpath)(arglist(arguments))
to_chat(usr, "[procname]() returned: [isnull(returnval) ? "null" : returnval]")
diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm
index ce5e3024520..b538949421e 100644
--- a/code/modules/admin/player_notes.dm
+++ b/code/modules/admin/player_notes.dm
@@ -104,7 +104,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
info << infos
message_admins(SPAN_NOTICE("[key_name_admin(user)] has edited [key]'s notes."))
- log_admin("[key_name(user)] has edited [key]'s notes.",admin_key=key_name(user),ckey=key)
+ log_admin("[key_name(user)] has edited [key]'s notes.")
del(info) // savefile, so NOT qdel
@@ -129,7 +129,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
info << infos
message_admins(SPAN_NOTICE("[key_name_admin(usr)] deleted one of [key]'s notes."))
- log_admin("[key_name(usr)] deleted one of [key]'s notes.",admin_key=key_name(usr),ckey=key)
+ log_admin("[key_name(usr)] deleted one of [key]'s notes.")
qdel(info)
diff --git a/code/modules/admin/player_notes_sql.dm b/code/modules/admin/player_notes_sql.dm
index d3f5a6c6f30..c76fbf40bdc 100644
--- a/code/modules/admin/player_notes_sql.dm
+++ b/code/modules/admin/player_notes_sql.dm
@@ -29,7 +29,7 @@
insert_query.Execute(query_details)
message_admins(SPAN_NOTICE("[key_name_admin(user)] has edited [player_ckey]'s notes."))
- log_admin("[key_name(user)] has edited [player_ckey]'s notes.",admin_key=key_name(user),ckey=player_ckey)
+ log_admin("[key_name(user)] has edited [player_ckey]'s notes.")
/proc/notes_edit_sql(var/note_id, var/note_edit)
if (!note_id || !note_edit)
@@ -67,7 +67,7 @@
deletequery.Execute(list("note_id" = note_id))
message_admins(SPAN_NOTICE("[key_name_admin(usr)] deleted one of [ckey]'s notes."))
- log_admin("[key_name(usr)] deleted one of [ckey]'s notes.",admin_key=key_name(usr),ckey=ckey)
+ log_admin("[key_name(usr)] deleted one of [ckey]'s notes.")
else
to_chat(usr, "Cancelled")
return
diff --git a/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm b/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm
index 2b532b1a95e..0281156975a 100644
--- a/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm
+++ b/code/modules/admin/secrets/admin_secrets/jump_shuttle.dm
@@ -29,8 +29,8 @@
S.long_jump(origin_area, destination_area, transition_area, move_duration)
message_admins(SPAN_NOTICE("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle"), 1)
- log_admin("[key_name(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle",admin_key=key_name(user))
+ log_admin("[key_name(user)] has initiated a jump from [origin_area] to [destination_area] lasting [move_duration] seconds for the [shuttle_tag] shuttle")
else
S.short_jump(origin_area, destination_area)
message_admins(SPAN_NOTICE("[key_name_admin(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle"), 1)
- log_admin("[key_name(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle",admin_key=key_name(user))
+ log_admin("[key_name(user)] has initiated a jump from [origin_area] to [destination_area] for the [shuttle_tag] shuttle")
diff --git a/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm b/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm
index f2c6427d11e..5ce52bcd482 100644
--- a/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm
+++ b/code/modules/admin/secrets/fun_secrets/toggle_bomb_cap.dm
@@ -18,4 +18,4 @@
var/range_high = GLOB.max_explosion_range *0.5
var/range_low = GLOB.max_explosion_range
message_admins(SPAN_DANGER("[key_name_admin(user)] changed the bomb cap to [range_dev], [range_high], [range_low]"), 1)
- log_admin("[key_name(user)] changed the bomb cap to [GLOB.max_explosion_range]",admin_key=key_name(user))
+ log_admin("[key_name(user)] changed the bomb cap to [GLOB.max_explosion_range]")
diff --git a/code/modules/admin/secrets/random_events/gravity.dm b/code/modules/admin/secrets/random_events/gravity.dm
index 9de13d7073b..25284f3638f 100644
--- a/code/modules/admin/secrets/random_events/gravity.dm
+++ b/code/modules/admin/secrets/random_events/gravity.dm
@@ -23,10 +23,10 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","Grav")
if(GLOB.gravity_is_on)
- log_admin("[key_name(user)] toggled gravity on.", admin_key=key_name(user))
+ log_admin("[key_name(user)] toggled gravity on.")
message_admins(SPAN_NOTICE("[key_name_admin(user)] toggled gravity on."), 1)
command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.")
else
- log_admin("[key_name(user)] toggled gravity off.", admin_key=key_name(user))
+ log_admin("[key_name(user)] toggled gravity off.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] toggled gravity off."), 1)
command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes. Have a nice day.")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 86f94ec9f0a..63cdec64a8e 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2,7 +2,7 @@
..()
if(usr.client != src.owner || !check_rights(0))
- log_admin("[key_name(usr)] tried to use the admin panel without authorization.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
message_admins("[usr.key] has attempted to override the admin panel!")
return
@@ -135,7 +135,7 @@
return
SSticker.delay_end = !SSticker.delay_end
- log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
message_admins(SPAN_NOTICE("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"]."), 1)
href_list["secretsadmin"] = "check_antagonist"
@@ -156,7 +156,7 @@
if("Yes")
delmob = 1
- log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]"), 1)
switch(href_list["simplemake"])
@@ -252,7 +252,7 @@
if(!reason)
return
- log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]"), 1)
Banlist.cd = "/base/[banfolder]"
@@ -300,7 +300,7 @@
to_chat_immediate(M, SPAN_DANGER("You have been kicked from the server"))
else
to_chat_immediate(M, SPAN_DANGER("You have been kicked from the server: [reason]"))
- log_admin("[key_name(usr)] booted [key_name(M)].",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] booted [key_name(M)].")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] booted [key_name_admin(M)]."), 1)
//M.client = null
del(M.client)
@@ -348,7 +348,7 @@
to_chat_immediate(M, SPAN_WARNING("To try to resolve this matter head to [GLOB.config.banappeals]"))
else
to_chat_immediate(M, SPAN_WARNING("No ban appeals URL has been set."))
- log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
message_admins(SPAN_NOTICE("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes."))
del(M.client)
@@ -376,7 +376,7 @@
notes_add(M.ckey,"[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.",usr)
else
notes_add_sql(M.ckey, "[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.", usr, M.lastKnownIP, M.computer_id)
- log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
message_admins(SPAN_NOTICE("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban."))
feedback_inc("ban_perma",1)
DB_ban_record(BANTYPE_PERMA, M, -1, reason)
@@ -440,7 +440,7 @@
if (ROUND_IS_STARTED)
return alert(usr, "The game has already started.", null, null, null, null)
GLOB.master_mode = href_list["c_mode2"]
- log_admin("[key_name(usr)] set the mode as [GLOB.master_mode].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] set the mode as [GLOB.master_mode].")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] set the mode as [GLOB.master_mode]."), 1)
to_world(SPAN_NOTICE("The mode is now: [GLOB.master_mode]"))
Game() // updates the main game menu
@@ -456,7 +456,7 @@
if(GLOB.master_mode != "secret")
return alert(usr, "The game mode has to be secret!", null, null, null, null)
GLOB.secret_force_mode = href_list["f_secret2"]
- log_admin("[key_name(usr)] set the forced secret mode as [GLOB.secret_force_mode].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] set the forced secret mode as [GLOB.secret_force_mode].")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] set the forced secret mode as [GLOB.secret_force_mode]."), 1)
Game() // updates the main game menu
.(href, list("f_secret"=1))
@@ -482,7 +482,7 @@
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
- log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]"), 1)
H.monkeyize()
@@ -495,7 +495,7 @@
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
- log_admin("[key_name(usr)] attempting to corgize [key_name(H)]",admin_key=key_name(usr),ckey=key_name(H))
+ log_admin("[key_name(usr)] attempting to corgize [key_name(H)]")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]"), 1)
H.corgize()
@@ -512,7 +512,7 @@
return
M.say(speech)
speech = sanitize(speech) // Nah, we don't trust them
- log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]"))
else if(href_list["sendbacktolobby"])
@@ -562,7 +562,7 @@
M.forceMove(pick(GLOB.tdome1))
spawn(50)
to_chat(M, SPAN_NOTICE("You have been sent to the Thunderdome."))
- log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1)
else if(href_list["tdome2"])
@@ -588,7 +588,7 @@
M.forceMove(pick(GLOB.tdome2))
spawn(50)
to_chat(M, SPAN_NOTICE("You have been sent to the Thunderdome."))
- log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1)
else if(href_list["tdomeadmin"])
@@ -611,7 +611,7 @@
M.forceMove(pick(GLOB.tdomeadmin))
spawn(50)
to_chat(M, SPAN_NOTICE("You have been sent to the Thunderdome."))
- log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1)
else if(href_list["tdomeobserve"])
@@ -641,7 +641,7 @@
M.forceMove(pick(GLOB.tdomeobserve))
spawn(50)
to_chat(M, SPAN_NOTICE("You have been sent to the Thunderdome."))
- log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1)
else if(href_list["revive"])
@@ -656,7 +656,7 @@
if(GLOB.config.allow_admin_rev)
L.revive()
message_admins(SPAN_DANGER("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!"), 1)
- log_admin("[key_name(usr)] healed / Revived [key_name(L)]",admin_key=key_name(usr),ckey=key_name(L))
+ log_admin("[key_name(usr)] healed / Revived [key_name(L)]")
else
to_chat(usr, "Admin Rejuvinates have been disabled")
@@ -670,7 +670,7 @@
return
message_admins(SPAN_DANGER("Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!"), 1)
- log_admin("[key_name(usr)] AIized [key_name(H)]",admin_key=key_name(usr),ckey=key_name(H))
+ log_admin("[key_name(usr)] AIized [key_name(H)]")
H.AIize()
else if(href_list["makeslime"])
@@ -850,14 +850,14 @@
if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookie)))
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand )
if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
- log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].",admin_key=key_name(src.owner),ckey=key_name(H))
+ log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
return
else
H.update_inv_r_hand()//To ensure the icon appears in the HUD
else
H.update_inv_l_hand()
- log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]",admin_key=key_name(src.owner),ckey=key_name(H))
+ log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]")
message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]")
feedback_inc("admin_cookies_spawned",1)
to_chat(H, SPAN_NOTICE("Your prayers have been answered!! You received the best cookie!"))
@@ -883,7 +883,7 @@
BSACooldown = 0
to_chat(M, "You've been hit by bluespace artillery!")
- log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]",admin_key=key_name(src.owner),ckey=key_name(M))
+ log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
message_admins("[key_name_admin(M)] has been hit by Bluespace Artillery fired by [src.owner]")
M.canmove = FALSE
@@ -917,7 +917,7 @@
if(!input) return
to_chat(src.owner, "You sent [input] to [L] via a secure channel.")
- log_admin("[src.owner] replied to [key_name(L)]'s Centcomm message with the message [input].",admin_key=key_name(src.owner),ckey=key_name(L))
+ log_admin("[src.owner] replied to [key_name(L)]'s Centcomm message with the message [input].")
message_admins("[src.owner] replied to [key_name(L)]'s Centcom message with: \"[input]\"")
if(!isAI(L))
to_chat(L, "You hear something crackle in your headset for a moment before a voice speaks.")
@@ -942,7 +942,7 @@
var/input = sanitize(input(src.owner, "Please enter a message to reply to [key_name(H)] via the Hivenet.", "Outgoing transmission from the Hive...", ""))
if(!input) return
to_chat(src.owner, "You sent [input] to [H] via a secure Hivenet channel.")
- log_admin("[src.owner] replied to [key_name(H)]'s Hivenet message with the message [input].", admin_key=key_name(src.owner), ckey=key_name(H))
+ log_admin("[src.owner] replied to [key_name(H)]'s Hivenet message with the message [input].")
to_chat(H, SPAN_INFO("You feel something shifting in the Hivenet, an encrypted whisper transmitted directly to your neural socket. Message as follows."))
to_chat(H, SPAN_NOTICE(SPAN_BOLD("\"[input]\"")))
to_chat(H, SPAN_INFO("Message ends."))
@@ -960,7 +960,7 @@
if(!input) return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
- log_admin("[src.owner] replied to [key_name(H)]'s illegal message with the message [input].", admin_key=key_name(src.owner), ckey=key_name(H))
+ log_admin("[src.owner] replied to [key_name(H)]'s illegal message with the message [input].")
to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. \"[input]\" Message ends.\"")
else if(href_list["AdminFaxView"])
@@ -1227,7 +1227,7 @@
if(choice=="Confirm")
SSnews.CreateFeedChannel(admincaster_feed_channel.channel_name, admincaster_signature, admincaster_feed_channel.locked, 1)
feedback_inc("newscaster_channels",1) //Adding channel to the global network
- log_admin("[key_name_admin(usr)] created command feed channel: [src.admincaster_feed_channel.channel_name]!",admin_key=key_name(usr))
+ log_admin("[key_name_admin(usr)] created command feed channel: [src.admincaster_feed_channel.channel_name]!")
src.admincaster_screen=5
src.access_news_network()
@@ -1252,7 +1252,7 @@
SSnews.SubmitArticle(src.admincaster_feed_message.body, src.admincaster_signature, ch, null, 1)
src.admincaster_screen=4
- log_admin("[key_name_admin(usr)] submitted a feed story to channel: [src.admincaster_feed_channel.channel_name]!",admin_key=key_name(usr))
+ log_admin("[key_name_admin(usr)] submitted a feed story to channel: [src.admincaster_feed_channel.channel_name]!")
src.access_news_network()
else if(href_list["ac_create_channel"])
@@ -1313,7 +1313,7 @@
SSnews.wanted_issue.body = src.admincaster_feed_message.body
SSnews.wanted_issue.backup_author = src.admincaster_feed_message.backup_author
src.admincaster_screen = 19
- log_admin("[key_name_admin(usr)] issued a Station-wide Wanted Notification for [src.admincaster_feed_message.author]!",admin_key=key_name(usr))
+ log_admin("[key_name_admin(usr)] issued a Station-wide Wanted Notification for [src.admincaster_feed_message.author]!")
src.access_news_network()
else if(href_list["ac_cancel_wanted"])
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index d4ad5a9ba39..0f6ecbb4f10 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -131,7 +131,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
to_chat(src, SPAN_NOTICE("PM to-Staff : [original_msg]"))
var/admin_number_active = admin_number_present - admin_number_afk
- log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.",admin_key=key_name(src))
+ log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
if(admin_number_active <= 0)
SSdiscord.post_webhook_event(WEBHOOK_ADMIN_PM_IMPORTANT, list("title"="Help is requested", "message"="Request for Help from **[key_name(src)]**: ```[html_decode(original_msg)]```\n[admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!"))
SSdiscord.send_to_admins("@here Request for Help from [key_name(src)]: [html_decode(original_msg)] - !![admin_number_afk ? "All admins AFK ([admin_number_afk])" : "No admins online"]!!")
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index c54280bbf6a..74f21a053b4 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -19,7 +19,7 @@
usr.on_mob_jump()
usr.forceMove(pick(get_area_turfs(A)))
- log_admin("[key_name(usr)] jumped to [A]", admin_key=key_name(usr))
+ log_admin("[key_name(usr)] jumped to [A]")
message_admins("[key_name_admin(usr)] jumped to [A]", 1)
feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
else
@@ -36,7 +36,7 @@
return
if(GLOB.config.allow_admin_jump)
- log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]", 1)
usr.on_mob_jump()
usr.forceMove(T)
@@ -56,7 +56,7 @@
return
if(GLOB.config.allow_admin_jump)
- log_admin("[key_name(usr)] jumped to [key_name(M)]", admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] jumped to [key_name(M)]")
message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
if(src.mob)
var/mob/A = src.mob
@@ -207,7 +207,7 @@
to_chat(src, "No keys found.")
return
var/mob/M = selection:mob
- log_admin("[key_name(usr)] jumped to [key_name(M)]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] jumped to [key_name(M)]")
message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]", 1)
usr.on_mob_jump()
usr.forceMove(M.loc)
@@ -222,7 +222,7 @@
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
return
if(GLOB.config.allow_admin_jump)
- log_admin("[key_name(usr)] teleported [key_name(M)]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] teleported [key_name(M)]")
message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)]", 1)
M.on_mob_jump()
M.forceMove(get_turf(usr))
@@ -249,7 +249,7 @@
if(!M)
return
- log_admin("[key_name(usr)] teleported [key_name(M)]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] teleported [key_name(M)]")
message_admins("[key_name_admin(usr)] teleported [key_name(M)]", 1)
if(M)
M.on_mob_jump()
@@ -270,7 +270,7 @@
M.forceMove(pick(get_area_turfs(A)))
feedback_add_details("admin_verb","SMOB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] teleported [key_name(M)] to [A]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] teleported [key_name(M)] to [A]")
message_admins("[key_name_admin(usr)] teleported [key_name_admin(M)] to [A]", 1)
else
alert("Admin jumping disabled")
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index b42dbbf3c4c..c1c8f0848f6 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -149,7 +149,7 @@
if(C.prefs && C.prefs.toggles & SOUND_ADMINHELP)
sound_to(C, 'sound/effects/adminhelp.ogg')
- log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]", admin_key = key_name(src), ckey_target = key_name(C))
+ log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
ticket.append_message(src.ckey, C.ckey, msg)
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 314bf257380..256728d8358 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -7,7 +7,7 @@
msg = sanitize(msg)
if(!msg) return
- log_admin("ADMIN: [key_name(src)] : [msg]",admin_key=key_name(src))
+ log_admin("ADMIN: [key_name(src)] : [msg]")
if(check_rights(R_ADMIN,0))
for(var/s in GLOB.staff)
@@ -25,7 +25,7 @@
if(!check_rights(R_ADMIN|R_MOD)) return
msg = sanitize(msg)
- log_admin("MOD: [key_name(src)] : [msg]",admin_key=key_name(src))
+ log_admin("MOD: [key_name(src)] : [msg]")
if (!msg)
return
@@ -50,7 +50,7 @@
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
if(!msg) return
- log_admin("DEV: [key_name(src)] : [msg]",admin_key=key_name(src))
+ log_admin("DEV: [key_name(src)] : [msg]")
if(check_rights(R_DEV,0))
msg = "[create_text_tag("DEV")] [key_name(usr, 0, 1, 0)]: [msg]"
@@ -69,7 +69,7 @@
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
if(!msg) return
- log_admin("CCIASAY: [key_name(src)] : [msg]",admin_key=key_name(src))
+ log_admin("CCIASAY: [key_name(src)] : [msg]")
if(check_rights((R_CCIAA|R_ADMIN),0))
msg = "[create_text_tag("CCIA")] [key_name(usr, 0, 1, 0)]: [msg]"
diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm
index d76ea162cae..fc300de89d7 100644
--- a/code/modules/admin/verbs/antag-ooc.dm
+++ b/code/modules/admin/verbs/antag-ooc.dm
@@ -26,7 +26,7 @@
else if (M.mind && M.mind.special_role && M.client && player_is_antag(M.mind))
to_chat(M, "" + create_text_tag("A-OOC", M.client) + " [display_name]: [msg]")
- log_ooc("(ANTAG) [key] : [msg]",ckey=key_name(mob))
+ log_ooc("(ANTAG) [key] : [msg]")
// Checks if a newly joined player is an antag, and adds the AOOC verb if they are.
// Because they're tied to client objects, this gets removed every time you disconnect.
diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm
index 197c3a88910..48bce015480 100644
--- a/code/modules/admin/verbs/cinematic.dm
+++ b/code/modules/admin/verbs/cinematic.dm
@@ -21,7 +21,7 @@
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","mercenary","AI malfunction","no override")
SSticker.station_explosion_cinematic(parameter,override)
- log_admin("[key_name(src)] launched cinematic \"[cinematic]\"",admin_key=key_name(usr))
+ log_admin("[key_name(src)] launched cinematic \"[cinematic]\"")
message_admins("[key_name_admin(src)] launched cinematic \"[cinematic]\"", 1)
return
diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm
index 5432def3582..75f83ec5aef 100644
--- a/code/modules/admin/verbs/custom_event.dm
+++ b/code/modules/admin/verbs/custom_event.dm
@@ -10,11 +10,11 @@
var/input = sanitize(input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", GLOB.custom_event_msg) as message|null, MAX_BOOK_MESSAGE_LEN, extra = 0)
if(!input || input == "")
GLOB.custom_event_msg = null
- log_admin("[usr.key] has cleared the custom event text.",admin_key=key_name(usr))
+ log_admin("[usr.key] has cleared the custom event text.")
message_admins("[key_name_admin(usr)] has cleared the custom event text.")
return
- log_admin("[usr.key] has changed the custom event text.",admin_key=key_name(usr))
+ log_admin("[usr.key] has changed the custom event text.")
message_admins("[key_name_admin(usr)] has changed the custom event text.")
GLOB.custom_event_msg = input
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index aeb578e8813..2f0dc4f0e85 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -20,7 +20,7 @@
var/stafftype = uppertext(holder.rank)
msg = sanitize(msg)
- log_admin("DSAY: [key_name(src)] : [msg]",admin_key=key_name(src))
+ log_admin("DSAY: [key_name(src)] : [msg]")
msg = process_chat_markup(msg)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index b8d55c4c443..e863441a0ad 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -6,11 +6,11 @@
if(GLOB.Debug2)
GLOB.Debug2 = 0
message_admins("[key_name(src)] toggled debugging off.")
- log_admin("[key_name(src)] toggled debugging off.",admin_key=key_name(usr))
+ log_admin("[key_name(src)] toggled debugging off.")
else
GLOB.Debug2 = 1
message_admins("[key_name(src)] toggled debugging on.")
- log_admin("[key_name(src)] toggled debugging on.",admin_key=key_name(usr))
+ log_admin("[key_name(src)] toggled debugging on.")
switch(alert("Do you want to print all logs to world? This should ONLY EVER HAPPEN IN CRISIS OR DURING DEBUGGING / DEVELOPMENT.", "All logs to world?", "No", "Yes"))
if("Yes")
@@ -72,7 +72,7 @@
alert("Wait until the game starts")
return
if(istype(M, /mob/living/carbon/human))
- log_admin("[key_name(src)] has robotized [M.key].",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(src)] has robotized [M.key].")
spawn(10)
M:Robotize()
@@ -95,7 +95,7 @@
alert("The mob must not be a new_player.")
return
- log_admin("[key_name(src)] has animalized [M.key].",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(src)] has animalized [M.key].")
spawn(10)
M.Animalize()
@@ -135,7 +135,7 @@
set category = "Debug"
set name = "Make Powernets"
SSmachinery.makepowernets()
- log_admin("[key_name(src)] has remade the powernet. makepowernets() called.",admin_key=key_name(usr))
+ log_admin("[key_name(src)] has remade the powernet. makepowernets() called.")
message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -164,7 +164,7 @@
else
alert("Invalid mob")
feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(src)] has granted [M.key] full access.",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(src)] has granted [M.key] full access.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] has granted [M.key] full access."), 1)
/client/proc/cmd_assume_direct_control(var/mob/M in GLOB.mob_list)
@@ -180,7 +180,7 @@
var/mob/abstract/observer/ghost = new/mob/abstract/observer(M,1)
ghost.ckey = M.ckey
message_admins(SPAN_NOTICE("[key_name_admin(usr)] assumed direct control of [M]."), 1)
- log_admin("[key_name(usr)] assumed direct control of [M].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] assumed direct control of [M].")
var/mob/adminmob = src.mob
M.ckey = src.ckey
if( isobserver(adminmob) )
@@ -377,7 +377,7 @@
M.regenerate_icons()
- log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [chosen_outfit].",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [chosen_outfit].")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [chosen_outfit]."), 1)
return
@@ -414,7 +414,7 @@
var/state="[M.dna.GetSEState(block)?"on":"off"]"
var/blockname=assigned_blocks[block]
message_admins("[key_name_admin(src)] has toggled [M.key]'s [blockname] block [state]!")
- log_admin("[key_name(src)] has toggled [M.key]'s [blockname] block [state]!",admin_key=key_name(src),ckey=key_name(M))
+ log_admin("[key_name(src)] has toggled [M.key]'s [blockname] block [state]!")
else
alert("Invalid mob")
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 54f1aa29821..baf2d4e098a 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -391,5 +391,5 @@
if (A.type == O.type)
A.vv_edit_var(variable, O.vars[variable])
- log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]",admin_key=key_name(src))
+ log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 1c01ce7f46f..e71055bc5c5 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -160,7 +160,7 @@ var/list/VVdynamic_lock = list(
if("No")
L += var_value
world.log << "### ListVarEdit by [src]: [O.type] [objectvar]: ADDED=[var_value]"
- log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]",admin_key=key_name(src))
+ log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
/client/proc/mod_list(var/list/L, atom/O, original_name, objectvar)
@@ -318,7 +318,7 @@ var/list/VVdynamic_lock = list(
if("DELETE FROM LIST")
world.log << "### ListVarEdit by [src]: [O.type] [objectvar]: REMOVED=[html_encode("[variable]")]"
- log_admin("[key_name(src)] modified [original_name]'s [objectvar]: REMOVED=[variable]",admin_key=key_name(src))
+ log_admin("[key_name(src)] modified [original_name]'s [objectvar]: REMOVED=[variable]")
message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: REMOVED=[variable]")
L -= variable
return
@@ -398,7 +398,7 @@ var/list/VVdynamic_lock = list(
L[L.Find(variable)] = new_var
world.log << "### ListVarEdit by [src]: [O.type] [objectvar]: [original_var]=[new_var]"
- log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]",admin_key=key_name(src))
+ log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]")
message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_var]")
/client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
@@ -708,5 +708,5 @@ var/list/VVdynamic_lock = list(
O.vars[variable] = holder.marked_datum
world.log << "### VarEdit by [src]: [O.type] [variable]=[html_encode("[O.vars[variable]]")]"
- log_admin("[key_name(src)] modified [original_name]'s [variable] to [O.vars[variable]]",admin_key=key_name(src))
+ log_admin("[key_name(src)] modified [original_name]'s [variable] to [O.vars[variable]]")
message_admins("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]")
diff --git a/code/modules/admin/verbs/ntsl.dm b/code/modules/admin/verbs/ntsl.dm
index a19cd59cd67..95c0fcfd9d8 100644
--- a/code/modules/admin/verbs/ntsl.dm
+++ b/code/modules/admin/verbs/ntsl.dm
@@ -4,7 +4,7 @@
if(!check_rights(R_DEBUG)) return
if(SSntsl2.connected)
- log_admin("[key_name(src)] disabled NTSL",admin_key=key_name(src))
+ log_admin("[key_name(src)] disabled NTSL")
message_admins("[key_name_admin(src)] disabled NTSL", 1)
SSntsl2.disconnect()
@@ -19,7 +19,7 @@
if(!check_rights(R_DEBUG)) return
if(!SSntsl2.connected)
- log_admin("[key_name(src)] enabled NTSL",admin_key=key_name(src))
+ log_admin("[key_name(src)] enabled NTSL")
message_admins("[key_name_admin(src)] enabled NTSL", 1)
SSntsl2.attempt_connect()
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index e08c71cd862..be280f7ae66 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -13,7 +13,7 @@ var/list/sounds_cache = list()
if(alert("Do you ready?\nSong: [S]\nNow you can also play this sound using \"Play Server Sound\".", "Confirmation request" ,"Play", "Cancel") == "Cancel")
return
- log_admin("[key_name(src)] played sound [S]",admin_key=key_name(src))
+ log_admin("[key_name(src)] played sound [S]")
message_admins("[key_name_admin(src)] played sound [S]", 1)
for(var/mob/M in GLOB.player_list)
if(M.client.prefs.toggles & SOUND_MIDI)
@@ -26,7 +26,7 @@ var/list/sounds_cache = list()
set name = "Play Local Sound"
if(!check_rights(R_SOUNDS)) return
- log_admin("[key_name(src)] played a local sound [S]",admin_key=key_name(src))
+ log_admin("[key_name(src)] played a local sound [S]")
message_admins("[key_name_admin(src)] played a local sound [S]", 1)
playsound(get_turf(src.mob), S, 50, 0, 0)
feedback_add_details("admin_verb","PLS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index f04690819c7..484947964c2 100644
--- a/code/modules/admin/verbs/possess.dm
+++ b/code/modules/admin/verbs/possess.dm
@@ -10,10 +10,10 @@
var/turf/T = get_turf(O)
if(T)
- log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])")
message_admins("[key_name(usr)] has possessed [O] ([O.type]) at ([T.x], [T.y], [T.z])", 1)
else
- log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location")
message_admins("[key_name(usr)] has possessed [O] ([O.type]) at an unknown location", 1)
if(!usr.control_object) //If you're not already possessing something...
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index b7336598c6a..937aea4857a 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -12,7 +12,7 @@
for(var/obj/item/W in M)
M.drop_from_inventory(W)
- log_admin("[key_name(usr)] made [key_name(M)] drop everything!",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)
feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -35,7 +35,7 @@
if(usr.client.holder)
to_chat(M, "You hear a voice in your head... [msg]")
- log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
message_admins(SPAN_NOTICE("SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]"), 1)
feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -88,7 +88,7 @@
if (!msg)
return
to_world("[msg]")
- log_admin("GlobalNarrate: [key_name(usr)] : [msg]",admin_key=key_name(usr))
+ log_admin("GlobalNarrate: [key_name(usr)] : [msg]")
message_admins(SPAN_NOTICE("\bold GlobalNarrate: [key_name_admin(usr)] : [msg]
"), 1)
feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -115,7 +115,7 @@
return
for(var/M in message_mobs)
to_chat(M, msg)
- log_admin("LocalNarrate: [key_name(usr)] : [msg]", admin_key = key_name(usr))
+ log_admin("LocalNarrate: [key_name(usr)] : [msg]")
message_admins(SPAN_NOTICE("\bold LocalNarrate: [key_name_admin(usr)] : [msg]
"), 1)
feedback_add_details("admin_verb", "LCLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -139,7 +139,7 @@
return
to_chat(M, msg)
- log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
message_admins(SPAN_NOTICE("\bold DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
"), 1)
feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -152,7 +152,7 @@
M.status_flags ^= GODMODE
to_chat(usr, SPAN_NOTICE("Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]"))
- log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1)
feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -189,7 +189,7 @@
if(automute)
muteunmute = "auto-muted"
M.client.prefs.muted |= mute_type
- log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]",ckey=key_name(M))
+ log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]")
message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(M)] from [mute_string].", 1)
to_chat(M, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.")
feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -203,7 +203,7 @@
muteunmute = "muted"
M.client.prefs.muted |= mute_type
- log_admin("[key_name(usr)] has [muteunmute] [key_name(M)] from [mute_string]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] has [muteunmute] [key_name(M)] from [mute_string]")
message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(M)] from [mute_string].", 1)
to_chat(M, "You have been [muteunmute] from [mute_string].")
feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -216,7 +216,7 @@
return
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm != "Yes") return
- log_admin("[key_name(src)] has added a random AI law.",admin_key=key_name(usr))
+ log_admin("[key_name(src)] has added a random AI law.")
message_admins("[key_name_admin(src)] has added a random AI law.", 1)
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
@@ -294,7 +294,7 @@ Ccomp's first proc.
G.can_reenter_corpse = 1
G:show_message(SPAN_NOTICE("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1)
- log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the [GLOB.config.respawn_delay] minute respawn limit", admin_key=key_name(usr), ckey=key_name(G))
+ log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the [GLOB.config.respawn_delay] minute respawn limit")
message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the [GLOB.config.respawn_delay] minute respawn limit", 1)
/client/proc/allow_stationbound_reset(mob/living/silicon/robot/R in range(world.view))
@@ -317,7 +317,7 @@ Ccomp's first proc.
to_chat(R, FONT_LARGE(SPAN_NOTICE("An admin has allowed you to reset your module.")))
- log_admin("[key_name(usr)] allowed [key_name(R)] to reset themselves as a stationbound.", admin_key = key_name(usr), ckey = key_name(R))
+ log_admin("[key_name(usr)] allowed [key_name(R)] to reset themselves as a stationbound.")
message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(R)] to reset themselves as a stationbound.", 1)
@@ -350,7 +350,7 @@ Ccomp's first proc.
to_chat(src, SPAN_NOTICE("AntagHUD usage has been enabled."))
- log_admin("[key_name(usr)] has [action] antagHUD usage for observers",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has [action] antagHUD usage for observers")
message_admins("Admin [key_name_admin(usr)] has [action] antagHUD usage for observers", 1)
@@ -378,7 +378,7 @@ Ccomp's first proc.
GLOB.config.antag_hud_restricted = 1
to_chat(src, SPAN_DANGER("AntagHUD restrictions have been enabled"))
- log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD")
message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1)
/*
@@ -514,7 +514,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_chat(O, SPAN_DANGER("" + input + "...LAWS UPDATED"))
O.show_laws()
- log_admin("Admin [key_name(usr)] has added a new AI law - [input]",admin_key=key_name(usr))
+ log_admin("Admin [key_name(usr)] has added a new AI law - [input]")
message_admins("Admin [key_name_admin(usr)] has added a new AI law - [input]", 1)
var/show_log = alert(src, "Show ion message?", "Message", "Yes", "No")
@@ -536,7 +536,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(GLOB.config.allow_admin_rev)
M.revive()
- log_admin("[key_name(usr)] healed / revived [key_name(M)]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] healed / revived [key_name(M)]")
message_admins(SPAN_DANGER("Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!"), 1)
else
alert("Admin revive disabled")
@@ -604,7 +604,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_world(SPAN_WARNING("New [SSatlas.current_map.company_name] Update available at all communication consoles."))
sound_to(world, ('sound/AI/commandreport.ogg'))
- log_admin("[key_name(src)] has created a command report: [reportbody]",admin_key=key_name(usr))
+ log_admin("[key_name(src)] has created a command report: [reportbody]")
message_admins("[key_name_admin(src)] has created a command report", 1)
feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -628,7 +628,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/mob/abstract/observer/M = O
if (M.client && alert(src, "They are still connected. Are you sure, they will loose connection.", "Confirmation", "Yes", "No") != "Yes")
return
- log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -677,7 +677,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
explosion(O, devastation, heavy, light, flash)
- log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flash]) at ([O.x],[O.y],[O.z])",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flash]) at ([O.x],[O.y],[O.z])")
message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flash]) at ([O.x],[O.y],[O.z])", 1)
feedback_add_details("admin_verb","EXPL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -698,7 +698,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if (heavy || light)
empulse(O, heavy, light)
- log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at ([O.x],[O.y],[O.z])")
message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[light]) at ([O.x],[O.y],[O.z])", 1)
feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -717,7 +717,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
//Due to the delay here its easy for something to have happened to the mob
if(!M) return
- log_admin("[key_name(usr)] has gibbed [key_name(M)]",admin_key=key_name(usr),ckey=key_name(M))
+ log_admin("[key_name(usr)] has gibbed [key_name(M)]")
message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]", 1)
if(istype(M, /mob/abstract/observer))
@@ -738,7 +738,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
mob.gib()
- log_admin("[key_name(usr)] used gibself.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] used gibself.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] used gibself."), 1)
feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -872,7 +872,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
else
view = world.view
- log_admin("[key_name(usr)] changed their view range to [view].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] changed their view range to [view].")
//message_admins("\blue [key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI
feedback_add_details("admin_verb","CVRA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -911,7 +911,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] admin-called an evacuation.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] admin-called an evacuation.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] admin-called an evacuation"), 1)
return
@@ -941,7 +941,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
evacuation_controller.cancel_evacuation()
feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] admin-cancelled the evacuation.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] admin-cancelled the evacuation.")
message_admins(SPAN_NOTICE("[key_name_admin(usr)] admin-cancelled the evacuation."), 1)
return
@@ -958,7 +958,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
evacuation_controller.deny = !evacuation_controller.deny
- log_admin("[key_name(src)] has [evacuation_controller.deny ? "denied" : "allowed"] the evacuation to be called.",admin_key=key_name(usr))
+ log_admin("[key_name(src)] has [evacuation_controller.deny ? "denied" : "allowed"] the evacuation to be called.")
message_admins("[key_name_admin(usr)] has [evacuation_controller.deny ? "denied" : "allowed"] the evacuation to be called.")
/client/proc/cmd_admin_attack_log(mob/M as mob in GLOB.mob_list)
@@ -993,7 +993,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(notifyplayers == "Cancel")
return
- log_admin("Admin [key_name(src)] has forced the players to have random appearances.",admin_key=key_name(usr))
+ log_admin("Admin [key_name(src)] has forced the players to have random appearances.")
message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.", 1)
if(notifyplayers == "Yes")
@@ -1038,7 +1038,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSticker.send_tip_of_the_round(input)
message_admins("[key_name_admin(usr)] sent a tip of the round.")
- log_admin("[key_name(usr)] sent \"[input]\" as the Tip of the Round.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] sent \"[input]\" as the Tip of the Round.")
feedback_add_details("admin_verb","TIP")
/client/proc/show_tip()
@@ -1066,5 +1066,5 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("[key_name_admin(usr)] sent a pregenerated tip of the round.")
- log_admin("[key_name(usr)] sent a pregenerated Tip of the Round.",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] sent a pregenerated Tip of the Round.")
feedback_add_details("admin_verb","FAP")
diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm
index 73605190223..3e3ade69427 100644
--- a/code/modules/admin/verbs/warning.dm
+++ b/code/modules/admin/verbs/warning.dm
@@ -500,7 +500,7 @@
deleteQuery.Execute(query_details)
message_admins(SPAN_NOTICE("[key_name_admin(usr)] deleted one of [ckey]'s warnings."))
- log_admin("[key_name(usr)] deleted one of [ckey]'s warnings.", admin_key=key_name(usr), ckey=ckey)
+ log_admin("[key_name(usr)] deleted one of [ckey]'s warnings.")
else
to_chat(usr, "Cancelled")
return
@@ -516,7 +516,7 @@
reason_query.Execute(query_details)
message_admins(SPAN_NOTICE("[key_name_admin(usr)] edited one of [ckey]'s warning reasons."))
- log_admin("[key_name(usr)] edited one of [ckey]'s warning reasons.", admin_key=key_name(usr), ckey=ckey)
+ log_admin("[key_name(usr)] edited one of [ckey]'s warning reasons.")
if("editNotes")
query_details["new_notes"] = input("Edit this warning's notes.", "New Notes", notes, null) as null|text
@@ -529,4 +529,4 @@
notes_query.Execute(query_details)
message_admins(SPAN_NOTICE("[key_name_admin(usr)] edited one of [ckey]'s warning notes."))
- log_admin("[key_name(usr)] edited one of [ckey]'s warning notes.", admin_key=key_name(usr), ckey=ckey)
+ log_admin("[key_name(usr)] edited one of [ckey]'s warning notes.")
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
index 982c48c9f9f..9212ecb1c01 100644
--- a/code/modules/admin/view_variables/topic.dm
+++ b/code/modules/admin/view_variables/topic.dm
@@ -190,7 +190,7 @@
if(!i)
to_chat(usr, "No objects of this type exist")
return
- log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted)", admin_key=key_name(usr))
+ log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted)")
message_admins(SPAN_NOTICE("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted)"))
if("Type and subtypes")
var/i = 0
@@ -205,7 +205,7 @@
if(!i)
to_chat(usr, "No objects of this type exist")
return
- log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)", admin_key=key_name(usr))
+ log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)")
message_admins(SPAN_NOTICE("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)"))
else if(href_list["explode"])
@@ -503,7 +503,7 @@
return
if(amount != 0)
- log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]", admin_key=key_name(usr), ckey=key_name(L))
+ log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]")
message_admins(SPAN_NOTICE("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]"))
href_list["datumrefresh"] = href_list["mobToDamage"]
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index de5f9f5e968..952ec450eab 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -465,7 +465,7 @@ var/list/localhost_addresses = list(
// New player, and we don't want any.
if (!holder)
if (GLOB.config.access_deny_new_players && player_age == -1)
- log_access("Failed Login: [key] [computer_id] [address] - New player attempting connection during panic bunker.", ckey = ckey)
+ log_access("Failed Login: [key] [computer_id] [address] - New player attempting connection during panic bunker.")
message_admins("Failed Login: [key] [computer_id] [address] - New player attempting connection during panic bunker.")
to_chat_immediate(src, SPAN_DANGER("Apologies, but the server is currently not accepting connections from never before seen players."))
del(src)
@@ -473,7 +473,7 @@ var/list/localhost_addresses = list(
// Check if the account is too young.
if (GLOB.config.access_deny_new_accounts != -1 && account_age != -1 && account_age <= GLOB.config.access_deny_new_accounts)
- log_access("Failed Login: [key] [computer_id] [address] - Account too young to play. [account_age] days.", ckey = ckey)
+ log_access("Failed Login: [key] [computer_id] [address] - Account too young to play. [account_age] days.")
message_admins("Failed Login: [key] [computer_id] [address] - Account too young to play. [account_age] days.")
to_chat_immediate(src, SPAN_DANGER("Apologies, but the server is currently not accepting connections from BYOND accounts this young."))
del(src)
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index b3e8da95d48..a8f43e8b7d2 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -186,7 +186,7 @@
if(act != "me")
return
- log_emote("Ghost/[src.key] : [message]",ckey=key_name(src))
+ log_emote("Ghost/[src.key] : [message]")
if(src.client)
if(src.client.prefs.muted & (MUTE_DEADCHAT|MUTE_IC))
diff --git a/code/modules/hallucinations/mob.dm b/code/modules/hallucinations/mob.dm
index 68b8c45b0a2..c9c9b12e069 100644
--- a/code/modules/hallucinations/mob.dm
+++ b/code/modules/hallucinations/mob.dm
@@ -7,14 +7,14 @@
if(hallucination >= 60 && prob(1))
var/orig_message = message
message = pick(SShallucinations.hallucinated_phrases)
- log_say("Hallucination level changed [orig_message] by [speaker] to [message] for [key_name(src)].", ckey=key_name(src))
+ log_say("Hallucination level changed [orig_message] by [speaker] to [message] for [key_name(src)].")
return ..()
/mob/living/carbon/hear_radio(var/message, var/verb="says", var/datum/language/language, var/part_a, var/part_b, var/part_c, var/mob/speaker, var/hard_to_hear = 0, var/vname ="")
if(hallucination >= 60 && prob(1))
var/orig_message = message
message = pick(SShallucinations.hallucinated_phrases)
- log_say("Hallucination level changed [orig_message] by [speaker] to [message] for [key_name(src)].", ckey=key_name(src))
+ log_say("Hallucination level changed [orig_message] by [speaker] to [message] for [key_name(src)].")
..()
//Main handling proc, called in life()
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index 2bc9bf49346..a14abc2a7e7 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -128,10 +128,10 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
update_projections()
if(safety_disabled)
message_admins("[key_name_admin(usr)] overrode the holodeck's safeties")
- log_game("[key_name(usr)] overrided the holodeck's safeties",ckey=key_name(usr))
+ log_game("[key_name(usr)] overrided the holodeck's safeties")
else
message_admins("[key_name_admin(usr)] restored the holodeck's safeties")
- log_game("[key_name(usr)] restored the holodeck's safeties",ckey=key_name(usr))
+ log_game("[key_name(usr)] restored the holodeck's safeties")
else if(href_list["gravity"])
toggleGravity(linkedholodeck)
@@ -153,7 +153,7 @@ GLOBAL_LIST_EMPTY_TYPED(holodeck_controls, /obj/machinery/computer/holodeck_cont
update_projections()
to_chat(user, SPAN_NOTICE("You vastly increase projector power and override the safety and security protocols."))
to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [SSatlas.current_map.company_name] maintenance and do not use the simulator.")
- log_game("[key_name(usr)] emagged the Holodeck Control Computer",ckey=key_name(usr))
+ log_game("[key_name(usr)] emagged the Holodeck Control Computer")
src.updateUsrDialog()
return 1
else
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 9ad5e84cd15..806262f4f82 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -352,7 +352,7 @@
to_chat(usr, query.ErrorMsg())
else
log_and_message_admins("has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
- log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs",ckey=key_name(usr))
+ log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
alert("Upload Complete.")
if(href_list["targetid"])
diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/observer/observer.dm
index 71747f6fed1..23384f836e4 100644
--- a/code/modules/mob/abstract/observer/observer.dm
+++ b/code/modules/mob/abstract/observer/observer.dm
@@ -266,7 +266,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
resting = 1
var/turf/location = get_turf(src)
message_admins("[key_name_admin(usr)] has ghosted. (JMP)")
- log_game("[key_name_admin(usr)] has ghosted.",ckey=key_name(usr))
+ log_game("[key_name_admin(usr)] has ghosted.")
var/mob/abstract/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly.
announce_ghost_joinleave(ghost)
diff --git a/code/modules/mob/abstract/observer/say.dm b/code/modules/mob/abstract/observer/say.dm
index 4fc470dc87a..631373b80b6 100644
--- a/code/modules/mob/abstract/observer/say.dm
+++ b/code/modules/mob/abstract/observer/say.dm
@@ -2,7 +2,7 @@
if (!message)
return
- log_say("Ghost/[src.key] : [message]",ckey=key_name(src))
+ log_say("Ghost/[src.key] : [message]")
if (src.client)
if(src.client.prefs.muted & (MUTE_DEADCHAT|MUTE_IC))
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 63910ca391c..3cf907ddc6f 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -24,7 +24,7 @@
input = message
if(input)
- log_emote("Ghost/[src.key] : [input]",ckey=key_name(src))
+ log_emote("Ghost/[src.key] : [input]")
say_dead_direct(input, src)
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index 0437ea414ab..72144f9c7f0 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -130,7 +130,7 @@
return (copytext(message, length(message)) == "!") ? 2 : 1
/datum/language/proc/broadcast(var/mob/living/speaker, var/message, var/speaker_mask)
- log_say("[key_name(speaker)] : ([name]) [message]",ckey=key_name(speaker))
+ log_say("[key_name(speaker)] : ([name]) [message]")
if(!speaker_mask)
speaker_mask = speaker.name
diff --git a/code/modules/mob/language/outsider.dm b/code/modules/mob/language/outsider.dm
index 94ba9994198..b7a9f7d4212 100644
--- a/code/modules/mob/language/outsider.dm
+++ b/code/modules/mob/language/outsider.dm
@@ -109,7 +109,7 @@
flags = RESTRICTED | HIVEMIND
/datum/language/bug/liidra/broadcast(mob/living/speaker, message, speaker_mask)
- log_say("[key_name(speaker)] : ([name]) [message]",ckey=key_name(speaker))
+ log_say("[key_name(speaker)] : ([name]) [message]")
if(!speaker_mask)
speaker_mask = speaker.real_name
diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm
index e52c2d3ae5a..244307b0649 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -229,7 +229,7 @@
return new_name
/datum/language/bug/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
- log_say("[key_name(speaker)] : ([name]) [message]",ckey=key_name(speaker))
+ log_say("[key_name(speaker)] : ([name]) [message]")
if(!speaker_mask)
speaker_mask = speaker.real_name
diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm
index 58081647208..20ab00bb441 100644
--- a/code/modules/mob/language/synthetic.dm
+++ b/code/modules/mob/language/synthetic.dm
@@ -25,7 +25,7 @@
message = formalize_text(message)
- log_say("[key_name(speaker)] : ([name]) [message]",ckey=key_name(speaker))
+ log_say("[key_name(speaker)] : ([name]) [message]")
var/message_start = "[name], [get_speaker_name(speaker)]"
var/message_body = span(message, "[speaker.say_quote(message)], \"[message]\"")
diff --git a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
index 07340e83dc4..43c01c7ff45 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
@@ -97,7 +97,7 @@
mind.transfer_to(master_nymph)
master_nymph.stunned = 0//Switching mind seems to temporarily stun mobs
message_admins("\The [src] has died with nymphs remaining; player now controls [key_name_admin(master_nymph)]")
- log_admin("\The [src] has died with nymphs remaining; player now controls [key_name(master_nymph)]", ckey=key_name(master_nymph))
+ log_admin("\The [src] has died with nymphs remaining; player now controls [key_name(master_nymph)]")
master_nymph = null
birds_of_feather.Cut()
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index 68b67d45693..1c9bc475dde 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -66,6 +66,6 @@
to_chat(src, SPAN_NOTICE("Unusable emote '[act]'. Say *help for a list."))
if (message)
- log_emote("[name]/[key] : [message]",ckey=key_name(key))
+ log_emote("[name]/[key] : [message]")
send_emote(message, m_type)
diff --git a/code/modules/mob/living/carbon/human/diona_gestalt.dm b/code/modules/mob/living/carbon/human/diona_gestalt.dm
index 10902279a9f..10a66de5a8c 100644
--- a/code/modules/mob/living/carbon/human/diona_gestalt.dm
+++ b/code/modules/mob/living/carbon/human/diona_gestalt.dm
@@ -350,7 +350,7 @@
mind.transfer_to(bestNymph)
bestNymph.stunned = 0//Switching mind seems to temporarily stun mobs
message_admins("\The [src] has split into nymphs; player now controls [key_name_admin(bestNymph)]")
- log_admin("\The [src] has split into nymphs; player now controls [key_name(bestNymph)]", ckey=key_name(bestNymph))
+ log_admin("\The [src] has split into nymphs; player now controls [key_name(bestNymph)]")
//If bestNymph is still null at this point, it could only mean every nymph in the gestalt was a player
//In this unfathomably rare case, the gestalt player simply dies as its mob is qdel'd.
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d3c87dadc74..79c64be6ddd 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1185,7 +1185,7 @@
else
target.show_message(SPAN_NOTICE("You hear a voice that seems to echo around the room: [say]"))
usr.show_message(SPAN_NOTICE("You project your mind into [target.real_name]: [say]"))
- log_say("[key_name(usr)] sent a telepathic message to [key_name(target)]: [say]",ckey=key_name(usr))
+ log_say("[key_name(usr)] sent a telepathic message to [key_name(target)]: [say]")
for(var/mob/abstract/observer/G in GLOB.dead_mob_list)
G.show_message("Telepathic message from [src] to [target]: [say]")
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index b555d90d68d..995f860a6e9 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -318,7 +318,7 @@
to_chat(src,SPAN_WARNING("[target] is too far for your mind to grasp!"))
return
- log_say("[key_name(src)] communed to [key_name(target)]: [text]",ckey=key_name(src))
+ log_say("[key_name(src)] communed to [key_name(target)]: [text]")
for (var/mob/M in GLOB.player_list)
if (istype(M, /mob/abstract/new_player))
@@ -351,7 +351,7 @@
var/msg = sanitize(input("Message:", "Psychic Whisper") as text|null)
if(msg)
- log_say("PsychicWhisper: [key_name(src)]->[M.key] : [msg]",ckey=key_name(src))
+ log_say("PsychicWhisper: [key_name(src)]->[M.key] : [msg]")
to_chat(M, "You hear a strange, alien voice in your head... \italic [msg]")
to_chat(src, "You said: \"[msg]\" to [M]")
return
@@ -575,7 +575,7 @@
to_chat(src, SPAN_DANGER("[M]'s hivenet implant is inactive!"))
return
- log_say("[key_name(src)] issued a hivenet order to [key_name(M)]: [text]",ckey=key_name(src))
+ log_say("[key_name(src)] issued a hivenet order to [key_name(M)]: [text]")
if(istype(M, /mob/living/carbon/human) && isvaurca(M))
to_chat(M, SPAN_DANGER("You feel a buzzing in the back of your head, and your mind fills with the authority of [src.real_name], your ruler:"))
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 39efe24c797..ba26e0f3c9c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -889,7 +889,7 @@ default behaviour is:
return 0
message_admins("[key_name_admin(possessor)] has taken control of \the [src].")
- log_admin("[key_name(possessor)] took control of \the [src].",admin_key=key_name(possessor))
+ log_admin("[key_name(possessor)] took control of \the [src].")
src.ckey = possessor.ckey
qdel(possessor)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 9bbe95a1a00..26c258a47f2 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -364,9 +364,9 @@ var/list/channel_to_radio_key = new
mind.last_words = message
if(whisper)
- log_whisper("[key_name(src)] : ([get_lang_name(speaking)]) [message]",ckey=key_name(src))
+ log_whisper("[key_name(src)] : ([get_lang_name(speaking)]) [message]")
else
- log_say("[key_name(src)] : ([get_lang_name(speaking)]) [message]",ckey=key_name(src))
+ log_say("[key_name(src)] : ([get_lang_name(speaking)]) [message]")
return TRUE
@@ -385,7 +385,7 @@ var/list/channel_to_radio_key = new
C.images -= I
/mob/living/proc/say_signlang(var/message, var/verb="gestures", var/datum/language/language, var/list/sign_adv_length)
- log_say("[key_name(src)] : ([get_lang_name(language)]) [message]",ckey=key_name(src))
+ log_say("[key_name(src)] : ([get_lang_name(language)]) [message]")
for (var/mob/O in viewers(src, null))
O.hear_signlang(message, verb, language, src, sign_adv_length)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 3b743b78a5d..49ec2e64867 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -485,7 +485,7 @@ var/list/ai_verbs_default = list(
return
Centcomm_announce(input, usr)
to_chat(usr, SPAN_NOTICE("Message transmitted."))
- log_say("[key_name(usr)] has made an AI [SSatlas.current_map.boss_short] announcement: [input]",ckey=key_name(usr))
+ log_say("[key_name(usr)] has made an AI [SSatlas.current_map.boss_short] announcement: [input]")
emergency_message_cooldown = 1
spawn(300)
emergency_message_cooldown = 0
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index ad74b62322c..f84a1e40886 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -155,7 +155,7 @@
to_chat(possessor, SPAN_WARNING("\The [src] already has a player."))
return FALSE
message_admins("[key_name_admin(possessor)] has taken control of \the [src].")
- log_admin("[key_name(possessor)] took control of \the [src].",ckey=key_name(possessor))
+ log_admin("[key_name(possessor)] took control of \the [src].")
transfer_personality(possessor.client)
qdel(possessor)
return TRUE
@@ -394,7 +394,7 @@
to_chat(src, SPAN_WARNING("You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script."))
message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)]. Laws overridden.")
- log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.",ckey=key_name(user),ckey_target=key_name(src))
+ log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.")
var/time = time2text(world.realtime, "hh:mm:ss")
GLOB.lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])")
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index e3e7a972780..74dde064d71 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -94,7 +94,7 @@
if(D.stat != DEAD)
to_chat(usr, SPAN_NOTICE("You issue a kill command for the unfortunate drone."))
message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
- log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.",ckey=key_name(usr),ckey_target=key_name(src))
+ log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.")
D.shut_down()
else
to_chat(usr, SPAN_WARNING("The drone has been shut down already."))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 76264808d23..0901b15dc5b 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1179,7 +1179,7 @@
disconnect_from_ai()
to_chat(user, SPAN_WARNING("You successfully hack and override \the [src]."))
message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
- log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.",ckey=key_name(user),ckey_target=key_name(src))
+ log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
clear_supplied_laws()
clear_inherent_laws()
laws = new /datum/ai_laws/syndicate_override
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 333eaa0889e..9d37a34c518 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -24,7 +24,7 @@
return 0
if(message_mode == "general")
message_mode = null
- log_say("[key_name(src)] : [message]",ckey=key_name(src))
+ log_say("[key_name(src)] : [message]")
return common_radio.talk_into(src, message, message_mode, verb, speaking)
/mob/living/silicon/robot/drone/handle_message_mode()
@@ -35,7 +35,7 @@
whisper(message, speaking, say_verb = TRUE)
return TRUE
if(message_mode == "department")
- log_say("[key_name(src)] : [message]",ckey=key_name(src))
+ log_say("[key_name(src)] : [message]")
return holopad_talk(message, verb, speaking)
else if(message_mode)
if(ai_radio.disabledAi || ai_restore_power_routine || stat)
@@ -43,7 +43,7 @@
return FALSE
if(message_mode == "general")
message_mode = null
- log_say("[key_name(src)] : [message]",ckey=key_name(src))
+ log_say("[key_name(src)] : [message]")
return ai_radio.talk_into(src, message, message_mode, verb, speaking)
/mob/living/silicon/pai/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name, whisper)
@@ -53,7 +53,7 @@
return TRUE
if(message_mode == "general")
message_mode = null
- log_say("[key_name(src)] : [message]",ckey=key_name(src))
+ log_say("[key_name(src)] : [message]")
return radio.talk_into(src, message, message_mode, verb, speaking)
/mob/living/silicon/say_quote(var/text, var/datum/language/speaking = null, var/singing = FALSE, var/whisper = FALSE)
@@ -94,7 +94,7 @@
//For holopads only. Usable by AI.
/mob/living/silicon/ai/proc/holopad_talk(var/message, verb, datum/language/speaking)
- log_say("[key_name(src)] : [message]",ckey=key_name(src))
+ log_say("[key_name(src)] : [message]")
message = trim(message)
if(!message)
return
@@ -142,7 +142,7 @@
return TRUE
/mob/living/silicon/ai/proc/holopad_emote(var/message) //This is called when the AI uses the 'me' verb while using a holopad.
- log_emote("[key_name(src)] : [message]",ckey=key_name(src))
+ log_emote("[key_name(src)] : [message]")
message = trim(message)
if(!message)
diff --git a/code/modules/mob/living/simple_animal/borer/borer_captive.dm b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
index fe9771c434d..cba5969aeda 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
@@ -10,7 +10,7 @@
if(istype(src.loc,/mob/living/simple_animal/borer))
if(!message)
return
- log_say("[key_name(src)] : [message]", ckey=key_name(src))
+ log_say("[key_name(src)] : [message]")
if(stat == DEAD)
return say_dead(message)
diff --git a/code/modules/mob/living/simple_animal/borer/say.dm b/code/modules/mob/living/simple_animal/borer/say.dm
index 25023c08269..d345f6c82e2 100644
--- a/code/modules/mob/living/simple_animal/borer/say.dm
+++ b/code/modules/mob/living/simple_animal/borer/say.dm
@@ -30,7 +30,7 @@
to_chat(src, SPAN_NOTICE("There are no viable hosts to speak with."))
else
var/mob/living/carbon/human/chosen_sayer = pick(viable_sayers)
- log_say("[key_name(src)] : (forcing [key_name(chosen_sayer)]) [message]", ckey=key_name(src))
+ log_say("[key_name(src)] : (forcing [key_name(chosen_sayer)]) [message]")
chosen_sayer.say(message)
return
diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm
index 0adaa2a67fc..71bf4c20b4e 100644
--- a/code/modules/mob/living/simple_animal/friendly/rat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/rat.dm
@@ -147,7 +147,7 @@
playsound(src, 'sound/effects/ratsqueek.ogg', 70, 1)
if (manual)
- log_say("[key_name(src)] squeaks! ",ckey=key_name(src))
+ log_say("[key_name(src)] squeaks! ")
//Plays a random selection of four sounds, at a low volume
@@ -166,7 +166,7 @@
playsound(src, sound, 5, 1, -4.6)
if (manual)
- log_say("[key_name(src)] squeaks softly! ",ckey=key_name(src))
+ log_say("[key_name(src)] squeaks softly! ")
//Plays a loud sound
@@ -181,7 +181,7 @@
if (squeals > 0 || !manual)
playsound(src, 'sound/effects/creatures/rat_squeak_loud.ogg', 50, 1)
squeals --
- log_say("[key_name(src)] squeals! ",ckey=key_name(src))
+ log_say("[key_name(src)] squeals! ")
else
to_chat(src, SPAN_WARNING("Your hoarse rattish throat can't squeal just now, stop and take a breath!"))
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index e1a7e1b1058..1d4b09a3677 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -3,7 +3,7 @@
//Multikey checks and logging
lastKnownIP = client.address
computer_id = client.computer_id
- log_access("Login: [key_name(src)] from [lastKnownIP ? lastKnownIP : "localhost"]-[computer_id] || BYOND v[client.byond_version]",ckey=key_name(src))
+ log_access("Login: [key_name(src)] from [lastKnownIP ? lastKnownIP : "localhost"]-[computer_id] || BYOND v[client.byond_version]")
if(GLOB.config.guests_allowed) // shut up if guests allowed for testing
return
if(GLOB.config.logsettings["log_access"])
@@ -20,10 +20,10 @@
if(matches)
if(M.client)
message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)]."), 1)
- log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].",ckey=key_name(src))
+ log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)].")
else
message_admins(SPAN_WARNING("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). "), 1)
- log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).",ckey=key_name(src))
+ log_access("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
/mob
var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index 101c0480144..c1ef191d393 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -8,7 +8,7 @@
SSnanoui.user_logout(src) // this is used to clean up (remove) this user's Nano UIs
GLOB.player_list -= src
disconnect_time = world.realtime
- log_access("Logout: [key_name(src)]",ckey=key_name(src))
+ log_access("Logout: [key_name(src)]")
SSstatistics.update_status()
RemoveRenderers()
if(client)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 824eafd0f72..1890191d91e 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -504,19 +504,19 @@
failure = "You are not allowed to respawn."
if(alert(failure + " Override?", "Respawn not allowed", "Yes", "Cancel") != "Yes")
return
- log_admin("[key_name(usr)] bypassed respawn restrictions (they failed with message \"[failure]\").", admin_key=key_name(usr))
+ log_admin("[key_name(usr)] bypassed respawn restrictions (they failed with message \"[failure]\").")
else
if(failure != "")
to_chat(usr, SPAN_DANGER(failure))
return
to_chat(usr, "You can respawn now, enjoy your new life!")
- log_game("[usr.name]/[usr.key] used abandon mob.", ckey=key_name(usr))
+ log_game("[usr.name]/[usr.key] used abandon mob.")
to_chat(usr, SPAN_NOTICE("Make sure to play a different character, and please roleplay correctly!"))
client?.screen.Cut()
if(!client)
- log_game("[usr.key] AM failed due to disconnect.", ckey=key_name(usr))
+ log_game("[usr.key] AM failed due to disconnect.")
return
announce_ghost_joinleave(client, 0)
@@ -524,7 +524,7 @@
var/mob/abstract/new_player/M = new /mob/abstract/new_player()
if(!client)
- log_game("[usr.key] AM failed due to disconnect.", ckey=key_name(usr))
+ log_game("[usr.key] AM failed due to disconnect.")
qdel(M)
return
@@ -1333,7 +1333,7 @@
SetWeakened(200)
visible_message("OOC Information: [src] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.", SPAN_WARNING("You have been winded by a member of staff! Please stand by until they contact you!"))
- log_admin("[key_name(admin)] winded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src))
+ log_admin("[key_name(admin)] winded [key_name(src)]!")
message_admins("[key_name_admin(admin)] winded [key_name_admin(src)]!", 1)
feedback_add_details("admin_verb", "WIND")
@@ -1349,7 +1349,7 @@
SetWeakened(0)
visible_message("OOC Information: [src] has been unwinded by a member of staff!", SPAN_WARNING("You have been unwinded by a member of staff!"))
- log_admin("[key_name(admin)] unwinded [key_name(src)]!",admin_key=key_name(admin),ckey=key_name(src))
+ log_admin("[key_name(admin)] unwinded [key_name(src)]!")
message_admins("[key_name_admin(admin)] unwinded [key_name_admin(src)]!", 1)
feedback_add_details("admin_verb", "UNWIND")
diff --git a/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm b/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm
index f0c6fb307eb..44579f849c0 100644
--- a/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm
+++ b/code/modules/modular_computers/file_system/programs/command/command_and_communications.dm
@@ -144,7 +144,7 @@
return FALSE
Syndicate_announce(input, usr)
to_chat(usr, SPAN_NOTICE("Message successfully transmitted."))
- log_say("[key_name(usr)] has sent a message to the syndicate: [input]", ckey = key_name(usr))
+ log_say("[key_name(usr)] has sent a message to the syndicate: [input]")
centcomm_message_cooldown = TRUE
addtimer(CALLBACK(src, PROC_REF(set_centcomm_message_cooldown), FALSE), 300) // thirty second cooldown
else if(params["target"] == "regular")
@@ -160,7 +160,7 @@
return
Centcomm_announce(input, usr)
to_chat(usr, SPAN_NOTICE("Message successfully transmitted."))
- log_say("[key_name(usr)] has sent a message to [SSatlas.current_map.boss_short]: [input]", ckey = key_name(usr))
+ log_say("[key_name(usr)] has sent a message to [SSatlas.current_map.boss_short]: [input]")
centcomm_message_cooldown = TRUE
addtimer(CALLBACK(src, PROC_REF(set_centcomm_message_cooldown), FALSE), 300) // thirty second cooldown
if("evac")
@@ -199,7 +199,7 @@
current_level = SEC_LEVEL_BLUE
set_security_level(current_level)
if(GLOB.security_level != old_level)
- log_game("[key_name(usr)] has changed the security level to [get_security_level()].", ckey = key_name(usr))
+ log_game("[key_name(usr)] has changed the security level to [get_security_level()].")
message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
switch(GLOB.security_level)
if(SEC_LEVEL_GREEN)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 3f993b1b402..2256efd156e 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -127,7 +127,7 @@
rigged = 1
- log_admin("LOG: [user.name] ([user.ckey]) injected a power cell with phoron, rigging it to explode.",ckey=key_name(user))
+ log_admin("LOG: [user.name] ([user.ckey]) injected a power cell with phoron, rigging it to explode.")
message_admins("[key_name_admin(user)] injected a power cell with phoron, rigging it to explode.")
S.reagents.clear_reagents()
diff --git a/code/modules/power/lights/bulbs.dm b/code/modules/power/lights/bulbs.dm
index f2262322aa4..fcf59a625a2 100644
--- a/code/modules/power/lights/bulbs.dm
+++ b/code/modules/power/lights/bulbs.dm
@@ -68,7 +68,7 @@
if(S.reagents.has_reagent(/singleton/reagent/toxin/phoron, 5))
- log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.",ckey=key_name(user))
+ log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
rigged = TRUE
diff --git a/code/modules/power/profiling.dm b/code/modules/power/profiling.dm
index 7a2185ebf80..d643c22a431 100644
--- a/code/modules/power/profiling.dm
+++ b/code/modules/power/profiling.dm
@@ -36,14 +36,14 @@ GLOBAL_LIST_EMPTY(power_update_requests_by_area)
to_chat(usr, "Area power update profiling disabled.")
message_admins("[key_name(src)] toggled area power update profiling off.")
- log_admin("[key_name(src)] toggled area power update profiling off.",admin_key=key_name(src))
+ log_admin("[key_name(src)] toggled area power update profiling off.")
else
enable_power_update_profiling = 1
power_last_profile_time = world.time
to_chat(usr, "Area power update profiling enabled.")
message_admins("[key_name(src)] toggled area power update profiling on.")
- log_admin("[key_name(src)] toggled area power update profiling on.",admin_key=key_name(src))
+ log_admin("[key_name(src)] toggled area power update profiling on.")
feedback_add_details("admin_verb","APUP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 2a7e3ea4b57..6167f53a473 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -88,7 +88,7 @@
to_chat(user, SPAN_NOTICE("You deactivate \the [src]."))
if(special_emitter)
message_admins("Emitter turned off by [key_name_admin(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1)
- log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])",ckey=key_name(user))
+ log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])")
investigate_log("turned off by [user.key]","singulo")
else
active = TRUE
@@ -99,7 +99,7 @@
to_chat(user, SPAN_NOTICE("You activate \the [src]."))
if(special_emitter)
message_admins("Emitter turned on by [key_name_admin(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1)
- log_game("Emitter turned on by [user.ckey]([user]) in ([x],[y],[z])",ckey=key_name(user))
+ log_game("Emitter turned on by [user.ckey]([user]) in ([x],[y],[z])")
investigate_log("turned on by [user.key]","singulo")
update_icon()
else
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 514101c6785..dc14ba40085 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -123,7 +123,7 @@
strength = strength_upper_limit
else
message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1)
- log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])",ckey=key_name(usr))
+ log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])")
investigate_log("increased to [strength] by [usr.key]","singulo")
strength_change()
@@ -134,7 +134,7 @@
strength = 0
else
message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1)
- log_game("PA Control Computer decreased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])",ckey=key_name(usr))
+ log_game("PA Control Computer decreased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])")
investigate_log("decreased to [strength] by [usr.key]","singulo")
strength_change()
@@ -215,7 +215,7 @@
src.active = !src.active
investigate_log("turned [active?SPAN_WARNING("ON"):"OFF"] by [user ? user.key : "outside forces"]","singulo")
message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user, TRUE, highlight_special = TRUE)] in ([x],[y],[z] - JMP)",0,1)
- log_game("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user)] in ([x],[y],[z])",ckey=key_name(user))
+ log_game("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(user)] in ([x],[y],[z])")
if(src.active)
update_use_power(POWER_USE_ACTIVE)
for(var/obj/structure/particle_accelerator/part in connected_parts)
diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm
index b1ea9a7fb7c..2e3a8d4876c 100644
--- a/code/modules/power/smes_construction.dm
+++ b/code/modules/power/smes_construction.dm
@@ -259,7 +259,7 @@
var/obj/item/clothing/gloves/G = h_user.gloves
if(G.siemens_coefficient == 0)
user_protected = 1
- log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100",ckey=key_name(usr))
+ log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100")
message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP")
diff --git a/code/modules/projectiles/guns/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
index 8fe888d060a..c2fe25548ff 100644
--- a/code/modules/projectiles/guns/launcher/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/launcher/grenade_launcher.dm
@@ -101,7 +101,7 @@
/obj/item/gun/launcher/grenade/handle_post_fire(mob/user)
message_admins("[key_name_admin(user)] fired a grenade ([chambered.name]) from a grenade launcher ([src.name]).")
- log_game("[key_name_admin(user)] used a grenade ([chambered.name]).",ckey=key_name(user))
+ log_game("[key_name_admin(user)] used a grenade ([chambered.name]).")
chambered = null
update_maptext()
diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm
index 7764e03e1b6..ef12472a76a 100644
--- a/code/modules/projectiles/guns/launcher/rocket.dm
+++ b/code/modules/projectiles/guns/launcher/rocket.dm
@@ -45,7 +45,7 @@
/obj/item/gun/launcher/rocket/handle_post_fire(mob/user, atom/target)
message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]) at [target].")
- log_game("[key_name(user)] used a rocket launcher ([src.name]) at [target].",ckey=key_name(src))
+ log_game("[key_name(user)] used a rocket launcher ([src.name]) at [target].")
..()
/obj/item/gun/launcher/rocket/konyang
diff --git a/code/modules/psionics/abilities/commune.dm b/code/modules/psionics/abilities/commune.dm
index bca84e03dad..722d8d8fc70 100644
--- a/code/modules/psionics/abilities/commune.dm
+++ b/code/modules/psionics/abilities/commune.dm
@@ -52,7 +52,7 @@
to_chat(user, SPAN_WARNING("Not even a psion of your level can speak to the dead."))
return
- log_say("[key_name(user)] communed to [key_name(target)]: [text]",ckey=key_name(src))
+ log_say("[key_name(user)] communed to [key_name(target)]: [text]")
to_chat(user, SPAN_CULT("You psionically say to [target]: [text]"))
diff --git a/code/modules/psionics/abilities/emotional_suggestion.dm b/code/modules/psionics/abilities/emotional_suggestion.dm
index 379a005093b..73fa5f30963 100644
--- a/code/modules/psionics/abilities/emotional_suggestion.dm
+++ b/code/modules/psionics/abilities/emotional_suggestion.dm
@@ -51,7 +51,7 @@
to_chat(user, SPAN_WARNING("Not even a psion of your level can suggest to the dead."))
return
- log_say("[key_name(user)] suggested an emotion to [key_name(target)]: [text]",ckey=key_name(src))
+ log_say("[key_name(user)] suggested an emotion to [key_name(target)]: [text]")
to_chat(user, SPAN_CULT("You psionically suggest an emotion to [target]: [text]"))
diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm
index 55b9ef6e326..48e42846b67 100644
--- a/code/modules/random_map/drop/droppod.dm
+++ b/code/modules/random_map/drop/droppod.dm
@@ -214,11 +214,11 @@
spawned_mob.ckey = selected_player.mob.ckey
spawned_mobs = list(spawned_mob)
message_admins("[key_name_admin(usr)] dropped a pod containing \the [spawned_mob] ([spawned_mob.key]) at ([usr.x],[usr.y],[usr.z])")
- log_admin("[key_name(usr)] dropped a pod containing \the [spawned_mob] ([spawned_mob.key]) at ([usr.x],[usr.y],[usr.z])",admin_key=key_name(usr),ckey=key_name(spawned_mob))
+ log_admin("[key_name(usr)] dropped a pod containing \the [spawned_mob] ([spawned_mob.key]) at ([usr.x],[usr.y],[usr.z])")
else if(spawned_mobs.len)
automatic_pod = 1
message_admins("[key_name_admin(usr)] dropped a pod containing [spawned_mobs.len] [spawned_mobs[1]] at ([usr.x],[usr.y],[usr.z])")
- log_admin("[key_name(usr)] dropped a pod containing [spawned_mobs.len] [spawned_mobs[1]] at ([usr.x],[usr.y],[usr.z])",admin_key=key_name(usr),ckey=key_name(spawned_mob))
+ log_admin("[key_name(usr)] dropped a pod containing [spawned_mobs.len] [spawned_mobs[1]] at ([usr.x],[usr.y],[usr.z])")
else
return
diff --git a/code/modules/random_map/drop/supply.dm b/code/modules/random_map/drop/supply.dm
index 9169e8898d2..5ad583bbe51 100644
--- a/code/modules/random_map/drop/supply.dm
+++ b/code/modules/random_map/drop/supply.dm
@@ -89,5 +89,5 @@
choice = alert("Are you SURE you wish to deploy this supply drop? It will cause a sizable explosion and gib anyone underneath it.",,"No","Yes")
if(choice == "No")
return
- log_admin("[key_name(usr)] dropped supplies at ([usr.x],[usr.y],[usr.z])",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] dropped supplies at ([usr.x],[usr.y],[usr.z])")
new /datum/random_map/droppod/supply(null, usr.x-2, usr.y-2, usr.z, supplied_drops = chosen_loot_types, supplied_drop = chosen_loot_type)
diff --git a/code/modules/random_map/random_map_verbs.dm b/code/modules/random_map/random_map_verbs.dm
index f0297ce04bb..d0fd49f8055 100644
--- a/code/modules/random_map/random_map_verbs.dm
+++ b/code/modules/random_map/random_map_verbs.dm
@@ -26,7 +26,7 @@
GLOB.random_maps[choice] = null
if(istype(M))
message_admins("[key_name_admin(usr)] has deleted [M.name].")
- log_admin("[key_name(usr)] has deleted [M.name].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has deleted [M.name].")
qdel(M)
/client/proc/create_random_map()
@@ -51,7 +51,7 @@
if(M)
message_admins("[key_name_admin(usr)] has created [M.name].")
- log_admin("[key_name(usr)] has created [M.name].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has created [M.name].")
/client/proc/apply_random_map()
set category = "Debug"
@@ -74,7 +74,7 @@
ty = !isnull(ty) ? ty : T.y
tz = !isnull(tz) ? tz : T.z
message_admins("[key_name_admin(usr)] has applied [M.name] at x[tx],y[ty],z[tz].")
- log_admin("[key_name(usr)] has applied [M.name] at x[tx],y[ty],z[tz].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has applied [M.name] at x[tx],y[ty],z[tz].")
M.set_origins(tx,ty,tz)
M.apply_to_map()
@@ -103,6 +103,6 @@
if(!tx) tx = 1
if(!ty) ty = 1
message_admins("[key_name_admin(usr)] has applied [overlay_map.name] to [base_map.name] at x[tx],y[ty].")
- log_admin("[key_name(usr)] has applied [overlay_map.name] to [base_map.name] at x[tx],y[ty].",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] has applied [overlay_map.name] to [base_map.name] at x[tx],y[ty].")
overlay_map.overlay_with(base_map,tx,ty)
base_map.display_map(usr)
diff --git a/code/modules/reagents/dispenser/cartridge_spawn.dm b/code/modules/reagents/dispenser/cartridge_spawn.dm
index 24312492a72..fdb98681e89 100644
--- a/code/modules/reagents/dispenser/cartridge_spawn.dm
+++ b/code/modules/reagents/dispenser/cartridge_spawn.dm
@@ -30,4 +30,4 @@
C.reagents.add_reagent(reagent, C.volume)
var/singleton/reagent/R = GET_SINGLETON(reagent)
C.setLabel(R.name)
- log_admin("[key_name(usr)] spawned a [size] reagent container containing [reagent] at ([usr.x],[usr.y],[usr.z])",admin_key=key_name(usr))
+ log_admin("[key_name(usr)] spawned a [size] reagent container containing [reagent] at ([usr.x],[usr.y],[usr.z])")
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index bd27ffbe090..f2e3f539651 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -212,7 +212,7 @@
if(P.firer && REAGENT_VOLUME(reagents, /singleton/reagent/fuel) >= LETHAL_FUEL_CAPACITY)
visible_message(SPAN_DANGER("\The [name] is hit by the [P]!"))
log_and_message_admins("shot an improvised [name] explosive", P.firer)
- log_game("[key_name(P.firer)] shot improvised grenade at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).",ckey=key_name(P.firer))
+ log_game("[key_name(P.firer)] shot improvised grenade at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).")
detonate(TRUE)
. = ..()
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index dce2497092c..cbad879f295 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -74,13 +74,13 @@
if(reagents.has_reagent(/singleton/reagent/acid))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
- log_game("[key_name(user)] fired sulphuric acid from \a [src].",ckey=key_name(user))
+ log_game("[key_name(user)] fired sulphuric acid from \a [src].")
if(reagents.has_reagent(/singleton/reagent/acid/polyacid))
message_admins("[key_name_admin(user)] fired Polyacid from \a [src].")
- log_game("[key_name(user)] fired Polyacid from \a [src].",ckey=key_name(user))
+ log_game("[key_name(user)] fired Polyacid from \a [src].")
if(reagents.has_reagent(/singleton/reagent/lube))
message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
- log_game("[key_name(user)] fired Space lube from \a [src].",ckey=key_name(user))
+ log_game("[key_name(user)] fired Space lube from \a [src].")
return
/obj/item/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
diff --git a/code/modules/reagents/reagent_containers/welding_backpack.dm b/code/modules/reagents/reagent_containers/welding_backpack.dm
index 1c0a74027af..1b438d5ca7c 100644
--- a/code/modules/reagents/reagent_containers/welding_backpack.dm
+++ b/code/modules/reagents/reagent_containers/welding_backpack.dm
@@ -50,7 +50,7 @@
return
if(T.welding & prob(50))
message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
- log_game("[key_name(user)] triggered a fueltank explosion.",ckey=key_name(user))
+ log_game("[key_name(user)] triggered a fueltank explosion.")
to_chat(user, SPAN_DANGER("That was stupid of you."))
explosion(get_turf(src),-1,0,2)
qdel(src)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index ea44bf8e348..8f7d1fe1011 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -74,7 +74,7 @@
is_leaking = !is_leaking
if (is_leaking)
message_admins("[key_name_admin(user)] wrench opened \the [src] at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking reagents. (JMP)")
- log_game("[key_name(user)] opened \the [src] at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking reagents.",ckey=key_name(user))
+ log_game("[key_name(user)] opened \the [src] at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking reagents.")
START_PROCESSING(SSprocessing,src)
else if(accept_any_reagent)
@@ -173,7 +173,7 @@
var/obj/item/device/assembly_holder/H = attacking_item
if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)")
- log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.",ckey=key_name(user))
+ log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.")
rig = attacking_item
user.drop_from_inventory(attacking_item,src)
@@ -201,7 +201,7 @@
if(Proj.get_structure_damage())
if(istype(Proj.firer))
log_and_message_admins("shot a welding tank", Proj.firer)
- log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).",ckey=key_name(Proj.firer))
+ log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).")
if(!istype(Proj ,/obj/item/projectile/beam/laser_tag) && !istype(Proj ,/obj/item/projectile/beam/practice) && !istype(Proj ,/obj/item/projectile/kinetic))
ex_act(2.0)
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 1ee79fdf59f..225eacef005 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -148,7 +148,7 @@
if(confirmed)
confirmed = 0
trigger_event(event, recorded_message, user)
- log_game("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]",ckey=key_name(event_triggered_by),ckey_target=key_name(event_confirmed_by))
+ log_game("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]")
message_admins("[key_name_admin(event_triggered_by)] triggered and [key_name_admin(event_confirmed_by)] confirmed event [event]", 1)
reset()
diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm
index 7341877f0b1..851ea64e1e7 100644
--- a/code/modules/shuttles/shuttle_emergency.dm
+++ b/code/modules/shuttles/shuttle_emergency.dm
@@ -76,7 +76,7 @@
to_world(SPAN_NOTICE("Alert: The shuttle autopilot has been overridden. Launch sequence initiated!"))
if(usr)
- log_admin("[key_name(usr)] has overridden the shuttle autopilot and activated launch sequence",ckey=key_name(usr))
+ log_admin("[key_name(usr)] has overridden the shuttle autopilot and activated launch sequence")
message_admins("[key_name_admin(usr)] has overridden the shuttle autopilot and activated launch sequence")
..(user)
@@ -91,7 +91,7 @@
to_world(SPAN_NOTICE("Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!"))
if(usr)
- log_admin("[key_name(usr)] has overridden the shuttle autopilot and forced immediate launch",ckey=key_name(usr))
+ log_admin("[key_name(usr)] has overridden the shuttle autopilot and forced immediate launch")
message_admins("[key_name_admin(usr)] has overridden the shuttle autopilot and forced immediate launch")
..(user)
@@ -106,7 +106,7 @@
to_world(SPAN_NOTICE("Alert: The shuttle autopilot has been overridden. Launch sequence aborted!"))
if(usr)
- log_admin("[key_name(usr)] has overridden the shuttle autopilot and cancelled launch sequence",ckey=key_name(usr))
+ log_admin("[key_name(usr)] has overridden the shuttle autopilot and cancelled launch sequence")
message_admins("[key_name_admin(usr)] has overridden the shuttle autopilot and cancelled launch sequence")
..(user)
@@ -161,7 +161,7 @@
to_world(SPAN_NOTICE("Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot."))
if(usr)
- log_admin("[key_name(usr)] has inserted [ID] into the shuttle control computer - [req_authorizations - authorized.len] authorisation\s needed",ckey=key_name(usr))
+ log_admin("[key_name(usr)] has inserted [ID] into the shuttle control computer - [req_authorizations - authorized.len] authorisation\s needed")
message_admins("[key_name_admin(usr)] has inserted [ID] into the shuttle control computer - [req_authorizations - authorized.len] authorisation\s needed")
return 1
diff --git a/code/modules/udp/ship_udp.dm b/code/modules/udp/ship_udp.dm
deleted file mode 100644
index 765e38c1897..00000000000
--- a/code/modules/udp/ship_udp.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
-* Copyright (c) 2017 "Werner Maisl"
-*
-* This file is part of Aurora.3
-* Aurora.3 is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as
-* published by the Free Software Foundation, either version 3 of the
-* License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with this program. If not, see .
-*
-*/
-/*
-
- @===================================@
- | |
- | Guide to UDP Data Shipping |
- | |
- @===================================@
-
- The prerequisite for using this is rustg compiled with the udp_shipper feature.
-
- Rustg's rustg_udp_send function is used to send data.
-*/
-
-/**
- * Sends data via UDP.
- *
- * addr must be formatted as "ip:port".
- * data must be a string to be sent.
- */
-/proc/send_udp_data(addr, data)
-#ifdef RUST_G
-# ifndef rustg_udp_send
-# error rustg_udp_send macro is not defined for rustg.
-# endif // rustg_udp_send
-
- if (!addr || !data)
- return "Not enough args."
-
- . = rustg_udp_send(addr, data)
-
- if (.)
- log_world("ERROR: UDP Sender error: [.]")
-
-#else
- return
-#endif // RUST_G
-
-/proc/send_gelf_log(short_message="", long_message="", level = 5, category="", additional_data=list())
- if (!GLOB.config)
- return "Configuration not loaded."
- if (!GLOB.config.logsettings["log_gelf_enabled"])
- return "Gelf logging not enabled."
- var/list/log_data = list()
- log_data["version"] = "1.1"
- log_data["host"] = world.name
- log_data["short_message"] = html_encode(short_message)
- log_data["long_message"] = html_encode(long_message)
- log_data["level"] = level
- log_data["_category"] = category
- log_data["_game_id"] = GLOB.round_id
-
- log_data.Add(additional_data)
- var/gelf_log = json_encode(log_data)
- return send_udp_data(GLOB.config.logsettings["log_gelf_addr"], gelf_log)
diff --git a/code/modules/world_api/commands/admin.dm b/code/modules/world_api/commands/admin.dm
index cd96a73c2aa..ad97bd8a089 100644
--- a/code/modules/world_api/commands/admin.dm
+++ b/code/modules/world_api/commands/admin.dm
@@ -51,7 +51,7 @@
G.can_reenter_corpse = 1
G.show_message(SPAN_NOTICE("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1)
- log_admin("[senderkey] allowed [key_name(G)] to bypass the 30 minute respawn limit via the API",ckey=key_name(G),admin_key=senderkey)
+ log_admin("[senderkey] allowed [key_name(G)] to bypass the 30 minute respawn limit via the API")
message_admins("Admin [senderkey] allowed [key_name_admin(G)] to bypass the 30 minute respawn limit via the API", 1)
diff --git a/code/modules/world_api/commands/cciaa.dm b/code/modules/world_api/commands/cciaa.dm
index 9c1bc559297..a8065fbcdd4 100644
--- a/code/modules/world_api/commands/cciaa.dm
+++ b/code/modules/world_api/commands/cciaa.dm
@@ -167,7 +167,7 @@
sound_to(world, ('sound/AI/commandreport.ogg'))
- log_admin("[senderkey] has created a command report via the api: [reportbody]",admin_key=senderkey)
+ log_admin("[senderkey] has created a command report via the api: [reportbody]")
message_admins("[senderkey] has created a command report via the api", 1)
statuscode = 200
@@ -227,7 +227,7 @@
else
command_announcement.Announce("A fax message from Central Command has been sent to the following fax machines:
"+jointext(sendsuccess, ", "), "Fax Received", new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
- log_admin("[senderkey] sent a fax via the API: : [faxbody]",admin_key=senderkey)
+ log_admin("[senderkey] sent a fax via the API: : [faxbody]")
message_admins("[senderkey] sent a fax via the API", 1)
statuscode = 200
diff --git a/config/example/config.txt b/config/example/config.txt
index aaae2eea89f..ecdc3a62140 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -426,12 +426,6 @@ API_RATE_LIMIT 50
## IPs are separated by ;
API_RATE_LIMIT_WHITELIST 127.0.0.1
-
-## GELF Logging Configuration
-LOG_GELF_ENABLED 0
-# Make sure the IP string is written in a manner of "IP:port", without the quotes.
-#LOG_GELF_ADDR 127.0.0.1:5667
-
### IPINTEL:
### This allows you to detect likely proxies by checking ips against getipintel.net
## Rating to warn at: (0.90 is good, 1 is 100% likely to be a spammer/proxy, 0.8 is 80%, etc) anything equal to or higher then this number triggers an admin warning
diff --git a/config/example/logging.json b/config/example/logging.json
index c8174bb50ec..4477d2176cc 100644
--- a/config/example/logging.json
+++ b/config/example/logging.json
@@ -43,8 +43,6 @@
"log_modules_exoplanets":1,
"log_modules_sectors":1,
"world_modules_ruins_log":1,
- "log_gelf_enabled":0,
- "log_gelf_addr":"127.0.0.1:12345",
"log_subsystems_zas":0,
"log_subsystems_zas_debug":0,
"log_subsystems_http":1
diff --git a/config/ut/config-nodb.txt b/config/ut/config-nodb.txt
index 87f3f0b6c9c..a5e3df3e449 100644
--- a/config/ut/config-nodb.txt
+++ b/config/ut/config-nodb.txt
@@ -472,12 +472,6 @@ API_RATE_LIMIT_WHITELIST 127.0.0.1
# -- Should be below 99 (or undefined) on a server actually used for play. --
MC_TICKLIMIT_INIT 500
-
-## GELF Logging Configuration
-LOG_GELF_ENABLED 0
-# Make sure the IP string is written in a manner of "IP:port", without the quotes.
-#LOG_GELF_ADDR 127.0.0.1:5667
-
### IPINTEL:
### This allows you to detect likely proxies by checking ips against getipintel.net
## Rating to warn at: (0.90 is good, 1 is 100% likely to be a spammer/proxy, 0.8 is 80%, etc) anything equal to or higher then this number triggers an admin warning
diff --git a/html/changelogs/fluffyghost-ungelfing.yml b/html/changelogs/fluffyghost-ungelfing.yml
new file mode 100644
index 00000000000..037a131004e
--- /dev/null
+++ b/html/changelogs/fluffyghost-ungelfing.yml
@@ -0,0 +1,60 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - server: "Removed the gelf logging infrastructure."
+ - refactor: "Refactored the various logging procs to be a direct call in light of the above."
+ - rscdel: "Removed ancilliary UDP related things."