diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b511f384c381..77a24c3d71de 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -71,9 +71,16 @@ var/global/BSACooldown = 0
FLW
Mob type = [M.type]
- Guard: Show
- Related accounts by current IP and CID: Get
- Slow queries: CID history | IP history
+ "}
+
+ if(M.client)
+ body += {"
+ Guard: Show
+ Related accounts by current IP and CID: Get
+ Slow queries: CID history | IP history
+ "}
+
+ body += {"
CentCom (other server bans): CentCom (ENG)
BYOND profile: [M.ckey]
Kick |
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index bf4b224fdedc..fdd660f80abd 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -900,6 +900,7 @@
var/mob/M = locate(href_list["guard"])
if (ismob(M))
if(!M.client)
+ show_player_panel(M)
return
M.client.prefs.guard.print_report()
@@ -908,7 +909,11 @@
return
var/mob/M = locate(href_list["cid_history"])
- if (!ismob(M) || !M.client)
+ if (!ismob(M))
+ return
+
+ if(!M.client)
+ show_player_panel(M)
return
var/client/C = M.client
@@ -939,7 +944,11 @@
return
var/mob/M = locate(href_list["ip_history"])
- if (!ismob(M) || !M.client)
+ if (!ismob(M))
+ return
+
+ if(!M.client)
+ show_player_panel(M)
return
var/client/C = M.client
@@ -972,6 +981,7 @@
var/mob/M = locate(href_list["related_accounts"])
if (ismob(M))
if(!M.client)
+ show_player_panel(M)
return
var/client/C = M.client
@@ -1068,6 +1078,7 @@
if(!ismob(M))
return
if(!M.client)
+ show_player_panel(M)
return
var/ban_mute_type = input("Choose chat for ban:", "Chat ban") as null|anything in global.mute_ban_bitfield
@@ -1116,6 +1127,7 @@
if(!ismob(M))
return
if(!M.client)
+ show_player_panel(M)
return
var/type = href_list["type"]
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index c2115f4403fa..da3ada93aecb 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -212,6 +212,7 @@ var/global/list/datum/preferences/preferences_datums = list()
// reattach existing datum to client if client was disconnected and connects again
/datum/preferences/proc/reattach_to_client(client/client)
parent = client
+ guard.holder = client
/datum/preferences/proc/init_chat_bans()
if(!config.sql_enabled)