diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 5dd341b3109..c24e749cbb4 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -605,56 +605,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
return M
if(M < 0)
return -M
-
-
-/proc/key_name(var/whom, var/include_link = null, var/include_name = 1, var/type = null)
- var/mob/M
- var/client/C
- var/key
-
- if(!whom) return "*null*"
- if(istype(whom, /client))
- C = whom
- M = C.mob
- key = C.key
- else if(ismob(whom))
- M = whom
- C = M.client
- key = M.key
- else if(istype(whom, /datum))
- var/datum/D = whom
- return "*invalid:[D.type]*"
- else
- return "*invalid*"
-
- . = ""
-
- if(key)
- if(include_link && C)
- . += ""
-
- if(C && C.holder && C.holder.fakekey && !include_name)
- . += "Administrator"
- else
- . += key
-
- if(include_link)
- if(C) . += ""
- else . += " (DC)"
- else
- . += "*no key*"
-
- if(include_name && M)
- if(M.real_name)
- . += "/([M.real_name])"
- else if(M.name)
- . += "/([M.name])"
-
- return .
-
-/proc/key_name_admin(var/whom, var/include_name = 1)
- var/message = "[key_name(whom, 1, include_name)](?)[isAntag(whom) ? " (ANTAG)" : ""] ([admin_jump_link(whom, "holder")])"
- return message
/proc/get_mob_by_ckey(key)
if(!key)
diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm
index 44d79a38930..c01a18fccbe 100644
--- a/code/defines/procs/admin.dm
+++ b/code/defines/procs/admin.dm
@@ -1,7 +1,57 @@
-proc/log_and_message_admins(var/message as text)
+/proc/key_name(var/whom, var/include_link = null, var/include_name = 1, var/type = null)
+ var/mob/M
+ var/client/C
+ var/key
+
+ if(!whom) return "*null*"
+ if(istype(whom, /client))
+ C = whom
+ M = C.mob
+ key = C.key
+ else if(ismob(whom))
+ M = whom
+ C = M.client
+ key = M.key
+ else if(istype(whom, /datum))
+ var/datum/D = whom
+ return "*invalid:[D.type]*"
+ else
+ return "*invalid*"
+
+ . = ""
+
+ if(key)
+ if(include_link && C)
+ . += ""
+
+ if(C && C.holder && C.holder.fakekey && !include_name)
+ . += "Administrator"
+ else
+ . += key
+
+ if(include_link)
+ if(C) . += ""
+ else . += " (DC)"
+ else
+ . += "*no key*"
+
+ if(include_name && M)
+ if(M.real_name)
+ . += "/([M.real_name])"
+ else if(M.name)
+ . += "/([M.name])"
+
+ return .
+
+/proc/key_name_admin(var/whom, var/include_name = 1)
+ var/message = "[key_name(whom, 1, include_name)](?)[isAntag(whom) ? "(A)" : ""] ([admin_jump_link(whom, "holder")])"
+ return message
+
+/proc/log_and_message_admins(var/message as text)
log_admin("[usr]([usr.ckey]) " + message)
message_admins("[usr]([usr.ckey]) " + message)
-proc/admin_log_and_message_admins(var/message as text)
+/proc/admin_log_and_message_admins(var/message as text)
log_admin("[key_name(usr)] " + message)
- message_admins("[key_name_admin(usr)] " + message, 1)
\ No newline at end of file
+ message_admins("[key_name_admin(usr)] " + message, 1)
+
\ No newline at end of file