diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm index 9f067054f2..4498136b2b 100644 --- a/code/game/verbs/advanced_who.dm +++ b/code/game/verbs/advanced_who.dm @@ -7,24 +7,36 @@ var/list/Lines = list() - if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights)) + if(holder) for(var/client/C in GLOB.clients) - var/entry = "\t[C.key]" + var/entry = "[C.key]" if(C.holder && C.holder.fakekey) entry += " (as [C.holder.fakekey])" - entry += " - Playing as [C.mob.real_name]" - switch(C.mob.stat) - if(UNCONSCIOUS) - entry += " - Unconscious" - if(DEAD) - if(isobserver(C.mob)) - var/mob/observer/dead/O = C.mob - if(O.started_as_observer) - entry += " - Observing" - else - entry += " - DEAD" + + entry += "" + + if(C.mob.real_name) + switch(C.mob.stat) + if(UNCONSCIOUS) + entry += "Unconscious" // these are literally all spans so I can apply .inverted to them because black on dark grey isn't legible + + if(DEAD) + if(isobserver(C.mob)) + var/mob/observer/dead/O = C.mob + if(O.started_as_observer) + entry += "Observing" + else + entry += "Died" + else - entry += " - DEAD" + entry += "Playing" + + entry += " as [C.mob.real_name]" + + else if(isnewplayer(C.mob)) + entry += "In lobby" + + entry += "" var/age if(isnum(C.player_age)) @@ -33,14 +45,20 @@ age = 0 if(age <= 1) - age = "[age]" + age = "[age]" else if(age < 10) - age = "[age]" + age = "[age]" - entry += " - [age]" + entry += "Age: [age]" + entry += "" if(is_special_character(C.mob)) - entry += " - Antagonist" + if(C.mob?.mind?.special_role) + entry += "[C.mob.mind.special_role]" + else + entry += "Antagonist" + + entry += "" if(C.is_afk()) var/seconds = C.last_activity_seconds() @@ -48,7 +66,9 @@ entry += "[round(seconds / 60)] minutes, " entry += "[seconds % 60] seconds)" + entry += "" entry += " (?)" + entry += "" Lines += entry else @@ -60,16 +80,17 @@ entry += "[C.key]" var/mob/observer/dead/O = C.mob if(isobserver(O)) - entry += " - Observing" + entry += " - Observing
" else if(istype(O,/mob/new_player)) - entry += " - In Lobby" + entry += " - In Lobby
" else - entry += " - Playing" + entry += " - Playing
" Lines += entry + msg += "" for(var/line in sortList(Lines)) - msg += "[line]\n" - + msg += "[line]" + msg += "
" msg += "Total Players: [length(Lines)]" - msg = "" + msg + "" + msg = "" + msg + "" to_chat(src, msg) \ No newline at end of file diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css index 51d0eb5467..372c3ecf22 100644 --- a/code/modules/vchat/css/ss13styles.css +++ b/code/modules/vchat/css/ss13styles.css @@ -165,13 +165,28 @@ h1.alert, h2.alert {color: #000000;} .bug {color: #9e9e39;} .vox {color: #AA00AA;} .promethean {color: #5A5A5A; font-family:"Comic Sans MS","Comic Sans",cursive;} -.inverted .promethean {color: #A5A5A5; font-family:"Comic Sans MS","Comic Sans",cursive;} +.inverted .promethean {color: #A5A5A5; font-family:"Comic Sans MS","Comic Sans",cursive;} .zaddat {color: #941C1C;} .rough {font-family: "Trebuchet MS", cursive, sans-serif;} .say_quote {font-family: Georgia, Verdana, sans-serif;} .terminus {font-family: "Times New Roman", Times, serif, sans-serif} .interface {color: #330033;} +.black {color: #000000;} +.darkgray {color: #808080;} +.gray {color: #A9A9A9;} +.red {color: #FF0000;} +.orange {color: #FF8C00;} +.blue {color: #0000FF;} +.green {color: #00DD00;} +.inverted .black {color: #606060;} +.inverted .darkgray {color: #808080;} +.inverted .gray {color: #A9A9A9;} +.inverted .red {color: #FF4444;} +.inverted .orange {color: #FF8C00;} +.inverted .blue {color: #6666FF;} +.inverted .green {color: #44FF44;} + /*BIG IMG.icon {width: 32px; height: 32px;}*/ img.icon {vertical-align: middle; max-height: 1em;} img.icon.bigicon {max-height: 32px;} diff --git a/code/stylesheet.dm b/code/stylesheet.dm index b11b716b66..ca7a9a51b7 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -121,4 +121,13 @@ BIG IMG.icon {width: 32px; height: 32px;} .debug_debug {color:#0000FF;} .debug_trace {color:#888888;} +.black {color: #000000;} +.darkgray {color: #808080;} +.gray {color: #A9A9A9;} +.red {color: #FF0000;} +.orange {color: #FF8C00;} +.blue {color: #0000FF;} +.green {color: #00DD00;} + + "}