diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 8c63e18fb27..394f582a15d 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -41,28 +41,28 @@ var/global/nologevent = 0
body += "Options panel for [M]"
if(M.client)
body += " played by [M.client] "
- body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]"
+ body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]"
if(istype(M, /mob/new_player))
body += " Hasn't Entered Game "
else
- body += " \[Heal\] "
+ body += " \[Heal\] "
body += "
\[ "
body += "VV - "
- body += "TP - "
+ body += "TP - "
body += "PM - "
- body += "SM - "
+ body += "SM - "
body += "[admin_jump_link(M, src)]\]
"
body += "Mob type = [M.type]
"
- body += "Kick | "
+ body += "Kick | "
body += "Warn | "
- body += "Ban | "
- body += "Jobban | "
- body += "Appearance Ban | "
- body += "Notes | "
+ body += "Ban | "
+ body += "Jobban | "
+ body += "Appearance Ban | "
+ body += "Notes | "
if(M.client)
if(M.client.check_watchlist(M.client.ckey))
body += "Remove from Watchlist | "
@@ -71,31 +71,31 @@ var/global/nologevent = 0
body += "Add to Watchlist "
if(M.client)
- body += "| Prison | "
+ body += "| Prison | "
body += "\ Send back to Lobby | "
var/muted = M.client.prefs.muted
body += {"
Mute:
- \[IC |
- OOC |
- PRAY |
- ADMINHELP |
- DEADCHAT\]
- (toggle all)
+ \[IC |
+ OOC |
+ PRAY |
+ ADMINHELP |
+ DEADCHAT\]
+ (toggle all)
"}
var/jumptoeye = ""
if(isAI(M))
var/mob/living/silicon/ai/A = M
if(A.client && A.eyeobj) // No point following clientless AI eyes
- jumptoeye = " (Eye)"
+ jumptoeye = " (Eye)"
body += {"
- Jump to[jumptoeye] |
- Get |
- Send To
+ Jump to[jumptoeye] |
+ Get |
+ Send To
- [check_rights(R_ADMIN,0) ? "Traitor panel | " : "" ]
- Narrate to |
- Subtle message
+ [check_rights(R_ADMIN,0) ? "Traitor panel | " : "" ]
+ Narrate to |
+ Subtle message
"}
if (M.client)
@@ -108,31 +108,31 @@ var/global/nologevent = 0
if(issmall(M))
body += "Monkeyized | "
else
- body += "Monkeyize | "
+ body += "Monkeyize | "
//Corgi
if(iscorgi(M))
body += "Corgized | "
else
- body += "Corgize | "
+ body += "Corgize | "
//AI / Cyborg
if(isAI(M))
body += "Is an AI "
else if(ishuman(M))
- body += {"Make AI |
- Make Mask |
- Make Robot |
- Make Alien |
- Make Slime |
- Make Superhero
+ body += {"Make AI |
+ Make Mask |
+ Make Robot |
+ Make Alien |
+ Make Slime |
+ Make Superhero
"}
//Simple Animals
if(isanimal(M))
- body += "Re-Animalize | "
+ body += "Re-Animalize | "
else
- body += "Animalize | "
+ body += "Animalize | "
// DNA2 - Admin Hax
if(M.dna && iscarbon(M))
@@ -147,7 +147,7 @@ var/global/nologevent = 0
if(bname)
var/bstate=M.dna.GetSEState(block)
var/bcolor="[(bstate)?"#006600":"#ff0000"]"
- body += "[bname][block]"
+ body += "[bname][block]"
else
body += "[block]"
body+=""
@@ -155,27 +155,27 @@ var/global/nologevent = 0
body += {"
Rudimentary transformation:
These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.
- Observer |
- \[ Alien: Drone,
- Hunter,
- Queen,
- Sentinel,
- Larva \]
- Human
- \[ slime: Baby,
- Adult \]
- Monkey |
- Cyborg |
- Cat |
- Runtime |
- Corgi |
- Ian |
- Crab |
- Coffee |
- \[ Construct: Armoured ,
- Builder ,
- Wraith \]
- Shade
+ Observer |
+ \[ Alien: Drone,
+ Hunter,
+ Queen,
+ Sentinel,
+ Larva \]
+ Human
+ \[ slime: Baby,
+ Adult \]
+ Monkey |
+ Cyborg |
+ Cat |
+ Runtime |
+ Corgi |
+ Ian |
+ Crab |
+ Coffee |
+ \[ Construct: Armoured ,
+ Builder ,
+ Wraith \]
+ Shade
"}
@@ -183,12 +183,12 @@ var/global/nologevent = 0
body += {"
Other actions:
- Forcesay |
- Admin Room |
- Thunderdome 1 |
- Thunderdome 2 |
- Thunderdome Admin |
- Thunderdome Observer |
+ Forcesay |
+ Admin Room |
+ Thunderdome 1 |
+ Thunderdome 2 |
+ Thunderdome Admin |
+ Thunderdome Observer |
"}
if(M.client.related_accounts_cid.len)
body += "
Related accounts by CID: [list2text(M.client.related_accounts_cid, " - ")]
"
@@ -234,6 +234,9 @@ var/global/nologevent = 0
if(!check_rights(R_EVENT))
return
+
+ if (!istype(src,/datum/admins))
+ src = usr.client.holder
var/dat
dat = text("Admin NewscasterAdmin Newscaster Unit
")