diff --git a/code/game/world.dm b/code/game/world.dm
index b7f8b9bdc98..a74870413d3 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -369,15 +369,14 @@ var/world_topic_spam_protect_time = world.timeofday
if(config && config.server_tag_line)
s += "
[config.server_tag_line]"
+ if(SSticker && ROUND_TIME > 0)
+ s += "
[round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)], " + capitalize(get_security_level())
+ else
+ s += "
STARTING"
+
s += "
"
var/list/features = list()
- if(SSticker)
- if(master_mode && master_mode != "secret")
- features += master_mode
- else
- features += "STARTING"
-
if(!enter_allowed)
features += "closed"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 1b11a35e58b..2d1ff8d82da 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -263,7 +263,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
..()
statpanel("Status")
if(client.statpanel == "Status")
- show_stat_station_time()
show_stat_emergency_shuttle_eta()
stat(null, "Respawnability: [(src in GLOB.respawnable_list) ? "Yes" : "No"]")
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index df0afa62f49..8d17b84c724 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -95,7 +95,6 @@ I'm using this for Stat to give it a more nifty interface to work with
..()
if(has_synthetic_assistance())
statpanel("Status")
- show_stat_station_time()
show_stat_emergency_shuttle_eta()
if(client.statpanel == "Status")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index e46068c8a74..6481f6bc04a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -162,8 +162,6 @@
stat(null, "Intent: [a_intent]")
stat(null, "Move Mode: [m_intent]")
- show_stat_station_time()
-
show_stat_emergency_shuttle_eta()
if(client.statpanel == "Status")
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 4a8d8c48f5b..2cb9ddf6252 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -156,7 +156,6 @@
/mob/living/silicon/Stat()
..()
if(statpanel("Status"))
- show_stat_station_time()
show_stat_emergency_shuttle_eta()
show_system_integrity()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index ed3f0635c1c..4e486baba20 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -990,6 +990,9 @@ var/list/slot_equipment_priority = list( \
statpanel("Status") // Switch to the Status panel again, for the sake of the lazy Stat procs
+ if(client && client.statpanel == "Status" && SSticker)
+ show_stat_station_time()
+
// this function displays the station time in the status panel
/mob/proc/show_stat_station_time()
stat(null, "Round Time: [worldtime2text()]")
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a87cbf6c8d3..47a4e4a5d0e 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -136,8 +136,6 @@
..()
statpanel("Status")
- if(client.statpanel == "Status" && SSticker)
- show_stat_station_time()
/mob/new_player/Topic(href, href_list[])