From 4b7e5dca65c7567b5920f0bd59f8048dea857fbc Mon Sep 17 00:00:00 2001
From: ItsSelis <selis@xynolabs.com>
Date: Wed, 8 Mar 2023 19:29:24 +0100
Subject: [PATCH] Ping

---
 code/controllers/subsystems/chat.dm | 3 ++-
 code/controllers/subsystems/ping.dm | 2 +-
 vorestation.dme                     | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/controllers/subsystems/chat.dm b/code/controllers/subsystems/chat.dm
index ddcdf867413..dec57bbe37c 100644
--- a/code/controllers/subsystems/chat.dm
+++ b/code/controllers/subsystems/chat.dm
@@ -15,7 +15,8 @@ SUBSYSTEM_DEF(chat)
 /datum/controller/subsystem/chat/Initialize()
 	// Just used by chat system to know that initialization is nearly finished.
 	// The to_chat checks could probably check the runlevel instead, but would require testing.
-	return SS_INIT_SUCCESS
+	// return SS_INIT_SUCCESS
+	return ..()
 
 /datum/controller/subsystem/chat/fire()
 	for(var/key in payload_by_client)
diff --git a/code/controllers/subsystems/ping.dm b/code/controllers/subsystems/ping.dm
index ccc0f67f615..4707bffc508 100644
--- a/code/controllers/subsystems/ping.dm
+++ b/code/controllers/subsystems/ping.dm
@@ -6,7 +6,7 @@
 SUBSYSTEM_DEF(ping)
 	name = "Ping"
 	priority = FIRE_PRIORITY_PING
-	init_stage = INITSTAGE_EARLY
+	// init_stage = INITSTAGE_EARLY
 	wait = 4 SECONDS
 	flags = SS_NO_INIT
 	runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME
diff --git a/vorestation.dme b/vorestation.dme
index 22e6ae5d78b..4566b45c37b 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -286,6 +286,7 @@
 #include "code\controllers\subsystems\overmap_renamer_vr.dm"
 #include "code\controllers\subsystems\persist_vr.dm"
 #include "code\controllers\subsystems\persistence.dm"
+#include "code\controllers\subsystems\ping.dm"
 #include "code\controllers\subsystems\planets.dm"
 #include "code\controllers\subsystems\plants.dm"
 #include "code\controllers\subsystems\player_tips.dm"