From 103889c7df0f0a68d278aa370803ee7ffa61e9fa Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Sun, 12 Feb 2023 00:49:08 +0000
Subject: [PATCH] Tweak that

---
 code/controllers/subsystem/redis.dm | 13 -------------
 code/game/gamemodes/game_mode.dm    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/code/controllers/subsystem/redis.dm b/code/controllers/subsystem/redis.dm
index cd5bd11bd99..c196295efcf 100644
--- a/code/controllers/subsystem/redis.dm
+++ b/code/controllers/subsystem/redis.dm
@@ -53,19 +53,6 @@ SUBSYSTEM_DEF(redis)
 		var/amount_registered = length(subbed_channels)
 		log_startup_progress("Registered [amount_registered] callback[amount_registered == 1 ? "" : "s"].")
 
-/datum/controller/subsystem/redis/Shutdown()
-	// Send our presence to required channels
-	var/list/presence_data = list()
-	presence_data["author"] = "system"
-	presence_data["source"] = GLOB.configuration.system.instance_id
-	presence_data["message"] = "Disconnected at `[SQLtime()]` during round [GLOB.round_id]"
-
-	var/presence_text = json_encode(presence_data)
-
-	for(var/channel in list("byond.asay", "byond.msay")) // Channels to announce to
-		publish(channel, presence_text)
-
-
 /datum/controller/subsystem/redis/fire()
 	check_messages()
 
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 356eb81208f..25730f3357b 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -179,6 +179,18 @@
 		SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_on_pod_5, list("escapees", "on_pod_5"))
 
 	GLOB.discord_manager.send2discord_simple(DISCORD_WEBHOOK_PRIMARY, "A round of [name] has ended - [surviving_total] survivors, [ghosts] ghosts.")
+	if(SSredis.connected)
+		// Send our presence to required channels
+		var/list/presence_data = list()
+		presence_data["author"] = "system"
+		presence_data["source"] = GLOB.configuration.system.instance_id
+		presence_data["message"] = "Round [GLOB.round_id] ended at `[SQLtime()]`"
+
+		var/presence_text = json_encode(presence_data)
+
+		for(var/channel in list("byond.asay", "byond.msay")) // Channels to announce to
+			SSredis.publish(channel, presence_text)
+
 	return 0