From 84e42fd0ebcbd0601d4c034f0516053c3697565f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 27 Nov 2023 07:02:37 +0100 Subject: [PATCH] [MIRROR] Removes some code soul (`IF YOU ARE COPY PASTING THIS...`), replaces it with a macro [MDB IGNORE] (#25272) * Removes some code soul (`IF YOU ARE COPY PASTING THIS...`), replaces it with a macro (#79935) ## About The Pull Request Replaces all instances of `SSblackbox.record_feedback\("tally", "admin_verb", 1, (.+)\)` with `BLACKBOX_LOG_ADMIN_VERB($1)` This makes so the funny comment isn't necessary. It also reveals one location which someone did not heed the comment, the `debug_controller` proc copy+pasted the line but did not change the fourth argument. PEOPLE DON'T READ! * Removes some code soul (`IF YOU ARE COPY PASTING THIS...`), replaces it with a macro --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/__DEFINES/admin.dm | 4 ++ code/controllers/admin.dm | 6 +- code/modules/admin/admin.dm | 8 +-- code/modules/admin/admin_verbs.dm | 56 +++++++++---------- code/modules/admin/adminmenu.dm | 2 +- code/modules/admin/callproc/callproc.dm | 4 +- code/modules/admin/verbs/admin.dm | 8 +-- code/modules/admin/verbs/adminevents.dm | 20 +++---- code/modules/admin/verbs/adminfun.dm | 16 +++--- code/modules/admin/verbs/admingame.dm | 8 +-- code/modules/admin/verbs/adminhelp.dm | 2 +- code/modules/admin/verbs/adminjump.dm | 16 +++--- code/modules/admin/verbs/adminpm.dm | 4 +- code/modules/admin/verbs/adminsay.dm | 2 +- code/modules/admin/verbs/atmosdebug.dm | 4 +- code/modules/admin/verbs/commandreport.dm | 2 +- code/modules/admin/verbs/config_helpers.dm | 2 +- code/modules/admin/verbs/deadsay.dm | 2 +- code/modules/admin/verbs/debug.dm | 32 +++++------ code/modules/admin/verbs/diagnostics.dm | 8 +-- code/modules/admin/verbs/lawpanel.dm | 2 +- code/modules/admin/verbs/mapping.dm | 20 +++---- code/modules/admin/verbs/playsound.dm | 12 ++-- code/modules/admin/verbs/possess.dm | 6 +- code/modules/admin/verbs/pray.dm | 2 +- .../admin/verbs/reestablish_db_connection.dm | 4 +- code/modules/admin/verbs/requests.dm | 2 +- code/modules/admin/verbs/secrets.dm | 2 +- code/modules/admin/verbs/selectequipment.dm | 2 +- code/modules/admin/verbs/server.dm | 10 ++-- code/modules/admin/verbs/spawnobjasmob.dm | 2 +- .../admin/view_variables/admin_delete.dm | 2 +- .../view_variables/mass_edit_variables.dm | 2 +- code/modules/buildmode/submodes/proccall.dm | 2 +- code/modules/cargo/centcom_podlauncher.dm | 4 +- code/modules/mob/living/living.dm | 2 +- code/modules/pai/debug.dm | 2 +- 37 files changed, 144 insertions(+), 140 deletions(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index ad497a4f718..6944115e35a 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -173,3 +173,7 @@ GLOBAL_VAR_INIT(ghost_role_flags, ALL) #define INTERVIEW_DENIED "interview_denied" /// State when an interview has had no action on it yet #define INTERVIEW_PENDING "interview_pending" + +/// Used in logging uses of admin verbs (and sometimes some non-admin or debug verbs) to the blackbox +/// Only pass it a string key, the verb being used. +#define BLACKBOX_LOG_ADMIN_VERB(the_verb) SSblackbox.record_feedback("tally", "admin_verb", 1, the_verb) diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm index 1105a5c693f..421712d5ad4 100644 --- a/code/controllers/admin.dm +++ b/code/controllers/admin.dm @@ -56,10 +56,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick) switch(controller) if("Master") Recreate_MC() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Restart Master Controller") + BLACKBOX_LOG_ADMIN_VERB("Restart Master Controller") if("Failsafe") new /datum/controller/failsafe() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Restart Failsafe Controller") + BLACKBOX_LOG_ADMIN_VERB("Restart Failsafe Controller") message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.") @@ -87,5 +87,5 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick) return debug_variables(controller) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Restart Failsafe Controller") + BLACKBOX_LOG_ADMIN_VERB("Debug Controller") message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 2d2c692ed5f..a1f083f6139 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -76,7 +76,7 @@ A.flags_1 |= ADMIN_SPAWNED_1 log_admin("[key_name(usr)] spawned [amount] x [chosen] at [AREACOORD(usr)]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Atom") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Spawn Atom") /datum/admins/proc/podspawn_atom(object as text) set category = "Debug" @@ -103,7 +103,7 @@ A.flags_1 |= ADMIN_SPAWNED_1 log_admin("[key_name(usr)] pod-spawned [chosen] at [AREACOORD(usr)]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Podspawn Atom") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Podspawn Atom") /datum/admins/proc/spawn_cargo(object as text) set category = "Debug" @@ -121,7 +121,7 @@ S.generate(get_turf(usr)) log_admin("[key_name(usr)] spawned cargo pack [chosen] at [AREACOORD(usr)]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Cargo") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Spawn Cargo") /datum/admins/proc/dynamic_mode_options(mob/user) var/dat = {" @@ -304,7 +304,7 @@ message_admins(span_adminnotice("[key_name_admin(usr)] has put [frommob.key] in control of [tomob.name].")) log_admin("[key_name(usr)] stuffed [frommob.key] into [tomob.name].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Ghost Drag Control") + BLACKBOX_LOG_ADMIN_VERB("Ghost Drag Control") tomob.key = frommob.key tomob.client?.init_verbs() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e3574081e0b..985178b9c2e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -340,7 +340,7 @@ GLOBAL_PROTECT(admin_verbs_poll) add_verb(src, /client/proc/show_verbs) to_chat(src, span_interface("Almost all of your adminverbs have been hidden."), confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Hide All Adminverbs") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Hide All Adminverbs") return /client/proc/show_verbs() @@ -351,7 +351,7 @@ GLOBAL_PROTECT(admin_verbs_poll) add_admin_verbs() to_chat(src, span_interface("All of your adminverbs are now visible."), confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Adminverbs") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Adminverbs") @@ -372,7 +372,7 @@ GLOBAL_PROTECT(admin_verbs_poll) message_admins("[key_name_admin(usr)] re-entered corpse") ghost.can_reenter_corpse = 1 //force re-entering even when otherwise not possible ghost.reenter_corpse() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin Reenter") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Admin Reenter") else if(isnewplayer(mob)) to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.", confidential = TRUE) return FALSE @@ -385,7 +385,7 @@ GLOBAL_PROTECT(admin_verbs_poll) init_verbs() if(body && !body.key) body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus - SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin Ghost") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Admin Ghost") /client/proc/invisimin() set name = "Invisimin" @@ -412,7 +412,7 @@ GLOBAL_PROTECT(admin_verbs_poll) log_admin("[key_name(usr)] checked antagonists.") //for tsar~ if(!isobserver(usr) && SSticker.HasRoundStarted()) message_admins("[key_name_admin(usr)] checked antagonists.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Antagonists") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Check Antagonists") /client/proc/list_bombers() set name = "List Bombers" @@ -420,7 +420,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!holder) return holder.list_bombers() - SSblackbox.record_feedback("tally", "admin_verb", 1, "List Bombers") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("List Bombers") /client/proc/list_signalers() set name = "List Signalers" @@ -428,7 +428,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!holder) return holder.list_signalers() - SSblackbox.record_feedback("tally", "admin_verb", 1, "List Signalers") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("List Signalers") /client/proc/list_law_changes() set name = "List Law Changes" @@ -436,7 +436,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!holder) return holder.list_law_changes() - SSblackbox.record_feedback("tally", "admin_verb", 1, "List Law Changes") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("List Law Changes") /client/proc/show_manifest() set name = "Show Manifest" @@ -444,7 +444,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!holder) return holder.show_manifest() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Manifest") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Manifest") /client/proc/list_dna() set name = "List DNA" @@ -452,7 +452,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!holder) return holder.list_dna() - SSblackbox.record_feedback("tally", "admin_verb", 1, "List DNA") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("List DNA") /client/proc/list_fingerprints() set name = "List Fingerprints" @@ -460,7 +460,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!holder) return holder.list_fingerprints() - SSblackbox.record_feedback("tally", "admin_verb", 1, "List Fingerprints") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("List Fingerprints") /client/proc/ban_panel() set name = "Banning Panel" @@ -468,7 +468,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!check_rights(R_BAN)) return holder.ban_panel() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Banning Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Banning Panel") /client/proc/unban_panel() set name = "Unbanning Panel" @@ -476,14 +476,14 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!check_rights(R_BAN)) return holder.unban_panel() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Unbanning Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Unbanning Panel") /client/proc/game_panel() set name = "Game Panel" set category = "Admin.Game" if(holder) holder.Game() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Game Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Game Panel") /client/proc/poll_panel() set name = "Server Poll Management" @@ -491,7 +491,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!check_rights(R_POLL)) return holder.poll_list_panel() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Server Poll Management") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Server Poll Management") /// Returns this client's stealthed ckey /client/proc/getStealthKey() @@ -537,7 +537,7 @@ GLOBAL_PROTECT(admin_verbs_poll) else enable_stealth_mode() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Stealth Mode") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Stealth Mode") #define STEALTH_MODE_TRAIT "stealth_mode" @@ -620,7 +620,7 @@ GLOBAL_PROTECT(admin_verbs_poll) explosion(epicenter, devastation_range = range_devastation, heavy_impact_range = range_heavy, light_impact_range = range_light, flash_range = range_flash, adminlog = TRUE, ignorecap = TRUE, explosion_cause = mob) message_admins("[ADMIN_LOOKUPFLW(usr)] creating an admin explosion at [epicenter.loc].") log_admin("[key_name(usr)] created an admin explosion at [epicenter.loc].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Bomb") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Drop Bomb") /client/proc/drop_dynex_bomb() set category = "Admin.Fun" @@ -633,7 +633,7 @@ GLOBAL_PROTECT(admin_verbs_poll) dyn_explosion(epicenter, ex_power) message_admins("[ADMIN_LOOKUPFLW(usr)] creating an admin explosion at [epicenter.loc].") log_admin("[key_name(usr)] created an admin explosion at [epicenter.loc].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Dynamic Bomb") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Drop Dynamic Bomb") /client/proc/get_dynex_range() set category = "Debug" @@ -771,7 +771,7 @@ GLOBAL_PROTECT(admin_verbs_poll) message_admins("[key_name_admin(usr)] added mob ability [ability_type] to mob [ability_recipient].") log_admin("[key_name(usr)] added mob ability [ability_type] to mob [ability_recipient].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Add Mob Ability") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Add Mob Ability") /client/proc/remove_mob_action(mob/removal_target in GLOB.mob_list) set category = "Admin.Fun" @@ -795,7 +795,7 @@ GLOBAL_PROTECT(admin_verbs_poll) qdel(to_remove) log_admin("[key_name(usr)] removed the ability [chosen_ability] from [key_name(removal_target)].") message_admins("[key_name_admin(usr)] removed the ability [chosen_ability] from [key_name_admin(removal_target)].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Remove Mob Ability") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Remove Mob Ability") /client/proc/give_spell(mob/spell_recipient in GLOB.mob_list) set category = "Admin.Fun" @@ -833,7 +833,7 @@ GLOBAL_PROTECT(admin_verbs_poll) to_chat(usr, span_warning("The intended spell recipient no longer exists.")) return - SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Spell") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Give Spell") log_admin("[key_name(usr)] gave [key_name(spell_recipient)] the spell [chosen_spell][robeless ? " (Forced robeless)" : ""].") message_admins("[key_name_admin(usr)] gave [key_name_admin(spell_recipient)] the spell [chosen_spell][robeless ? " (Forced robeless)" : ""].") @@ -870,7 +870,7 @@ GLOBAL_PROTECT(admin_verbs_poll) qdel(to_remove) log_admin("[key_name(usr)] removed the spell [chosen_spell] from [key_name(removal_target)].") message_admins("[key_name_admin(usr)] removed the spell [chosen_spell] from [key_name_admin(removal_target)].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Remove Spell") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Remove Spell") /client/proc/give_disease(mob/living/T in GLOB.mob_living_list) set category = "Admin.Fun" @@ -883,7 +883,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!D) return T.ForceContractDisease(new D, FALSE, TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Disease") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Give Disease") log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].") message_admins(span_adminnotice("[key_name_admin(usr)] gave [key_name_admin(T)] the disease [D].")) @@ -897,7 +897,7 @@ GLOBAL_PROTECT(admin_verbs_poll) O.say(message, sanitize = FALSE) log_admin("[key_name(usr)] made [O] at [AREACOORD(O)] say \"[message]\"") message_admins(span_adminnotice("[key_name_admin(usr)] made [O] at [AREACOORD(O)]. say \"[message]\"")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Object Say") /client/proc/togglebuildmodeself() set name = "Toggle Build Mode Self" set category = "Admin.Events" @@ -905,7 +905,7 @@ GLOBAL_PROTECT(admin_verbs_poll) return if(src.mob) togglebuildmode(src.mob) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Build Mode") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Toggle Build Mode") /client/proc/check_ai_laws() set name = "Check AI Laws" @@ -953,7 +953,7 @@ GLOBAL_PROTECT(admin_verbs_poll) to_chat(src, span_interface("You are now a normal player.")) log_admin("[src] deadminned themselves.") message_admins("[src] deadminned themselves.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Deadmin") + BLACKBOX_LOG_ADMIN_VERB("Deadmin") /client/proc/readmin() set name = "Readmin" @@ -978,7 +978,7 @@ GLOBAL_PROTECT(admin_verbs_poll) to_chat(src, span_interface("You are now an admin."), confidential = TRUE) message_admins("[src] re-adminned themselves.") log_admin("[src] re-adminned themselves.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Readmin") + BLACKBOX_LOG_ADMIN_VERB("Readmin") /client/proc/populate_world(amount = 50) set name = "Populate World" @@ -1178,7 +1178,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!holder.library_manager) holder.library_manager = new() holder.library_manager.ui_interact(usr) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Library Management") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Library Management") /client/proc/create_mob_worm() set category = "Admin.Fun" diff --git a/code/modules/admin/adminmenu.dm b/code/modules/admin/adminmenu.dm index 67b8bfbb14c..9a93856aa4e 100644 --- a/code/modules/admin/adminmenu.dm +++ b/code/modules/admin/adminmenu.dm @@ -8,4 +8,4 @@ set category = "Admin.Game" if(usr.client.holder) usr.client.holder.player_panel_new() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel New") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Player Panel New") diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index 22a6b43b17a..1680304679e 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -160,7 +160,7 @@ GLOBAL_PROTECT(AdminProcCallHandler) log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") message_admins("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") //Proccall announce removed. returnval = WrapAdminProcCall(GLOBAL_PROC, procname, lst) // Pass the lst as an argument list to the proc - SSblackbox.record_feedback("tally", "admin_verb", 1, "Advanced ProcCall") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Advanced ProcCall") if(get_retval) get_retval += returnval . = get_callproc_returnval(returnval, procname) @@ -255,7 +255,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." message_admins(msg) admin_ticket_log(A, msg) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Atom ProcCall") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Atom ProcCall") var/returnval = WrapAdminProcCall(A, procname, lst) // Pass the lst as an argument list to the proc . = get_callproc_returnval(returnval,procname) diff --git a/code/modules/admin/verbs/admin.dm b/code/modules/admin/verbs/admin.dm index ad54e75fc40..0bd348076aa 100644 --- a/code/modules/admin/verbs/admin.dm +++ b/code/modules/admin/verbs/admin.dm @@ -24,7 +24,7 @@ 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.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Tip") + BLACKBOX_LOG_ADMIN_VERB("Show Tip") /datum/admins/proc/announce() set category = "Admin" @@ -39,7 +39,7 @@ message = adminscrub(message,500) to_chat(world, "[span_adminnotice("[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:")]\n \t [message]", confidential = TRUE) log_admin("Announce: [key_name(usr)] : [message]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Announce") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Announce") /datum/admins/proc/unprison(mob/M in GLOB.mob_list) set category = "Admin" @@ -50,7 +50,7 @@ log_admin("[key_name(usr)] has unprisoned [key_name(M)]") else tgui_alert(usr,"[M.name] is not prisoned.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Unprison") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Unprison") /client/proc/cmd_admin_check_player_exp() //Allows admins to determine who the newer players are. set category = "Admin" @@ -183,7 +183,7 @@ var/msg = "[key_name_admin(usr)] made [ADMIN_LOOKUPFLW(M)] drop everything!" message_admins(msg) admin_ticket_log(M, msg) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Everything") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Drop Everything") /proc/cmd_admin_mute(whom, mute_type, automute = 0) if(!whom) diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index 9ba0fa7608c..26219353cce 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -25,7 +25,7 @@ msg = span_adminnotice(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]") message_admins(msg) admin_ticket_log(M, msg) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Subtle Message") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Subtle Message") /client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list) set category = "Admin.Events" @@ -71,7 +71,7 @@ target.balloon_alert(target, "you hear a voice") to_chat(target, span_hear("You hear something crackle in your [human_recipient ? "ears" : "radio receiver"] for a moment before a voice speaks. \"Please stand by for a message from [sender == "Syndicate" ? "your benefactor" : "Central Command"]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] [input]. Message ends.\""), confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Headset Message") /client/proc/cmd_admin_world_narrate() set category = "Admin.Events" @@ -87,7 +87,7 @@ to_chat(world, "[msg]", confidential = TRUE) log_admin("GlobalNarrate: [key_name(usr)] : [msg]") message_admins(span_adminnotice("[key_name_admin(usr)] Sent a global narrate")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Global Narrate") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Global Narrate") /client/proc/cmd_admin_local_narrate(atom/A) set category = "Admin.Events" @@ -108,7 +108,7 @@ log_admin("LocalNarrate: [key_name(usr)] at [AREACOORD(A)]: [msg]") message_admins(span_adminnotice(" LocalNarrate: [key_name_admin(usr)] at [ADMIN_VERBOSEJMP(A)]: [msg]
")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Local Narrate") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Local Narrate") /client/proc/cmd_admin_direct_narrate(mob/M) set category = "Admin.Events" @@ -133,7 +133,7 @@ msg = span_adminnotice(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
") message_admins(msg) admin_ticket_log(M, msg) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Direct Narrate") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Direct Narrate") /client/proc/cmd_admin_add_freeform_ai_law() set category = "Admin.Events" @@ -156,7 +156,7 @@ ion.announce_chance = announce_ion_laws ion.ionMessage = input - SSblackbox.record_feedback("tally", "admin_verb", 1, "Add Custom AI Law") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Add Custom AI Law") /client/proc/admin_call_shuttle() set category = "Admin.Events" @@ -177,7 +177,7 @@ SSshuttle.emergency.mode = SHUTTLE_IDLE SSshuttle.emergency.request() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Call Shuttle") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Call Shuttle") log_admin("[key_name(usr)] admin-called the emergency shuttle.") message_admins(span_adminnotice("[key_name_admin(usr)] admin-called the emergency shuttle[confirm == "Yes (No Recall)" ? " (non-recallable)" : ""].")) return @@ -197,7 +197,7 @@ return SSshuttle.emergency.cancel() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Cancel Shuttle") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Cancel Shuttle") log_admin("[key_name(usr)] admin-recalled the emergency shuttle.") message_admins(span_adminnotice("[key_name_admin(usr)] admin-recalled the emergency shuttle.")) @@ -325,7 +325,7 @@ log_admin("[key_name(usr)] changed the security level to [level]") message_admins("[key_name_admin(usr)] changed the security level to [level]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Set Security Level [capitalize(level)]") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Set Security Level [capitalize(level)]") /client/proc/run_weather() set category = "Admin.Events" @@ -348,7 +348,7 @@ message_admins("[key_name_admin(usr)] started weather of type [weather_type] on the z-level [z_level].") log_admin("[key_name(usr)] started weather of type [weather_type] on the z-level [z_level].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Run Weather") + BLACKBOX_LOG_ADMIN_VERB("Run Weather") /client/proc/add_marked_mob_ability() set category = "Admin.Events" diff --git a/code/modules/admin/verbs/adminfun.dm b/code/modules/admin/verbs/adminfun.dm index f51a922e419..fcba8d40928 100644 --- a/code/modules/admin/verbs/adminfun.dm +++ b/code/modules/admin/verbs/adminfun.dm @@ -31,7 +31,7 @@ explosion(O, devastation, heavy, light, flames, flash, explosion_cause = mob) log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at [AREACOORD(O)]") message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flames]) at [AREACOORD(O)]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Explosion") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Explosion") /client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world) set category = "Admin.Fun" @@ -51,7 +51,7 @@ empulse(O, heavy, light) log_admin("[key_name(usr)] created an EM Pulse ([heavy],[light]) at [AREACOORD(O)]") message_admins("[key_name_admin(usr)] created an EM Pulse ([heavy],[light]) at [AREACOORD(O)]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "EM Pulse") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("EM Pulse") /client/proc/cmd_admin_gib(mob/victim in GLOB.mob_list) set category = "Admin.Fun" @@ -82,7 +82,7 @@ else living_victim.gib(DROP_ORGANS|DROP_BODYPARTS) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Gib") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Gib") /client/proc/cmd_admin_gib_self() set name = "Gibself" @@ -93,7 +93,7 @@ return log_admin("[key_name(usr)] used gibself.") message_admins(span_adminnotice("[key_name_admin(usr)] used gibself.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Gib Self") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Gib Self") var/mob/living/ourself = mob if (istype(ourself)) @@ -128,7 +128,7 @@ to_chat(usr, "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet.", confidential = TRUE) CONFIG_SET(flag/force_random_names, TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Everyone Random") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Make Everyone Random") /client/proc/mass_zombie_infection() set category = "Admin.Fun" @@ -149,7 +149,7 @@ message_admins("[key_name_admin(usr)] added a latent zombie infection to all humans.") log_admin("[key_name(usr)] added a latent zombie infection to all humans.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Infection") + BLACKBOX_LOG_ADMIN_VERB("Mass Zombie Infection") /client/proc/mass_zombie_cure() set category = "Admin.Fun" @@ -167,7 +167,7 @@ message_admins("[key_name_admin(usr)] cured all zombies.") log_admin("[key_name(usr)] cured all zombies.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Cure") + BLACKBOX_LOG_ADMIN_VERB("Mass Zombie Cure") /client/proc/polymorph_all() set category = "Admin.Fun" @@ -186,7 +186,7 @@ message_admins("[key_name_admin(usr)] started polymorphed all living mobs.") log_admin("[key_name(usr)] polymorphed all living mobs.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Polymorph All") + BLACKBOX_LOG_ADMIN_VERB("Polymorph All") for(var/mob/living/M in mobs) CHECK_TICK diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm index 317c8fafd3b..197a870b48b 100644 --- a/code/modules/admin/verbs/admingame.dm +++ b/code/modules/admin/verbs/admingame.dm @@ -163,7 +163,7 @@ body += "" usr << browse(body, "window=adminplayeropts-[REF(M)];size=550x515") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Player Panel") /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list) set category = "Admin.Game" @@ -309,7 +309,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(new_character, "You have been fully respawned. Enjoy the game.", confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Respawn Character") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Respawn Character") return new_character /client/proc/cmd_admin_list_open_jobs() @@ -319,7 +319,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN)) return holder.manage_free_slots() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Job Slots") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Manage Job Slots") /datum/admins/proc/manage_free_slots() if(!check_rights()) @@ -438,7 +438,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(usr, "This can only be used on instances of type /mob and /mind", confidential = TRUE) return target_mind.traitor_panel() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Traitor Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Traitor Panel") /datum/admins/proc/show_skill_panel(target) set category = "Admin.Game" diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 813f32d5359..c73f3669f5a 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -818,7 +818,7 @@ GLOBAL_DATUM_INIT(admin_help_ui_handler, /datum/admin_help_ui_handler, new) if(user_client.handle_spam_prevention(message, MUTE_ADMINHELP)) return - SSblackbox.record_feedback("tally", "admin_verb", 1, "Adminhelp") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Adminhelp") if(urgent) if(!COOLDOWN_FINISHED(src, ahelp_cooldowns?[user_client.ckey])) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index b049d49d0eb..2f058818a46 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -20,7 +20,7 @@ usr.forceMove(T) log_admin("[key_name(usr)] jumped to [AREACOORD(T)]") message_admins("[key_name_admin(usr)] jumped to [AREACOORD(T)]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Area") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Jump To Area") else to_chat(src, "Nowhere to jump to!", confidential = TRUE) return @@ -36,7 +36,7 @@ log_admin("[key_name(usr)] jumped to [AREACOORD(T)]") message_admins("[key_name_admin(usr)] jumped to [AREACOORD(T)]") usr.forceMove(T) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Turf") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Jump To Turf") return /client/proc/jumptomob(mob/M in GLOB.mob_list) @@ -53,7 +53,7 @@ var/mob/A = src.mob var/turf/T = get_turf(M) if(T && isturf(T)) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Mob") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Jump To Mob") A.forceMove(M.loc) else to_chat(A, "This mob is not located in the game world.", confidential = TRUE) @@ -70,7 +70,7 @@ var/mob/A = src.mob var/turf/T = locate(tx,ty,tz) A.forceMove(T) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Coordiate") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Jump To Coordiate") message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]") /client/proc/jumptokey() @@ -94,7 +94,7 @@ usr.forceMove(M.loc) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Key") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Jump To Key") /client/proc/Getmob(mob/M in GLOB.mob_list - GLOB.dummy_mob_list) set category = "Admin.Game" @@ -106,7 +106,7 @@ var/atom/loc = get_turf(usr) M.admin_teleport(loc) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Mob") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Get Mob") /// Proc to hook user-enacted teleporting behavior and keep logging of the event. @@ -153,7 +153,7 @@ if(M) M.forceMove(get_turf(usr)) usr.forceMove(M.loc) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Key") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Get Key") /client/proc/sendmob(mob/jumper in sort_mobs()) set category = "Admin.Game" @@ -178,4 +178,4 @@ admin_ticket_log(jumper, msg) else to_chat(src, "Failed to move mob to a valid location.", confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Send Mob") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Send Mob") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index befd93d4f95..6629ee50efd 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -30,7 +30,7 @@ confidential = TRUE) return cmd_admin_pm(M.client, null) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin PM Mob") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Admin PM Mob") /// Shows a list of clients we could send PMs to, then forwards our choice to cmd_admin_pm /client/proc/cmd_admin_pm_panel() @@ -63,7 +63,7 @@ if (isnull(target)) return cmd_admin_pm(targets[target], null) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin PM") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Admin PM") /// Replys to some existing ahelp, reply to whom, which can be a client or ckey /client/proc/cmd_ahelp_reply(whom) diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index c6412952543..ad7a89a228d 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -33,7 +33,7 @@ html = msg, confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Asay") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Asay") /client/proc/get_admin_say() var/msg = input(src, null, "asay \"text\"") as text|null diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index 202672e805d..2e73a9955f7 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -4,7 +4,7 @@ if(!src.holder) to_chat(src, "Only administrators may use this command.", confidential = TRUE) return - SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Plumbing") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Check Plumbing") //all plumbing - yes, some things might get stated twice, doesn't matter. for(var/obj/machinery/atmospherics/components/pipe as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/atmospherics/components)) @@ -30,7 +30,7 @@ if(!src.holder) to_chat(src, "Only administrators may use this command.", confidential = TRUE) return - SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Power") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Check Power") var/list/results = list() for (var/datum/powernet/PN in SSmachines.powernets) diff --git a/code/modules/admin/verbs/commandreport.dm b/code/modules/admin/verbs/commandreport.dm index f64dabd34d3..86e7ec1328b 100644 --- a/code/modules/admin/verbs/commandreport.dm +++ b/code/modules/admin/verbs/commandreport.dm @@ -30,7 +30,7 @@ if(!check_rights(R_ADMIN)) return - SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Create Command Report") var/datum/command_report_menu/tgui = new(usr) tgui.ui_interact(usr) diff --git a/code/modules/admin/verbs/config_helpers.dm b/code/modules/admin/verbs/config_helpers.dm index 96e758595b8..013c7b63f8a 100644 --- a/code/modules/admin/verbs/config_helpers.dm +++ b/code/modules/admin/verbs/config_helpers.dm @@ -16,4 +16,4 @@ else to_chat(usr, span_warning("Job configuration file could not be generated. Check the server logs / runtimes / above warning messages for more information.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Generate Job Configuration") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Generate Job Configuration") diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index bb66131dea6..032a4d4fa48 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -28,7 +28,7 @@ deadchat_broadcast("[span_prefix("DEAD:")] [name_and_rank] says, \"[emoji_parse(msg)]\"") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Dsay") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Dsay") /client/proc/get_dead_say() var/msg = input(src, null, "dsay \"text\"") as text|null diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 99491dd7cb3..15bb756cb3d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -13,7 +13,7 @@ message_admins("[key_name(src)] toggled debugging on.") log_admin("[key_name(src)] toggled debugging on.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Debug Two") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Toggle Debug Two") /client/proc/Cell() set category = "Debug" @@ -24,7 +24,7 @@ if(!isturf(T)) return atmos_scan(user=usr, target=T, silent=TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Air Status In Location") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Air Status In Location") /client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list) set category = "Admin.Fun" @@ -68,7 +68,7 @@ CHECK_TICK log_admin("[key_name(src)] has deleted all ([counter]) instances of [type_to_del].") message_admins("[key_name_admin(src)] has deleted all ([counter]) instances of [type_to_del].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Delete All") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Delete All") /client/proc/cmd_debug_force_del_all(object as text) set category = "Debug" @@ -87,7 +87,7 @@ CHECK_TICK log_admin("[key_name(src)] has force-deleted all ([counter]) instances of [type_to_del].") message_admins("[key_name_admin(src)] has force-deleted all ([counter]) instances of [type_to_del].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Force-Delete All") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Force-Delete All") /client/proc/cmd_debug_hard_del_all(object as text) set category = "Debug" @@ -131,7 +131,7 @@ CHECK_TICK log_admin("[key_name(src)] has hard deleted all ([counter]) instances of [type_to_del].") message_admins("[key_name_admin(src)] has hard deleted all ([counter]) instances of [type_to_del].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Hard Delete All") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Hard Delete All") /client/proc/cmd_debug_make_powernets() set category = "Debug" @@ -139,7 +139,7 @@ SSmachines.makepowernets() log_admin("[key_name(src)] has remade the powernet. makepowernets() called.") message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Powernets") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Make Powernets") /client/proc/cmd_admin_grantfullaccess(mob/M in GLOB.mob_list) set category = "Debug" @@ -181,7 +181,7 @@ else tgui_alert(usr,"Invalid mob") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Grant Full Access") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Grant Full Access") log_admin("[key_name(src)] has granted [M.key] full access.") message_admins(span_adminnotice("[key_name_admin(usr)] has granted [M.key] full access.")) @@ -205,7 +205,7 @@ init_verbs() if(isobserver(adminmob)) qdel(adminmob) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Assume Direct Control") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Assume Direct Control") /client/proc/cmd_give_direct_control(mob/M in GLOB.mob_list) set category = "Admin.Game" @@ -232,7 +232,7 @@ qdel(oldmob) message_admins(span_adminnotice("[key_name_admin(usr)] gave away direct control of [M] to [newkey].")) log_admin("[key_name(usr)] gave away direct control of [M] to [newkey].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Direct Control") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Give Direct Control") /client/proc/cmd_admin_areatest(on_station, filter_maint) set category = "Mapping" @@ -513,7 +513,7 @@ var/msg = span_danger("Admin [key_name_admin(usr)] healed / revived [ADMIN_LOOKUPFLW(M)]!") message_admins(msg) admin_ticket_log(M, msg) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvenate") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Rejuvenate") /client/proc/cmd_admin_delete(atom/A as obj|mob|turf in world) set category = "Debug" @@ -531,7 +531,7 @@ var/list/L = M.get_contents() for(var/t in L) to_chat(usr, "[t] [ADMIN_VV(t)] [ADMIN_TAG(t)]", confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Contents") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Check Contents") /client/proc/modify_goals() set category = "Debug" @@ -772,7 +772,7 @@ if(answer != "YES") return message_admins(span_adminnotice("[key_name_admin(src)] cleared dynamic transit space.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Clear Dynamic Transit") // If... + BLACKBOX_LOG_ADMIN_VERB("Clear Dynamic Transit") log_admin("[key_name(src)] cleared dynamic transit space.") SSmapping.wipe_reservations() //this goes after it's logged, incase something horrible happens. @@ -787,7 +787,7 @@ SSachievements.achievements_enabled = !SSachievements.achievements_enabled message_admins(span_adminnotice("[key_name_admin(src)] [SSachievements.achievements_enabled ? "disabled" : "enabled"] the medal hub lockout.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Medal Disable") // If... + BLACKBOX_LOG_ADMIN_VERB("Toggle Medal Disable") log_admin("[key_name(src)] [SSachievements.achievements_enabled ? "disabled" : "enabled"] the medal hub lockout.") /client/proc/view_runtimes() @@ -819,7 +819,7 @@ SSevents.scheduled = world.time message_admins(span_adminnotice("[key_name_admin(src)] pumped a random event.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Pump Random Event") + BLACKBOX_LOG_ADMIN_VERB("Pump Random Event") log_admin("[key_name(src)] pumped a random event.") /client/proc/start_line_profiling() @@ -830,7 +830,7 @@ LINE_PROFILE_START message_admins(span_adminnotice("[key_name_admin(src)] started line by line profiling.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Start Line Profiling") + BLACKBOX_LOG_ADMIN_VERB("Start Line Profiling") log_admin("[key_name(src)] started line by line profiling.") /client/proc/stop_line_profiling() @@ -841,7 +841,7 @@ LINE_PROFILE_STOP message_admins(span_adminnotice("[key_name_admin(src)] stopped line by line profiling.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Stop Line Profiling") + BLACKBOX_LOG_ADMIN_VERB("Stop Line Profiling") log_admin("[key_name(src)] stopped line by line profiling.") /client/proc/show_line_profiling() diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 6012ea935ee..a6a9a204b85 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -5,7 +5,7 @@ if(!isturf(target)) return atmos_scan(user=usr, target=target, silent=TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Air Status") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Air Status") /client/proc/fix_next_move() set category = "Debug" @@ -33,7 +33,7 @@ message_admins("[ADMIN_LOOKUPFLW(largest_move_mob)] had the largest move delay with [largest_move_time] frames / [DisplayTimeText(largest_move_time)]!") message_admins("[ADMIN_LOOKUPFLW(largest_click_mob)] had the largest click delay with [largest_click_time] frames / [DisplayTimeText(largest_click_time)]!") message_admins("world.time = [world.time]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Unfreeze Everyone") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Unfreeze Everyone") return /client/proc/radio_report() @@ -65,7 +65,7 @@ output += "    [device]
" usr << browse(output,"window=radioreport") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Radio Report") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Radio Report") /client/proc/reload_admins() set name = "Reload Admins" @@ -79,7 +79,7 @@ return load_admins() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Reload All Admins") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Reload All Admins") message_admins("[key_name_admin(usr)] manually reloaded admins") /client/proc/toggle_cdn() diff --git a/code/modules/admin/verbs/lawpanel.dm b/code/modules/admin/verbs/lawpanel.dm index 19aa7e3a6f2..9b52c8d7339 100644 --- a/code/modules/admin/verbs/lawpanel.dm +++ b/code/modules/admin/verbs/lawpanel.dm @@ -7,7 +7,7 @@ if(!isobserver(usr) && SSticker.HasRoundStarted()) message_admins("[key_name_admin(usr)] checked AI laws via the Law Panel.") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Law Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Law Panel") var/datum/law_panel/tgui = new() tgui.ui_interact(usr) diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 5f61a508b36..8f4206ca905 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -77,7 +77,7 @@ GLOBAL_PROTECT(admin_verbs_debug_mapping) seen[T]++ for(var/turf/T in seen) T.maptext = MAPTEXT(seen[T]) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Camera Range") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Camera Range") #ifdef TESTING GLOBAL_LIST_EMPTY(dirty_vars) @@ -134,7 +134,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) output += "" usr << browse(output,"window=airreport;size=1000x500") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Camera Report") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Camera Report") /client/proc/intercom_view() set category = "Mapping" @@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) for(var/obj/item/radio/intercom/intercom in GLOB.all_radios[frequency]) for(var/turf/turf in view(7,intercom.loc)) new /obj/effect/abstract/marker/intercom(turf) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Intercom Range") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Intercom Range") /client/proc/show_map_reports() set category = "Mapping" @@ -180,7 +180,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) usr << browse(dat, "window=at_list") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Roundstart Active Turfs") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Show Roundstart Active Turfs") /client/proc/cmd_show_at_markers() set category = "Mapping" @@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) count++ to_chat(usr, "[count] AT markers placed.", confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Show Roundstart Active Turf Markers") + BLACKBOX_LOG_ADMIN_VERB("Show Roundstart Active Turf Markers") /client/proc/enable_mapping_verbs() set category = "Debug" @@ -209,14 +209,14 @@ GLOBAL_LIST_EMPTY(dirty_vars) return remove_verb(src, /client/proc/enable_mapping_verbs) add_verb(src, list(/client/proc/disable_mapping_verbs, GLOB.admin_verbs_debug_mapping)) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Enable Debug Verbs") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Enable Debug Verbs") /client/proc/disable_mapping_verbs() set category = "Debug" set name = "Mapping verbs - Disable" remove_verb(src, list(/client/proc/disable_mapping_verbs, GLOB.admin_verbs_debug_mapping)) add_verb(src, /client/proc/enable_mapping_verbs) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Disable Debug Verbs") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Disable Debug Verbs") /client/proc/count_objects_on_z_level() set category = "Mapping" @@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) atom_list += A to_chat(world, "There are [count] objects of type [type_path] on z-level [num_level]", confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Count Objects Zlevel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Count Objects Zlevel") /client/proc/count_objects_all() set category = "Mapping" @@ -275,7 +275,7 @@ GLOBAL_LIST_EMPTY(dirty_vars) count++ to_chat(world, "There are [count] objects of type [type_path] in the game world", confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Count Objects All") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Count Objects All") //This proc is intended to detect lag problems relating to communication procs @@ -470,7 +470,7 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) to_chat(src, "Only administrators may use this command.", confidential = TRUE) return message_admins(span_adminnotice("[key_name_admin(usr)] is checking for obstructed atmospherics through the debug command.")) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Check For Obstructed Atmospherics") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Check For Obstructed Atmospherics") var/list/results = list() diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 17bba0195a2..1b63c83529b 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -41,7 +41,7 @@ SEND_SOUND(M, admin_sound) admin_sound.volume = vol - SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Global Sound") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Play Global Sound") /client/proc/play_local_sound(S as sound) @@ -53,7 +53,7 @@ log_admin("[key_name(src)] played a local sound [S]") message_admins("[key_name_admin(src)] played a local sound [S]") playsound(get_turf(src.mob), S, 50, FALSE, FALSE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Local Sound") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Play Local Sound") /client/proc/play_direct_mob_sound(S as sound, mob/M) set category = "Admin.Fun" @@ -68,7 +68,7 @@ log_admin("[key_name(src)] played a direct mob sound [S] to [M].") message_admins("[key_name_admin(src)] played a direct mob sound [S] to [ADMIN_LOOKUPFLW(M)].") SEND_SOUND(M, S) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Direct Mob Sound") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Play Direct Mob Sound") ///Takes an input from either proc/play_web_sound or the request manager and runs it through youtube-dl and prompts the user before playing it to the server. /proc/web_sound(mob/user, input, credit) @@ -167,7 +167,7 @@ S_TIMER_COOLDOWN_START(SStimer, COOLDOWN_INTERNET_SOUND, duration) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Internet Sound") + BLACKBOX_LOG_ADMIN_VERB("Play Internet Sound") /client/proc/play_web_sound() @@ -208,7 +208,7 @@ log_admin("[key_name(src)] set the round end sound to [S]") message_admins("[key_name_admin(src)] set the round end sound to [S]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Set Round End Sound") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Set Round End Sound") /client/proc/stop_sounds() set category = "Debug" @@ -224,7 +224,7 @@ C?.tgui_panel?.stop_music() S_TIMER_COOLDOWN_RESET(SStimer, COOLDOWN_INTERNET_SOUND) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Stop All Playing Sounds") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Stop All Playing Sounds") //world/proc/shelleo #undef SHELLEO_ERRORLEVEL diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index 8fa693854df..28d76abb101 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -24,7 +24,7 @@ usr.reset_perspective(O) usr.control_object = O O.AddElement(/datum/element/weather_listener, /datum/weather/ash_storm, ZTRAIT_ASHSTORM, GLOB.ash_storm_sounds) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Possess Object") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Possess Object") /proc/release() set name = "Release Obj" @@ -45,7 +45,7 @@ usr.forceMove(get_turf(usr.control_object)) usr.reset_perspective() usr.control_object = null - SSblackbox.record_feedback("tally", "admin_verb", 1, "Release Object") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Release Object") /proc/givetestverbs(mob/M in GLOB.mob_list) set desc = "Give this guy possess/release verbs" @@ -53,4 +53,4 @@ set name = "Give Possessing Verbs" add_verb(M, GLOBAL_PROC_REF(possess)) add_verb(M, GLOBAL_PROC_REF(release)) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Possessing Verbs") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Give Possessing Verbs") diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 65e885825e2..82c6bdc4804 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -47,7 +47,7 @@ to_chat(C, msg, type = MESSAGE_TYPE_PRAYER, confidential = TRUE) to_chat(usr, span_info("You pray to the gods: \"[msg_tmp]\""), confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Prayer") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Prayer") /// Used by communications consoles to message CentCom diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm index eadcd783895..a299eb43b0f 100644 --- a/code/modules/admin/verbs/reestablish_db_connection.dm +++ b/code/modules/admin/verbs/reestablish_db_connection.dm @@ -17,11 +17,11 @@ SSdbcore.Disconnect() log_admin("[key_name(usr)] has forced the database to disconnect") message_admins("[key_name_admin(usr)] has forced the database to disconnect!") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Force Reestablished Database Connection") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Force Reestablished Database Connection") log_admin("[key_name(usr)] is attempting to re-establish the DB Connection") message_admins("[key_name_admin(usr)] is attempting to re-establish the DB Connection") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Reestablished Database Connection") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Reestablished Database Connection") SSdbcore.failed_connections = 0 if(!SSdbcore.Connect()) diff --git a/code/modules/admin/verbs/requests.dm b/code/modules/admin/verbs/requests.dm index b4a52099a80..2cd32648b67 100644 --- a/code/modules/admin/verbs/requests.dm +++ b/code/modules/admin/verbs/requests.dm @@ -3,5 +3,5 @@ set name = "Requests Manager" set desc = "Open the request manager panel to view all requests during this round" set category = "Admin.Game" - SSblackbox.record_feedback("tally", "admin_verb", 1, "Request Manager") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Request Manager") GLOB.requests.ui_interact(usr) diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 0943cb0c92f..d042fd00f09 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -4,7 +4,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) set name = "Secrets" set desc = "Abuse harder than you ever have before with this handy dandy semi-misc stuff menu" set category = "Admin.Game" - SSblackbox.record_feedback("tally", "admin_verb", 1, "Secrets Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Secrets Panel") var/datum/secrets_menu/tgui = new(usr)//create the datum tgui.ui_interact(usr)//datum has a tgui component, here we open the window diff --git a/code/modules/admin/verbs/selectequipment.dm b/code/modules/admin/verbs/selectequipment.dm index cc16be55184..59513db0129 100644 --- a/code/modules/admin/verbs/selectequipment.dm +++ b/code/modules/admin/verbs/selectequipment.dm @@ -212,7 +212,7 @@ if(tgui_alert(usr,"Do you need the items in your pockets?", "Pocket Items", list("Delete Them", "Drop Them")) == "Delete Them") delete_pocket = TRUE - SSblackbox.record_feedback("tally", "admin_verb", 1, "Select Equipment") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Select Equipment") for(var/obj/item/item in human_target.get_equipped_items(include_pockets = delete_pocket)) qdel(item) diff --git a/code/modules/admin/verbs/server.dm b/code/modules/admin/verbs/server.dm index 47fe392c973..d93008996bc 100644 --- a/code/modules/admin/verbs/server.dm +++ b/code/modules/admin/verbs/server.dm @@ -40,7 +40,7 @@ var/result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options if(result) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Reboot World") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Reboot World") var/init_by = "Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]." switch(result) if("Regular Restart") @@ -78,7 +78,7 @@ return if(confirm == "Yes") SSticker.force_ending = FORCE_END_ROUND - SSblackbox.record_feedback("tally", "admin_verb", 1, "End Round") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("End Round") /datum/admins/proc/toggleooc() set category = "Server" @@ -116,7 +116,7 @@ msg = " (The server is still setting up, but the round will be \ started as soon as possible.)" message_admins("[usr.key] has started the game.[msg]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Start Now") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Start Now") return TRUE SSticker.start_immediately = FALSE SSticker.SetTimeLeft(1800) @@ -242,7 +242,7 @@ to_chat(world, "The game will start in [DisplayTimeText(newtime)].", confidential = TRUE) SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) log_admin("[key_name(usr)] set the pre-game delay to [DisplayTimeText(newtime)].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Delay Game Start") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Delay Game Start") /datum/admins/proc/set_admin_notice() set category = "Server" @@ -263,7 +263,7 @@ message_admins("[key_name(usr)] set the admin notice.") log_admin("[key_name(usr)] set the admin notice:\n[new_admin_notice]") to_chat(world, span_adminnotice("Admin Notice:\n \t [new_admin_notice]"), confidential = TRUE) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Set Admin Notice") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Set Admin Notice") GLOB.admin_notice = new_admin_notice return diff --git a/code/modules/admin/verbs/spawnobjasmob.dm b/code/modules/admin/verbs/spawnobjasmob.dm index b65d388fbea..924c9885713 100644 --- a/code/modules/admin/verbs/spawnobjasmob.dm +++ b/code/modules/admin/verbs/spawnobjasmob.dm @@ -66,4 +66,4 @@ log_admin("[key_name(usr)] spawned a sentient object-mob [basemob] from [chosen_obj] at [AREACOORD(usr)]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn object-mob") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Spawn object-mob") diff --git a/code/modules/admin/view_variables/admin_delete.dm b/code/modules/admin/view_variables/admin_delete.dm index 3b43a5d2149..fe6e3380787 100644 --- a/code/modules/admin/view_variables/admin_delete.dm +++ b/code/modules/admin/view_variables/admin_delete.dm @@ -16,7 +16,7 @@ if (tgui_alert(usr, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", list("Yes", "No")) == "Yes") log_admin("[key_name(usr)] deleted [D] [coords]") message_admins("[key_name_admin(usr)] deleted [D] [jmp_coords]") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Delete") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Delete") if(isturf(D)) T = D // SKYRAT EDIT, orginal: var/turf/T = D T.ScrapeAway() diff --git a/code/modules/admin/view_variables/mass_edit_variables.dm b/code/modules/admin/view_variables/mass_edit_variables.dm index 21ce2167378..66594353a2f 100644 --- a/code/modules/admin/view_variables/mass_edit_variables.dm +++ b/code/modules/admin/view_variables/mass_edit_variables.dm @@ -15,7 +15,7 @@ method = vv_subtype_prompt(A.type) src.massmodify_variables(A, var_name, method) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Edit Variables") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Mass Edit Variables") /client/proc/massmodify_variables(datum/O, var_name = "", method = 0) if(!check_rights(R_VAREDIT)) diff --git a/code/modules/buildmode/submodes/proccall.dm b/code/modules/buildmode/submodes/proccall.dm index 5395ec77c65..3df1b810538 100644 --- a/code/modules/buildmode/submodes/proccall.dm +++ b/code/modules/buildmode/submodes/proccall.dm @@ -41,7 +41,7 @@ log_admin(msg) message_admins(msg) admin_ticket_log(object, msg) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Atom ProcCall") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Atom ProcCall") var/returnval = WrapAdminProcCall(object, proc_name, proc_args) // Pass the lst as an argument list to the proc . = target_client.get_callproc_returnval(returnval, proc_name) diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 6f063e61965..218aed8c681 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -192,13 +192,13 @@ ////////////////////////////UTILITIES////////////////// if("gamePanel") holder.holder.Game() - SSblackbox.record_feedback("tally", "admin_verb", 1, "Game Panel") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Game Panel") . = TRUE if("buildMode") var/mob/holder_mob = holder.mob if (holder_mob && (holder.holder?.rank_flags() & R_BUILD)) togglebuildmode(holder_mob) - SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Build Mode") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Toggle Build Mode") . = TRUE if("loadDataFromPreset") var/list/savedData = params["payload"] diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8611bf85eb4..823155dec3d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -2681,4 +2681,4 @@ GLOBAL_LIST_EMPTY(fire_appearances) qdel(old_mob) message_admins(span_adminnotice("[key_name_admin(admin)] gave a guardian spirit controlled by [guardian_client || "AI"] to [src].")) log_admin("[key_name(admin)] gave a guardian spirit controlled by [guardian_client] to [src].") - SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Guardian Spirit") + BLACKBOX_LOG_ADMIN_VERB("Give Guardian Spirit") diff --git a/code/modules/pai/debug.dm b/code/modules/pai/debug.dm index dde6fc4be05..089dcedfabb 100644 --- a/code/modules/pai/debug.dm +++ b/code/modules/pai/debug.dm @@ -28,7 +28,7 @@ card.set_personality(pai) if(SSpai.candidates[key]) SSpai.candidates -= key - SSblackbox.record_feedback("tally", "admin_verb", 1, "Make pAI") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc! + BLACKBOX_LOG_ADMIN_VERB("Make pAI") /** * Creates a new pAI.