From 63475bf84b52244185d9b89c02aa962cf0ee1007 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 13 May 2021 11:10:01 -0400 Subject: [PATCH] Merge pull request #10320 from VOREStation/upstream-merge-8079 [MIRROR] Adds map name and in-round player count to Topic reply. --- code/game/world.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/world.dm b/code/game/world.dm index 44c64ce7fd..e1dcf543a9 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -111,8 +111,10 @@ var/world_topic_spam_protect_time = world.timeofday s["players"] = 0 s["stationtime"] = stationtime2text() s["roundduration"] = roundduration2text() + s["map"] = strip_improper(using_map.full_name) //Done to remove the non-UTF-8 text macros - if(input["status"] == "2") + if(input["status"] == "2") // Shiny new hip status. + var/active = 0 var/list/players = list() var/list/admins = list() @@ -122,15 +124,18 @@ var/world_topic_spam_protect_time = world.timeofday continue admins[C.key] = C.holder.rank players += C.key + if(istype(C.mob, /mob/living)) + active++ s["players"] = players.len s["playerlist"] = list2params(players) + s["active_players"] = active var/list/adm = get_admin_counts() var/list/presentmins = adm["present"] var/list/afkmins = adm["afk"] s["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho s["adminlist"] = list2params(admins) - else + else // Legacy. var/n = 0 var/admins = 0