diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index fdb1c91153f..d5dede780a7 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -15,7 +15,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
adminhelped = 1 //Determines if they get the message to reply by clicking the name.
var/msg
- var/list/type = list("Question","Player Complaint")
+ var/list/type = list("Mentorhelp","Adminhelp")
var/selected_type = input("Pick a category.", "Admin Help", null, null) as null|anything in type
if(selected_type)
msg = input("Please enter your message.", "Admin Help", null, null) as text|null
@@ -88,7 +88,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
var/ref_mob = "\ref[mob]"
var/ref_client = "\ref[src]"
- msg = "\blue [selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]"
//send this msg to all admins
var/admin_number_afk = 0
@@ -110,18 +109,20 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
switch(selected_type)
if("Mentorhelp")
+ msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]"
for(var/client/X in mentorholders + modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
X << 'sound/effects/adminhelp.ogg'
X << msg
if("Adminhelp")
+ msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]"
for(var/client/X in modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
X << 'sound/effects/adminhelp.ogg'
X << msg
//show it to the person adminhelping too
- src << "[selected_type]: [original_msg]"
+ src << "[selected_type]: [original_msg]"
var/admin_number_present = adminholders.len - admin_number_afk
log_admin("[selected_type]: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 4bfa6a8fbe9..62932eb4625 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -108,7 +108,7 @@
if(!msg)
return
- var/recieve_color = "purple"
+ var/recieve_span = "playerreply"
var/send_pm_type = " "
var/recieve_pm_type = "Player"
@@ -118,9 +118,9 @@
//PMs sent from admins and mods display their rank
if(holder)
if(check_rights(R_MOD|R_MENTOR,0) && !check_rights(R_ADMIN,0))
- recieve_color = "maroon"
+ recieve_span = "adminobserverooc"
else
- recieve_color = "red"
+ recieve_span = "danger"
send_pm_type = holder.rank + " "
recieve_pm_type = holder.rank
@@ -131,7 +131,7 @@
var/recieve_message = ""
if(holder && !C.holder)
- recieve_message = "-- Click the [recieve_pm_type]'s name to reply --\n"
+ recieve_message = "-- Click the [recieve_pm_type]'s name to reply --\n"
if(C.adminhelped)
C << recieve_message
C.adminhelped = 0
@@ -149,7 +149,7 @@
adminhelp(reply) //sender has left, adminhelp instead
return
- recieve_message = "[type] from-[recieve_pm_type][key_name(src, C, C.holder ? 1 : 0, type)]: [msg]"
+ recieve_message = "[type] from-[recieve_pm_type][key_name(src, C, C.holder ? 1 : 0, type)]: [msg]"
C << recieve_message
src << "[send_pm_type][type] to-[key_name(C, src, holder ? 1 : 0, type)]: [msg]"
@@ -172,13 +172,13 @@
switch(type)
if("Mentorhelp")
if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob))
- X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]"
+ X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]"
if("Adminhelp")
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
- X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]"
+ X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]"
else
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
- X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]"
+ X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]"
/client/proc/cmd_admin_irc_pm()
if(prefs.muted & MUTE_ADMINHELP)
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index caa1f6950af..3c8a80bab91 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -23,6 +23,8 @@ em {font-style: normal; font-weight: bold;}
.adminobserver {color: #996600; font-weight: bold;}
.admin {color: #386aff; font-weight: bold;}
+.playerreply {color: #8800bb; font-weight: bold;}
+
.name { font-weight: bold;}
.say {}