Skip to content

Commit 71e9b97

Browse files
Remove Advanced Who, Merge it into Who. (#7119)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Remove Advanced Who, Merge it into Who. I would love to see the use case report on why someone would need Who but not Advanced Who. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Less UI clutter, Removes pointless separation of game features. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog -Remove Advanced Who button -Add game status to Who button <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: add: Added game state to Who button del: Removed Advanced Who button /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
1 parent b86df80 commit 71e9b97

File tree

3 files changed

+17
-84
lines changed

3 files changed

+17
-84
lines changed

citadel.dme

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2199,7 +2199,6 @@
21992199
#include "code\game\turfs\unsimulated\floor.dm"
22002200
#include "code\game\turfs\unsimulated\planetary.dm"
22012201
#include "code\game\turfs\unsimulated\walls.dm"
2202-
#include "code\game\verbs\advanced_who.dm"
22032202
#include "code\game\verbs\character_directory.dm"
22042203
#include "code\game\verbs\ignore.dm"
22052204
#include "code\game\verbs\suicide.dm"

code/game/verbs/advanced_who.dm

Lines changed: 0 additions & 82 deletions
This file was deleted.

code/game/verbs/who.dm

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,23 @@
6262
Lines += entry
6363
else
6464
for(var/client/C in GLOB.clients)
65-
Lines += (C == src)? C.get_revealed_key() : C.get_public_key()
65+
var/entry = "\t"
66+
if(!C.initialized)
67+
entry += "[C.ckey] - <b><font color='red'>Uninitialized</font></b>"
68+
Lines += entry
69+
continue
70+
if(C == src)
71+
entry += "[C.get_revealed_key()]"
72+
else
73+
entry += "[C.get_public_key()]"
74+
if(C.get_preference_toggle(/datum/game_preference_toggle/presence/show_advanced_who))
75+
if(isobserver(C.mob))
76+
entry += " - <font color='gray'>Observing</font>"
77+
else if(istype(C.mob, /mob/new_player))
78+
entry += " - <font color=#4F49AF>In Lobby</font>"
79+
else
80+
entry += " - <font color='#5fe312'>Playing</font>"
81+
Lines += entry
6682

6783
for(var/line in sortList(Lines))
6884
msg += "[line]\n"

0 commit comments

Comments
 (0)