From 3fb84eb1d829aa0c4a0b380cf0d166c7dc73fdc5 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Wed, 12 May 2021 03:35:02 -0700
Subject: [PATCH] fix

---
 code/datums/world_topic.dm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm
index f5ea4257aa..b40e3b244e 100644
--- a/code/datums/world_topic.dm
+++ b/code/datums/world_topic.dm
@@ -222,7 +222,7 @@
 	var/list/afkmins = adm["afk"]
 	.["Admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho
 	.["Security Level"] = "[NUM2SECLEVEL(GLOB.security_level)]"
-	.["Round Duration"] = WORLDTIME2TEXT
+	.["Round Duration"] = WORLDTIME2TEXT("hh:mm:ss")
 	.["Time Dilation (Avg)"] = SStime_track.time_dilation_avg
 	return json_encode(.)
 
@@ -246,9 +246,8 @@
 	var/list/science = list()
 	var/list/cargo = list()
 	var/list/civilian = list()
-	var/list/silicons = list()
 	var/list/misc = list()
-	for(var/datum/data/record/R in data_core.general)
+	for(var/datum/data/record/R in GLOB.data_core.general)
 		var/name = R.fields["name"]
 		var/rank = R.fields["rank"]
 		var/real_rank = rank // make_list_rank(R.fields["real_rank"])
@@ -262,21 +261,13 @@
 			medical[name] = rank
 		else if(real_rank in GLOB.science_positions)
 			science[name] = rank
-		else if(real_rank in GLOB.cargo_positions)
+		else if(real_rank in GLOB.supply_positions)
 			cargo[name] = rank
 		else if(real_rank in GLOB.civilian_positions)
 			civilian[name] = rank
 		else
 			misc[name] = rank
 
-	// Synthetics don't have actual records, so we will pull them from here.
-	for(var/mob/living/silicon/ai/ai in GLOB.mob_list)
-		silicons[ai.name] = "Artificial Intelligence"
-
-	for(var/mob/living/silicon/robot/robot in GLOB.mob_list)
-		// No combat/syndicate cyborgs, no drones, and no AI shells.
-		if(!robot.scrambledcodes && !robot.shell && !(robot.module && robot.module.hide_on_manifest))
-			silicons[robot.name] = "[robot.modtype] [robot.braintype]"
 	. = list()
 	.["Command"] = command
 	.["Security"] = security
@@ -285,7 +276,6 @@
 	.["Science"] = science
 	.["Cargo"] = cargo
 	.["Civilian"] = civilian
-	.["Silicons"] = silicons
 	.["Misc"] = misc
 	return json_encode(.)